From: Michael Vogt Date: Tue, 2 Jul 2013 14:53:45 +0000 (+0200) Subject: merged debian/sid branch from git.debian.org X-Git-Tag: 0.9.13.exp1ubuntu1~14 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/56363109dac51dffb6ec8491728e0bc934a15fa1?hp=-c merged debian/sid branch from git.debian.org --- 56363109dac51dffb6ec8491728e0bc934a15fa1 diff --combined apt-pkg/acquire-item.cc index a79dfb727,c48443eff..46e4a7065 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@@ -1235,20 -1235,9 +1235,20 @@@ void pkgAcqMetaIndex::Done(string Messa } else { + // FIXME: move this into pkgAcqMetaClearSig::Done on the next + // ABI break + + // if we expect a ClearTextSignature (InRelase), ensure that + // this is what we get and if not fail to queue a + // Release/Release.gpg, see #346386 + if (SigFile == DestFile && !StartsWithGPGClearTextSignature(DestFile)) + { + Failed(Message, Cfg); + return; + } + // There was a signature file, so pass it to gpgv for // verification - if (_config->FindB("Debug::pkgAcquire::Auth", false)) std::cerr << "Metaindex acquired, queueing gpg verification (" << SigFile << "," << DestFile << ")\n"; @@@ -1300,7 -1289,14 +1300,14 @@@ void pkgAcqMetaIndex::RetrievalDone(str string FinalFile = _config->FindDir("Dir::State::lists"); FinalFile += URItoFileName(RealURI); if (SigFile == DestFile) + { SigFile = FinalFile; + // constructor of pkgAcqMetaClearSig moved it out of the way, + // now move it back in on IMS hit for the 'old' file + string const OldClearSig = DestFile + ".reverify"; + if (RealFileExists(OldClearSig) == true) + Rename(OldClearSig, FinalFile); + } DestFile = FinalFile; } Complete = true; @@@ -1606,7 -1602,11 +1613,11 @@@ string pkgAcqMetaClearSig::Custom600Hea struct stat Buf; if (stat(Final.c_str(),&Buf) != 0) - return "\nIndex-File: true\nFail-Ignore: true\n"; + { + Final = DestFile + ".reverify"; + if (stat(Final.c_str(),&Buf) != 0) + return "\nIndex-File: true\nFail-Ignore: true\n"; + } return "\nIndex-File: true\nFail-Ignore: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime); } diff --combined apt-pkg/contrib/fileutl.cc index c426293a3,0f88923cf..61ff0031f --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@@ -184,7 -184,8 +184,8 @@@ bool RunScripts(const char *Cnf /* The caller is expected to set things so that failure causes erasure */ bool CopyFile(FileFd &From,FileFd &To) { - if (From.IsOpen() == false || To.IsOpen() == false) + if (From.IsOpen() == false || To.IsOpen() == false || + From.Failed() == true || To.Failed() == true) return false; // Buffered copy between fds @@@ -852,26 -853,6 +853,26 @@@ bool ExecWait(pid_t Pid,const char *Nam } /*}}}*/ +// StartsWithGPGClearTextSignature - Check if a file is Pgp/GPG clearsigned /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool StartsWithGPGClearTextSignature(string const &FileName) +{ + static const char* SIGMSG = "-----BEGIN PGP SIGNED MESSAGE-----\n"; + char buffer[strlen(SIGMSG)+1]; + FILE* gpg = fopen(FileName.c_str(), "r"); + if (gpg == NULL) + return false; + + char const * const test = fgets(buffer, sizeof(buffer), gpg); + fclose(gpg); + if (test == NULL || strcmp(buffer, SIGMSG) != 0) + return false; + + return true; +} + + // FileFd::Open - Open a file /*{{{*/ // --------------------------------------------------------------------- /* The most commonly used open mode combinations are given with Mode */ @@@ -881,7 -862,7 +882,7 @@@ bool FileFd::Open(string FileName,unsig return Open(FileName, ReadOnly, Gzip, Perms); if (Compress == Auto && (Mode & WriteOnly) == WriteOnly) - return _error->Error("Autodetection on %s only works in ReadOnly openmode!", FileName.c_str()); + return FileFdError("Autodetection on %s only works in ReadOnly openmode!", FileName.c_str()); std::vector const compressors = APT::Configuration::getCompressors(); std::vector::const_iterator compressor = compressors.begin(); @@@ -934,17 -915,17 +935,17 @@@ case Auto: case Extension: // Unreachable - return _error->Error("Opening File %s in None, Auto or Extension should be already handled?!?", FileName.c_str()); + return FileFdError("Opening File %s in None, Auto or Extension should be already handled?!?", FileName.c_str()); } for (; compressor != compressors.end(); ++compressor) if (compressor->Name == name) break; if (compressor == compressors.end()) - return _error->Error("Can't find a configured compressor %s for file %s", name.c_str(), FileName.c_str()); + return FileFdError("Can't find a configured compressor %s for file %s", name.c_str(), FileName.c_str()); } if (compressor == compressors.end()) - return _error->Error("Can't find a match for specified compressor mode for file %s", FileName.c_str()); + return FileFdError("Can't find a match for specified compressor mode for file %s", FileName.c_str()); return Open(FileName, Mode, *compressor, Perms); } bool FileFd::Open(string FileName,unsigned int const Mode,APT::Configuration::Compressor const &compressor, unsigned long const Perms) @@@ -953,9 -934,9 +954,9 @@@ Flags = AutoClose; if ((Mode & WriteOnly) != WriteOnly && (Mode & (Atomic | Create | Empty | Exclusive)) != 0) - return _error->Error("ReadOnly mode for %s doesn't accept additional flags!", FileName.c_str()); + return FileFdError("ReadOnly mode for %s doesn't accept additional flags!", FileName.c_str()); if ((Mode & ReadWrite) == 0) - return _error->Error("No openmode provided in FileFd::Open for %s", FileName.c_str()); + return FileFdError("No openmode provided in FileFd::Open for %s", FileName.c_str()); if ((Mode & Atomic) == Atomic) { @@@ -1001,7 -982,7 +1002,7 @@@ close (iFd); iFd = -1; } - return _error->Errno("open",_("Could not open file %s"), FileName.c_str()); + return FileFdErrno("open",_("Could not open file %s"), FileName.c_str()); } SetCloseExec(iFd,true); @@@ -1030,14 -1011,19 +1031,19 @@@ bool FileFd::OpenDescriptor(int Fd, uns case Xz: name = "xz"; break; case Auto: case Extension: - return _error->Error("Opening Fd %d in Auto or Extension compression mode is not supported", Fd); + if (AutoClose == true && Fd != -1) + close(Fd); + return FileFdError("Opening Fd %d in Auto or Extension compression mode is not supported", Fd); } for (; compressor != compressors.end(); ++compressor) if (compressor->Name == name) break; if (compressor == compressors.end()) - return _error->Error("Can't find a configured compressor %s for file %s", name.c_str(), FileName.c_str()); - + { + if (AutoClose == true && Fd != -1) + close(Fd); + return FileFdError("Can't find a configured compressor %s for file %s", name.c_str(), FileName.c_str()); + } return OpenDescriptor(Fd, Mode, *compressor, AutoClose); } bool FileFd::OpenDescriptor(int Fd, unsigned int const Mode, APT::Configuration::Compressor const &compressor, bool AutoClose) @@@ -1059,11 -1045,21 +1065,21 @@@ else iFd = Fd; this->FileName = ""; - if (OpenInternDescriptor(Mode, compressor) == false) + if (Fd == -1 || OpenInternDescriptor(Mode, compressor) == false) { - if (AutoClose) + if (iFd != -1 && ( + #ifdef HAVE_ZLIB + compressor.Name == "gzip" || + #endif + #ifdef HAVE_BZ2 + compressor.Name == "bzip2" || + #endif + AutoClose == true)) + { close (iFd); - return _error->Errno("gzdopen",_("Could not open file descriptor %d"), Fd); + iFd = -1; + } + return FileFdError(_("Could not open file descriptor %d"), Fd); } return true; } @@@ -1125,10 -1121,7 +1141,7 @@@ bool FileFd::OpenInternDescriptor(unsig ExecWait(d->compressor_pid, "FileFdCompressor", true); if ((Mode & ReadWrite) == ReadWrite) - { - Flags |= Fail; - return _error->Error("ReadWrite mode is not supported for file %s", FileName.c_str()); - } + return FileFdError("ReadWrite mode is not supported for file %s", FileName.c_str()); bool const Comp = (Mode & WriteOnly) == WriteOnly; if (Comp == false) @@@ -1151,10 -1144,7 +1164,7 @@@ // Create a data pipe int Pipe[2] = {-1,-1}; if (pipe(Pipe) != 0) - { - Flags |= Fail; - return _error->Errno("pipe",_("Failed to create subprocess IPC")); - } + return FileFdErrno("pipe",_("Failed to create subprocess IPC")); for (int J = 0; J != 2; J++) SetCloseExec(Pipe[J],true); @@@ -1264,14 -1254,13 +1274,13 @@@ bool FileFd::Read(void *To,unsigned lon { if (errno == EINTR) continue; - Flags |= Fail; #ifdef HAVE_ZLIB if (d != NULL && d->gz != NULL) { int err; char const * const errmsg = gzerror(d->gz, &err); if (err != Z_ERRNO) - return _error->Error("gzread: %s (%d: %s)", _("Read error"), err, errmsg); + return FileFdError("gzread: %s (%d: %s)", _("Read error"), err, errmsg); } #endif #ifdef HAVE_BZ2 @@@ -1280,10 -1269,10 +1289,10 @@@ int err; char const * const errmsg = BZ2_bzerror(d->bz2, &err); if (err != BZ_IO_ERROR) - return _error->Error("BZ2_bzread: %s (%d: %s)", _("Read error"), err, errmsg); + return FileFdError("BZ2_bzread: %s (%d: %s)", _("Read error"), err, errmsg); } #endif - return _error->Errno("read",_("Read error")); + return FileFdErrno("read",_("Read error")); } To = (char *)To + Res; @@@ -1304,9 -1293,8 +1313,8 @@@ Flags |= HitEof; return true; } - - Flags |= Fail; - return _error->Error(_("read, still have %llu to read but none left"), Size); + + return FileFdError(_("read, still have %llu to read but none left"), Size); } /*}}}*/ // FileFd::ReadLine - Read a complete line from the file /*{{{*/ @@@ -1362,14 -1350,13 +1370,13 @@@ bool FileFd::Write(const void *From,uns continue; if (Res < 0) { - Flags |= Fail; #ifdef HAVE_ZLIB if (d != NULL && d->gz != NULL) { int err; char const * const errmsg = gzerror(d->gz, &err); if (err != Z_ERRNO) - return _error->Error("gzwrite: %s (%d: %s)", _("Write error"), err, errmsg); + return FileFdError("gzwrite: %s (%d: %s)", _("Write error"), err, errmsg); } #endif #ifdef HAVE_BZ2 @@@ -1378,10 -1365,10 +1385,10 @@@ int err; char const * const errmsg = BZ2_bzerror(d->bz2, &err); if (err != BZ_IO_ERROR) - return _error->Error("BZ2_bzwrite: %s (%d: %s)", _("Write error"), err, errmsg); + return FileFdError("BZ2_bzwrite: %s (%d: %s)", _("Write error"), err, errmsg); } #endif - return _error->Errno("write",_("Write error")); + return FileFdErrno("write",_("Write error")); } From = (char *)From + Res; @@@ -1393,9 -1380,8 +1400,8 @@@ if (Size == 0) return true; - - Flags |= Fail; - return _error->Error(_("write, still have %llu to write but couldn't"), Size); + + return FileFdError(_("write, still have %llu to write but couldn't"), Size); } bool FileFd::Write(int Fd, const void *From, unsigned long long Size) { @@@ -1439,13 -1425,13 +1445,13 @@@ bool FileFd::Seek(unsigned long long To return Skip(To - seekpos); if ((d->openmode & ReadOnly) != ReadOnly) - { - Flags |= Fail; - return _error->Error("Reopen is only implemented for read-only files!"); - } + return FileFdError("Reopen is only implemented for read-only files!"); #ifdef HAVE_BZ2 - if (d->bz2 != NULL) - BZ2_bzclose(d->bz2); + if (d->bz2 != NULL) + { + BZ2_bzclose(d->bz2); + d->bz2 = NULL; + } #endif if (iFd != -1) close(iFd); @@@ -1460,17 -1446,11 +1466,11 @@@ if (lseek(d->compressed_fd, 0, SEEK_SET) != 0) iFd = d->compressed_fd; if (iFd < 0) - { - Flags |= Fail; - return _error->Error("Reopen is not implemented for pipes opened with FileFd::OpenDescriptor()!"); - } + return FileFdError("Reopen is not implemented for pipes opened with FileFd::OpenDescriptor()!"); } if (OpenInternDescriptor(d->openmode, d->compressor) == false) - { - Flags |= Fail; - return _error->Error("Seek on file %s because it couldn't be reopened", FileName.c_str()); - } + return FileFdError("Seek on file %s because it couldn't be reopened", FileName.c_str()); if (To != 0) return Skip(To); @@@ -1486,10 -1466,7 +1486,7 @@@ #endif res = lseek(iFd,To,SEEK_SET); if (res != (signed)To) - { - Flags |= Fail; - return _error->Error("Unable to seek to %llu", To); - } + return FileFdError("Unable to seek to %llu", To); if (d != NULL) d->seekpos = To; @@@ -1513,10 -1490,7 +1510,7 @@@ bool FileFd::Skip(unsigned long long Ov { unsigned long long toread = std::min((unsigned long long) sizeof(buffer), Over); if (Read(buffer, toread) == false) - { - Flags |= Fail; - return _error->Error("Unable to seek ahead %llu",Over); - } + return FileFdError("Unable to seek ahead %llu",Over); Over -= toread; } return true; @@@ -1530,10 -1504,7 +1524,7 @@@ #endif res = lseek(iFd,Over,SEEK_CUR); if (res < 0) - { - Flags |= Fail; - return _error->Error("Unable to seek ahead %llu",Over); - } + return FileFdError("Unable to seek ahead %llu",Over); if (d != NULL) d->seekpos = res; @@@ -1547,17 -1518,11 +1538,11 @@@ bool FileFd::Truncate(unsigned long lon { #if defined HAVE_ZLIB || defined HAVE_BZ2 if (d != NULL && (d->gz != NULL || d->bz2 != NULL)) - { - Flags |= Fail; - return _error->Error("Truncating compressed files is not implemented (%s)", FileName.c_str()); - } + return FileFdError("Truncating compressed files is not implemented (%s)", FileName.c_str()); #endif if (ftruncate(iFd,To) != 0) - { - Flags |= Fail; - return _error->Error("Unable to truncate to %llu",To); - } - + return FileFdError("Unable to truncate to %llu",To); + return true; } /*}}}*/ @@@ -1585,10 -1550,7 +1570,7 @@@ unsigned long long FileFd::Tell( #endif Res = lseek(iFd,0,SEEK_CUR); if (Res == (off_t)-1) - { - Flags |= Fail; - _error->Errno("lseek","Failed to determine the current file position"); - } + FileFdErrno("lseek","Failed to determine the current file position"); if (d != NULL) d->seekpos = Res; return Res; @@@ -1601,10 -1563,7 +1583,7 @@@ unsigned long long FileFd::FileSize( { struct stat Buf; if ((d == NULL || d->pipe == false) && fstat(iFd,&Buf) != 0) - { - Flags |= Fail; - return _error->Errno("fstat","Unable to determine the file size"); - } + return FileFdErrno("fstat","Unable to determine the file size"); // for compressor pipes st_size is undefined and at 'best' zero if ((d != NULL && d->pipe == true) || S_ISFIFO(Buf.st_mode)) @@@ -1614,10 -1573,7 +1593,7 @@@ if (d != NULL) d->pipe = true; if (stat(FileName.c_str(), &Buf) != 0) - { - Flags |= Fail; - return _error->Errno("stat","Unable to determine the file size"); - } + return FileFdErrno("stat","Unable to determine the file size"); } return Buf.st_size; @@@ -1659,16 -1615,10 +1635,10 @@@ unsigned long long FileFd::Size( * bits of the file */ // FIXME: Size for gz-files is limited by 32bit… no largefile support if (lseek(iFd, -4, SEEK_END) < 0) - { - Flags |= Fail; - return _error->Errno("lseek","Unable to seek to end of gzipped file"); - } + return FileFdErrno("lseek","Unable to seek to end of gzipped file"); size = 0L; if (read(iFd, &size, 4) != 4) - { - Flags |= Fail; - return _error->Errno("read","Unable to read original size of gzipped file"); - } + return FileFdErrno("read","Unable to read original size of gzipped file"); #ifdef WORDS_BIGENDIAN uint32_t tmp_size = size; @@@ -1678,10 -1628,7 +1648,7 @@@ #endif if (lseek(iFd, oldPos, SEEK_SET) < 0) - { - Flags |= Fail; - return _error->Errno("lseek","Unable to seek in gzipped file"); - } + return FileFdErrno("lseek","Unable to seek in gzipped file"); return size; } @@@ -1698,8 -1645,7 +1665,7 @@@ time_t FileFd::ModificationTime( struct stat Buf; if ((d == NULL || d->pipe == false) && fstat(iFd,&Buf) != 0) { - Flags |= Fail; - _error->Errno("fstat","Unable to determine the modification time of file %s", FileName.c_str()); + FileFdErrno("fstat","Unable to determine the modification time of file %s", FileName.c_str()); return 0; } @@@ -1712,8 -1658,7 +1678,7 @@@ d->pipe = true; if (stat(FileName.c_str(), &Buf) != 0) { - Flags |= Fail; - _error->Errno("fstat","Unable to determine the modification time of file %s", FileName.c_str()); + FileFdErrno("fstat","Unable to determine the modification time of file %s", FileName.c_str()); return 0; } } @@@ -1769,11 -1714,40 +1734,40 @@@ bool FileFd::Close( bool FileFd::Sync() { if (fsync(iFd) != 0) + return FileFdErrno("sync",_("Problem syncing the file")); + return true; + } + /*}}}*/ + // FileFd::FileFdErrno - set Fail and call _error->Errno *{{{*/ + bool FileFd::FileFdErrno(const char *Function, const char *Description,...) + { + Flags |= Fail; + va_list args; + size_t msgSize = 400; + int const errsv = errno; + while (true) { - Flags |= Fail; - return _error->Errno("sync",_("Problem syncing the file")); + va_start(args,Description); + if (_error->InsertErrno(GlobalError::ERROR, Function, Description, args, errsv, msgSize) == false) + break; + va_end(args); } - return true; + return false; + } + /*}}}*/ + // FileFd::FileFdError - set Fail and call _error->Error *{{{*/ + bool FileFd::FileFdError(const char *Description,...) { + Flags |= Fail; + va_list args; + size_t msgSize = 400; + while (true) + { + va_start(args,Description); + if (_error->Insert(GlobalError::ERROR, Description, args, msgSize) == false) + break; + va_end(args); + } + return false; } /*}}}*/ diff --combined apt-pkg/contrib/fileutl.h index 510b1c984,3ec01dd9a..f8e30e6ea --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@@ -149,6 -149,10 +149,10 @@@ class FileF private: FileFdPrivate* d; bool OpenInternDescriptor(unsigned int const Mode, APT::Configuration::Compressor const &compressor); + + // private helpers to set Fail flag and call _error->Error + bool FileFdErrno(const char* Function, const char* Description,...) __like_printf(3) __cold; + bool FileFdError(const char* Description,...) __like_printf(2) __cold; }; bool RunScripts(const char *Cnf); @@@ -180,9 -184,6 +184,9 @@@ bool WaitFd(int Fd,bool write = false,u pid_t ExecFork(); bool ExecWait(pid_t Pid,const char *Name,bool Reap = false); +// check if the given file starts with a PGP cleartext signature +bool StartsWithGPGClearTextSignature(std::string const &FileName); + // File string manipulators std::string flNotDir(std::string File); std::string flNotFile(std::string File); @@@ -190,6 -191,4 +194,6 @@@ std::string flNoLink(std::string File) std::string flExtension(std::string File); std::string flCombine(std::string Dir,std::string File); + + #endif diff --combined apt-pkg/contrib/strutl.cc index 64731b482,d0e74d8c5..8ce3a306f --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@@ -759,7 -759,7 +759,8 @@@ bool ReadMessages(int Fd, vectorFindI("APT::pkgPackageManager::MaxLoopCount", 500); + const unsigned int max_loops = _config->FindI("APT::pkgPackageManager::MaxLoopCount", 5000); unsigned int i=0; + std::list needConfigure; do { Changed = false; @@@ -353,7 -354,7 +354,7 @@@ continue; Bad = true; - // Search for dependencies which are unpacked but aren't configured yet (maybe loops) + // Check for dependencies that have not been unpacked, probably due to loops. for (DepIterator Cur = Start; true; ++Cur) { SPtrArray VList = Cur.AllTargets(); @@@ -373,51 -374,66 +374,66 @@@ } // Check if the version that is going to be installed will satisfy the dependency - if (Cache[DepPkg].InstallVer != *I) + if (Cache[DepPkg].InstallVer != *I || List->IsNow(DepPkg) == false) continue; - if (List->IsFlag(DepPkg,pkgOrderList::UnPacked)) + if (PkgLoop == true) { - if (List->IsFlag(DepPkg,pkgOrderList::Loop) && PkgLoop) - { - // This dependency has already been dealt with by another SmartConfigure on Pkg - Bad = false; - break; - } - /* Check for a loop to prevent one forming - If A depends on B and B depends on A, SmartConfigure will - just hop between them if this is not checked. Dont remove the - loop flag after finishing however as loop is already set. - This means that there is another SmartConfigure call for this - package and it will remove the loop flag */ + if (Debug) + std::clog << OutputInDepth(Depth) << "Package " << Pkg << " loops in SmartConfigure" << std::endl; + Bad = false; + break; + } + else + { + if (Debug) + clog << OutputInDepth(Depth) << "Unpacking " << DepPkg.FullName() << " to avoid loop " << Cur << endl; if (PkgLoop == false) List->Flag(Pkg,pkgOrderList::Loop); - if (SmartConfigure(DepPkg, Depth + 1) == true) + if (SmartUnPack(DepPkg, true, Depth + 1) == true) { Bad = false; if (List->IsFlag(DepPkg,pkgOrderList::Loop) == false) - Changed = true; + Changed = true; } if (PkgLoop == false) - List->RmFlag(Pkg,pkgOrderList::Loop); - // If SmartConfigure was succesfull, Bad is false, so break + List->RmFlag(Pkg,pkgOrderList::Loop); if (Bad == false) break; } - else if (List->IsFlag(DepPkg,pkgOrderList::Configured)) - { - Bad = false; - break; - } } - if (Cur == End) + + if (Cur == End || Bad == false) break; - } + } if (Bad == false) continue; - // Check for dependencies that have not been unpacked, probably due to loops. + needConfigure.push_back(Start); + } + if (i++ > max_loops) + return _error->Error("Internal error: MaxLoopCount reached in SmartUnPack (1) for %s, aborting", Pkg.FullName().c_str()); + } while (Changed == true); + + Bad = false, Changed = false, i = 0; + do + { + Changed = false; + for (std::list::const_iterator D = needConfigure.begin(); D != needConfigure.end(); ++D) + { + // Compute a single dependency element (glob or) without modifying D + pkgCache::DepIterator Start, End; + { + pkgCache::DepIterator Discard = *D; + Discard.GlobOr(Start,End); + } + + if (End->Type != pkgCache::Dep::Depends) + continue; + Bad = true; + + // Search for dependencies which are unpacked but aren't configured yet (maybe loops) for (DepIterator Cur = Start; true; ++Cur) { SPtrArray VList = Cur.AllTargets(); @@@ -428,44 -444,53 +444,53 @@@ PkgIterator DepPkg = Ver.ParentPkg(); // Check if the version that is going to be installed will satisfy the dependency - if (Cache[DepPkg].InstallVer != *I || List->IsNow(DepPkg) == false) + if (Cache[DepPkg].InstallVer != *I) continue; - if (PkgLoop == true) - { - if (Debug) - std::clog << OutputInDepth(Depth) << "Package " << Pkg << " loops in SmartConfigure" << std::endl; - Bad = false; - break; - } - else + if (List->IsFlag(DepPkg,pkgOrderList::UnPacked)) { - if (Debug) - clog << OutputInDepth(Depth) << "Unpacking " << DepPkg.FullName() << " to avoid loop " << Cur << endl; + if (List->IsFlag(DepPkg,pkgOrderList::Loop) && PkgLoop) + { + // This dependency has already been dealt with by another SmartConfigure on Pkg + Bad = false; + break; + } + /* Check for a loop to prevent one forming + If A depends on B and B depends on A, SmartConfigure will + just hop between them if this is not checked. Dont remove the + loop flag after finishing however as loop is already set. + This means that there is another SmartConfigure call for this + package and it will remove the loop flag */ if (PkgLoop == false) List->Flag(Pkg,pkgOrderList::Loop); - if (SmartUnPack(DepPkg, true, Depth + 1) == true) + if (SmartConfigure(DepPkg, Depth + 1) == true) { Bad = false; if (List->IsFlag(DepPkg,pkgOrderList::Loop) == false) - Changed = true; + Changed = true; } if (PkgLoop == false) - List->RmFlag(Pkg,pkgOrderList::Loop); + List->RmFlag(Pkg,pkgOrderList::Loop); + // If SmartConfigure was succesfull, Bad is false, so break if (Bad == false) break; } + else if (List->IsFlag(DepPkg,pkgOrderList::Configured)) + { + Bad = false; + break; + } } - - if (Cur == End) + if (Cur == End || Bad == false) break; - } + } + if (Bad == true && Changed == false && Debug == true) - std::clog << OutputInDepth(Depth) << "Could not satisfy " << Start << std::endl; + std::clog << OutputInDepth(Depth) << "Could not satisfy " << *D << std::endl; } if (i++ > max_loops) - return _error->Error("Internal error: MaxLoopCount reached in SmartUnPack for %s, aborting", Pkg.FullName().c_str()); + return _error->Error("Internal error: MaxLoopCount reached in SmartUnPack (2) for %s, aborting", Pkg.FullName().c_str()); } while (Changed == true); if (Bad) { @@@ -603,7 -628,7 +628,7 @@@ bool pkgPackageManager::SmartUnPack(Pkg This will be either dealt with if the package is configured as a dependency of Pkg (if and when Pkg is configured), or by the ConfigureAll call at the end of the for loop in OrderInstall. */ bool Changed = false; - const unsigned int max_loops = _config->FindI("APT::pkgPackageManager::MaxLoopCount", 500); + const unsigned int max_loops = _config->FindI("APT::pkgPackageManager::MaxLoopCount", 5000); unsigned int i = 0; do { diff --combined cmdline/apt-get.cc index df24609b6,85ed80a95..2bd4cad53 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@@ -1962,7 -1962,6 +1962,6 @@@ bool DoInstall(CommandLine &CmdL if (Fix != NULL) { // Call the scored problem resolver - Fix->InstallProtect(); Fix->Resolve(true); delete Fix; } @@@ -2943,7 -2942,7 +2942,7 @@@ bool DoBuildDep(CommandLine &CmdL for (; Ver != verlist.end(); ++Ver) { forbidden.clear(); - if (Ver->MultiArch == pkgCache::Version::None || Ver->MultiArch == pkgCache::Version::All) + if (Ver->MultiArch == pkgCache::Version::None) { if (colon == string::npos) Pkg = Ver.ParentPkg().Group().FindPkg(hostArch); @@@ -2961,7 -2960,7 +2960,7 @@@ else if (strcmp(D->Package.c_str() + colon, ":native") == 0) Pkg = Ver.ParentPkg().Group().FindPkg("native"); } - else if ((Ver->MultiArch & pkgCache::Version::Foreign) == pkgCache::Version::Foreign) + else if ((Ver->MultiArch & pkgCache::Version::Foreign) == pkgCache::Version::Foreign || Ver->MultiArch == pkgCache::Version::All) { if (colon == string::npos) Pkg = Ver.ParentPkg().Group().FindPkg("native"); @@@ -3123,8 -3122,7 +3122,7 @@@ } } } - - Fix.InstallProtect(); + if (Fix.Resolve(true) == false) _error->Discard(); @@@ -3252,10 -3250,7 +3250,10 @@@ bool DownloadChangelog(CacheFile &Cache return true; // error - return _error->Error("changelog download failed"); + pkgRecords Recs(CacheFile); + pkgRecords::Parser &rec=Recs.Lookup(Ver.FileList()); + string srcpkg = rec.SourcePkg().empty() ? Pkg.Name() : rec.SourcePkg(); + return _error->Error("changelog for this version is not (yet) available; try https://launchpad.net/ubuntu/+source/%s/+changelog", srcpkg.c_str()); } /*}}}*/ // DisplayFileInPager - Display File with pager /*{{{*/ diff --combined cmdline/apt-key index 166508c8e,2c087acbc..65d3f5400 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@@ -17,13 -17,13 +17,13 @@@ f GPG="$GPG_CMD" -MASTER_KEYRING="" -ARCHIVE_KEYRING_URI="" -#MASTER_KEYRING=/usr/share/keyrings/debian-master-keyring.gpg -#ARCHIVE_KEYRING_URI=http://ftp.debian.org/debian/debian-archive-keyring.gpg -ARCHIVE_KEYRING=/usr/share/keyrings/debian-archive-keyring.gpg -REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg +# ubuntu keyrings +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/project/ubuntu-archive-keyring.gpg +TMP_KEYRING=/var/lib/apt/keyrings/maybe-import-keyring.gpg requires_root() { if [ "$(id -u)" -ne 0 ]; then @@@ -32,10 -32,20 +32,20 @@@ fi } + # gpg defaults to mode 0600 for new keyrings. Create one with 0644 instead. + init_keyring() { + for path; do + if ! [ -e "$path" ]; then + touch -- "$path" + chmod 0644 -- "$path" + fi + done + } + add_keys_with_verify_against_master_keyring() { ADD_KEYRING=$1 MASTER=$2 - + if [ ! -f "$ADD_KEYRING" ]; then echo "ERROR: '$ADD_KEYRING' not found" return @@@ -50,28 -60,12 +60,28 @@@ # 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` + all_add_keys=`$GPG_CMD --keyring $ADD_KEYRING --with-colons --list-keys | grep ^[ps]ub | cut -d: -f5` master_keys=`$GPG_CMD --keyring $MASTER --with-colons --list-keys | grep ^pub | cut -d: -f5` + + # ensure there are no colisions LP: #857472 + for all_add_key in $all_add_keys; do + for master_key in $master_keys; do + if [ "$all_add_key" = "$master_key" ]; then + echo >&2 "Keyid collision for '$all_add_key' detected, operation aborted" + return 1 + fi + done + done + for add_key in $add_keys; do - ADDED=0 + # export the add keyring one-by-one + rm -f $TMP_KEYRING + $GPG_CMD --keyring $ADD_KEYRING --output $TMP_KEYRING --export $add_key + # check if signed with the master key and only add in this case + ADDED=0 for master_key in $master_keys; do - if $GPG_CMD --keyring $ADD_KEYRING --list-sigs --with-colons $add_key | grep ^sig | cut -d: -f5 | grep -q $master_key; then - $GPG_CMD --quiet --batch --keyring $ADD_KEYRING --export $add_key | $GPG --import + if $GPG_CMD --keyring $MASTER --keyring $TMP_KEYRING --check-sigs --with-colons $add_key | grep '^sig:!:' | cut -d: -f5 | grep -q $master_key; then + $GPG --import $TMP_KEYRING ADDED=1 fi done @@@ -79,16 -73,12 +89,16 @@@ echo >&2 "Key '$add_key' not added. It is not signed with a master key" fi done + rm -f $TMP_KEYRING } # update the current archive signing keyring from a network URI # the archive-keyring keys needs to be signed with the master key # (otherwise it does not make sense from a security POV) net_update() { + # Disabled for now as code is insecure (LP: #1013639 (and 857472, 1013128)) + exit 1 + if [ -z "$ARCHIVE_KEYRING_URI" ]; then echo >&2 "ERROR: Your distribution is not supported in net-update as no uri for the archive-keyring is set" exit 1 @@@ -108,7 -98,7 +118,7 @@@ if [ -e $keyring ]; then old_mtime=$(stat -c %Y $keyring) fi - (cd /var/lib/apt/keyrings; wget -q -N $ARCHIVE_KEYRING_URI) + (cd /var/lib/apt/keyrings; wget --timeout=90 -q -N $ARCHIVE_KEYRING_URI) if [ ! -e $keyring ]; then return fi @@@ -122,7 -112,7 +132,7 @@@ update() { if [ ! -f $ARCHIVE_KEYRING ]; then echo >&2 "ERROR: Can't find the archive-keyring" - echo >&2 "Is the debian-archive-keyring package installed?" + echo >&2 "Is the ubuntu-keyring package installed?" exit 1 fi requires_root @@@ -173,7 -163,7 +183,7 @@@ if [ "$1" = "--keyring" ]; the #echo "keyfile given" shift TRUSTEDFILE="$1" - if [ -r "$TRUSTEDFILE" ] || [ "$2" = 'add' ]; then + if [ -r "$TRUSTEDFILE" ] || [ "$2" = 'add' ] || [ "$2" = 'adv' ]; then GPG="$GPG --keyring $TRUSTEDFILE --primary-keyring $TRUSTEDFILE" else echo >&2 "Error: The specified keyring »$TRUSTEDFILE« is missing or not readable" @@@ -218,33 -208,42 +228,42 @@@ f case "$command" in add) requires_root + init_keyring "$TRUSTEDFILE" $GPG --quiet --batch --import "$1" echo "OK" ;; del|rm|remove) requires_root + init_keyring "$TRUSTEDFILE" $GPG --quiet --batch --delete-key --yes "$1" echo "OK" ;; update) + init_keyring "$TRUSTEDFILE" update ;; net-update) + init_keyring "$TRUSTEDFILE" net_update ;; list) + init_keyring "$TRUSTEDFILE" $GPG --batch --list-keys ;; finger*) + init_keyring "$TRUSTEDFILE" $GPG --batch --fingerprint ;; export) + init_keyring "$TRUSTEDFILE" $GPG --armor --export "$1" ;; exportall) + init_keyring "$TRUSTEDFILE" $GPG --armor --export ;; adv*) + init_keyring "$TRUSTEDFILE" echo "Executing: $GPG $*" $GPG $* ;; diff --combined configure.in index 44334e3e9,541d0e95f..b0ec78c81 --- a/configure.in +++ b/configure.in @@@ -18,7 -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) PACKAGE="apt" - PACKAGE_VERSION="0.9.7.9~exp3ubuntu1" -PACKAGE_VERSION="0.9.8.1" ++PACKAGE_VERSION="0.9.9ubuntu1" PACKAGE_MAIL="APT Development Team " AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION") diff --combined debian/changelog index 1194658c2,b20bc1f60..ae8141966 --- a/debian/changelog +++ b/debian/changelog @@@ -1,11 -1,87 +1,154 @@@ - apt (0.9.7.9~exp3ubuntu1) UNRELEASEDsaucy; urgency=low ++apt (0.9.9ubuntu1) UNRELEASEDsaucy; urgency=low + - * merged from debian ++ * merged from the debian/sid branch + - -- Michael Vogt Tue, 30 Apr 2013 10:28:43 +0200 ++ -- Michael Vogt Tue, 02 Jul 2013 16:48:08 +0200 + - apt (0.9.7.9~exp3) experimental; urgency=low + apt (0.9.9) unstable; urgency=low + + [ Michael Vogt ] + * improve debug output for the Debug::pkgProblemResolver and + Debug::pkgDepCache::AutoInstall + * improve apt-cdrom output when no CD-ROM can be auto-detected + * document --no-auto-detect in apt-cdrom + + [ David Kalnischkies ] + * build the en manpages in subdirectory doc/en + * remove -ldl from cdrom and -lutil from apt-get linkage + * rewrite pkgOrderList::DepRemove to stop incorrect immediate setting + (Closes: 645713) + * prefer Essentials over Removals in ordering score + * fix priority sorting by prefering higher in MarkInstall + * try all providers in order if uninstallable in MarkInstall + * do unpacks before configures in SmartConfigure (Closes: #707578) + * fix support for multiple patterns in apt-cache search (Closes: #691453) + * set Fail flag in FileFd on all errors consistently + * don't explicitly init ExtractTar InFd with invalid fd + * OpenDescriptor should autoclose fd always on error (Closes: #704608) + * fail in CopyFile if the FileFds have error flag set + * ensure state-dir exists before coyping cdrom files + * fix file location for configure-index.gz in apt.conf(5) (Closes: #711921) + * handle missing "Description" in apt-cache show (Closes: #712435) + * try defaults if auto-detection failed in apt-cdrom (Closes: #712433) + * support \n and \r\n line endings in ReadMessages + * do not redownload unchanged InRelease files + * trigger NODATA error for invalid InRelease files (Closes: #712486) + + -- Michael Vogt Tue, 02 Jul 2013 08:58:33 +0200 + + apt (0.9.8.2) unstable; urgency=low + + [ Programs translations ] + * French translation : typo fix. Closes: #677272 + + [ Guillem Jover ] + * Update Vcs fields (Closes: #708562) + + [ Michael Vogt ] + * buildlib/apti18n.h.in: + - fix build failure when building without NLS (closes: #671587) + + [ Gregoire Menuel ] + * Fix double free (closes: #711045) + + [ Raphael Geissert ] + * Fix crash when the "mirror" method does not find any entry + (closes: #699303) + + [ Johan Kiviniemi ] + * cmdline/apt-key: + - Create new keyrings with mode 0644 instead of 0600. + - Accept a nonexistent --keyring file with the adv subcommand as well. + + -- Michael Vogt Thu, 06 Jun 2013 19:15:14 +0200 + + apt (0.9.8.1) unstable; urgency=low + + [ David Kalnischkies ] + * apt-pkg/indexcopy.cc: + - non-inline RunGPGV methods to restore ABI compatibility with previous + versions to fix partial upgrades (Closes: #707771) + + [ Michael Vogt ] + * moved source to http://git.debian.org/apt/apt.git + * updated gbp.conf to match what bzr-buildpackage is doing + * remove .bzr-buildpackage/default.conf (superseeded by gbp.conf) + + -- Michael Vogt Thu, 16 May 2013 14:50:43 +0200 + + apt (0.9.8) unstable; urgency=low + + [ Ludovico Cavedon ] + * properly handle if-modfied-since with libcurl/https + (closes: #705648) + + [ Andreas Beckman ] + * apt-pkg/algorithms.cc: + - Do not propagate negative scores from rdepends. Propagating the absolute + value of a negative score may boost obsolete packages and keep them + installed instead of installing their successors. (Closes: #699759) ++ ++ [ Michael Vogt ] ++ * apt-pkg/sourcelist.cc: ++ - fix segfault when a hostname contains a [, thanks to ++ Tzafrir Cohen (closes: #704653) ++ * debian/control: ++ - replace manpages-it (closes: #704723) ++ ++ [ David Kalnischkies ] ++ * various simple changes to fix cppcheck warnings ++ * apt-pkg/pkgcachegen.cc: ++ - do not store the MD5Sum for every description language variant as ++ it will be the same for all so it can be shared to save cache space ++ - handle language tags for descriptions are unique strings to be shared ++ - factor version string creation out of NewDepends, so we can easily reuse ++ version strings e.g. for implicit multi-arch dependencies ++ - equal comparisions are used mostly in same-source relations, ++ so use this to try to reuse some version strings ++ - sort group and package names in the hashtable on insert ++ - share version strings between same versions (of different architectures) ++ to save some space and allow quick comparisions later on ++ * apt-pkg/pkgcache.cc: ++ - assume sorted hashtable entries for groups/packages ++ * apt-pkg/cacheiterators.h: ++ - provide DepIterator::IsSatisfied as a nicer shorthand for DepCheck ++ * apt-pkg/deb/debversion.cc: ++ - add a string-equal shortcut for equal version comparisions ++ ++ [ Marc Deslauriers ] ++ * make apt-ftparchive generate missing deb-src hashes (LP: #1078697) ++ ++ [ Yaroslav Halchenko ] ++ * Fix English spelling error in a message ('A error'). Unfuzzy ++ translations. Closes: #705087 ++ ++ [ Programs translations ] ++ * French translation completed (Christian Perrier) ++ ++ [ Manpages translations ] ++ * French translation completed (Christian Perrier) ++ ++ [ Daniel Hartwig ] ++ * apt-pkg/contrib/strutl.cc: ++ - include port in shortened URIs (e.g. with apt-cache policy, progress ++ display) thanks to James McCoy (Closes: #154868, #322074) ++ - percent-encode username and password when writing URIs ++ * methods/http.cc: ++ - properly escape IP-literals (e.g. IPv6 address) when building ++ Host headers and URIs (Closes: #620344) ++ * methods/https.cc: ++ - use https_proxy environment variable if present, falling back to ++ http_proxy otherwise ++ - use authentication credentials from proxy URI ++ (Closes: #651640, LP: #1087512) ++ - environment variables do not override an explicit no proxy ++ directive ("DIRECT") in apt.conf ++ - disregard all_proxy environment variable, like other methods ++ ++ -- Michael Vogt Wed, 08 May 2013 18:43:28 +0200 + ++apt (0.9.7.9~exp3) experimental; urgency=low + [ Michael Vogt ] * apt-pkg/sourcelist.cc: - fix segfault when a hostname contains a [, thanks to @@@ -45,8 -121,25 +188,25 @@@ [ Manpages translations ] * French translation completed (Christian Perrier) + + [ Daniel Hartwig ] + * apt-pkg/contrib/strutl.cc: + - include port in shortened URIs (e.g. with apt-cache policy, progress + display) thanks to James McCoy (Closes: #154868, #322074) + - percent-encode username and password when writing URIs + * methods/http.cc: + - properly escape IP-literals (e.g. IPv6 address) when building + Host headers and URIs (Closes: #620344) + * methods/https.cc: + - use https_proxy environment variable if present, falling back to + http_proxy otherwise + - use authentication credentials from proxy URI + (Closes: #651640, LP: #1087512) + - environment variables do not override an explicit no proxy + directive ("DIRECT") in apt.conf + - disregard all_proxy environment variable, like other methods - -- Michael Vogt Mon, 08 Apr 2013 17:09:00 +0200 + -- Michael Vogt Wed, 08 May 2013 18:43:28 +0200 apt (0.9.7.9~exp2) experimental; urgency=low @@@ -191,50 -284,6 +351,50 @@@ apt (0.9.7.8~exp1) experimental; urgenc -- Michael Vogt Fri, 01 Mar 2013 14:16:42 +0100 +apt (0.9.7.7ubuntu4) raring; urgency=low + + [ Michael Vogt ] + * test/integration/test-bug-1078697-missing-source-hashes: + - add test for deb-src hash generation + + [ Marc Deslauriers ] + * make apt-ftparchive generate missing deb-src hashes (LP: #1078697) + + -- Michael Vogt Thu, 11 Apr 2013 14:52:15 +0200 + +apt (0.9.7.7ubuntu3) raring; urgency=low + + * SECURITY UPDATE: InRelease verification bypass + - CVE-2013-1051 + + [ David Kalnischk ] + * apt-pkg/deb/debmetaindex.cc, + test/integration/test-bug-595691-empty-and-broken-archive-files, + test/integration/test-releasefile-verification: + - disable InRelease downloading until the verification issue is + fixed, thanks to Ansgar Burchardt for finding the flaw + + -- Michael Vogt Thu, 14 Mar 2013 14:25:56 +0100 + +apt (0.9.7.7ubuntu2) raring; urgency=low + + * Cherry-pick from David's sid branch to fix a multiarch library + installation problem: + + [ David Kalnischkies ] + * apt-pkg/depcache.cc: + - prefer to install packages which have an already installed M-A:same + sibling while choosing providers (LP: #1130419) + + -- Steve Langasek Fri, 01 Mar 2013 17:55:03 -0800 + +apt (0.9.7.7ubuntu1) raring; urgency=low + + * Merge from Debian unstable, pulling in new translations and fixes. + * Add linux-headers to /etc/kernel/postinst.d/apt-auto-removal guard. + + -- Adam Conrad Fri, 18 Jan 2013 00:32:14 -0700 + apt (0.9.7.7) unstable; urgency=low [ Program translation updates ] @@@ -270,81 -319,6 +430,81 @@@ -- Michael Vogt Thu, 13 Dec 2012 09:52:19 +0100 +apt (0.9.7.6ubuntu6) raring; urgency=low + + * merged from the debian-sid branch + + [ Program translation updates ] + * Catalan (Jordi Mallach) + * Drop a confusing non-breaking space. Closes: #691024 + * Thai (Theppitak Karoonboonyanan). Closes: #691613 + * Vietnamese (Trần Ngọc Quân). Closes: #693773 + * Fix Plural forms in German, French, Japanese and Portuguese + translations. Thanks to Jakub Wilk for reporting these errors. + + [ Michael Vogt ] + * change permissions of /var/log/apt/term.log to 0640 (LP: #975199) + + -- Michael Vogt Thu, 13 Dec 2012 09:14:54 +0100 + +apt (0.9.7.6ubuntu5) raring; urgency=low + + * Revert build-dependency from gettext:any to gettext, now that gettext is + Multi-Arch: foreign. + + -- Colin Watson Thu, 29 Nov 2012 15:43:21 +0000 + +apt (0.9.7.6ubuntu4) raring; urgency=low + + * Fix mismerge of cross-build-dependency handling patch from + 0.8.16~exp12ubuntu7. + + -- Colin Watson Tue, 20 Nov 2012 18:16:36 +0000 + +apt (0.9.7.6ubuntu3) raring; urgency=low + + * Fix comment char in /etc/apt/apt.conf.d/01autoremove-kernels to + use C++ style comments instead of POSIX shell style (LP: #1076237) + + -- Adam Conrad Wed, 07 Nov 2012 23:10:35 -0700 + +apt (0.9.7.6ubuntu2) raring; urgency=low + + * Fix up two things in debian/apt.auto-removal.sh: + - Use exact matches with $-terminated regexes, so we don't get + confusion between similarly-named kernel flavours. + - Keep linux-backports-modules in sync with installed kernels. + + -- Adam Conrad Tue, 06 Nov 2012 15:54:31 -0700 + +apt (0.9.7.6ubuntu1) raring; urgency=low + + [ Michael Vogt ] + * merged from debian-sid + + [ Program translation updates ] + * Catalan (Jordi Mallach) + * Drop a confusing non-breaking space. Closes: #691024 + * Thai (Theppitak Karoonboonyanan). Closes: #691613 + + [ David Kalnischkies ] + * apt-pkg/packagemanager.cc: + - do not do lock-step configuration for a M-A:same package if it isn't + unpacked yet in SmartConfigure and do not unpack a M-A:same package + again in SmartUnPack if we have already configured it (LP: #1062503) + + [ Steve Langasek ] + * debian/apt.conf.autoremove: don't include linux-image*, + linux-restricted-modules*, and linux-ubuntu-modules* packages in the + list to never be autoremoved. + * debian/apt.auto-removal.sh, debian/rules, debian/apt.dirs: install new + script to /etc/kernel/postinst.d/ which ensures we only automatically + keep the currently-running kernel, the being-installed kernel, and the + newest kernel, so we don't fill /boot up with an unlimited number of + kernels. LP: #923876. + + -- Michael Vogt Tue, 06 Nov 2012 15:12:36 +0100 + apt (0.9.7.6) unstable; urgency=low [ Program translation updates ] @@@ -383,93 -357,6 +543,93 @@@ -- Michael Vogt Tue, 16 Oct 2012 18:08:53 +0200 +apt (0.9.7.5ubuntu5) quantal; urgency=low + + * Revert "missing remap registration" change from 0.9.7.5ubuntu4; this + iterator was already registered, and double registration causes a crash + (LP: #1067056). + + -- Colin Watson Tue, 16 Oct 2012 11:35:59 +0100 + +apt (0.9.7.5ubuntu4) quantal-proposed; urgency=low + + [ Colin Watson ] + * apt-pkg/pkgcachegen.cc: + - Fix crash if the cache is remapped while writing a Provides version + (LP: #1066445). + + Cherry-pick from http://bzr.debian.org/bzr/apt/apt/debian-sid: + + [ David Kalnischkies ] + * apt-pkg/pkgcachegen.cc: + - add a missing remap registration causing a segfault in case + we use the not remapped iterators after a move of the mmap again + + -- Colin Watson Sun, 14 Oct 2012 23:54:27 +0100 + +apt (0.9.7.5ubuntu3) quantal-proposed; urgency=low + + * Refresh translations from Launchpad. Amongst other fixes, this drops the + erroneous "个" from "Retrieving file ..." translation in zn_CN. + (LP: #985634) + + -- Martin Pitt Fri, 12 Oct 2012 13:01:30 +0200 + +apt (0.9.7.5ubuntu2) quantal; urgency=low + + Merged from lp:~donkult/apt/experimental: + + [ David Kalnischkies ] + * apt-pkg/contrib/strutl.cc: + - support \n and \r\n line endings in ReadMessages + + [ Michael Vogt ] + * lp:~mvo/apt/webserver-simulate-broken-with-fix346386: + - merge fix for LP: #346386 + + + Merged from http://bzr.debian.org/bzr/apt/apt/debian-sid: + + [ David Kalnischkies ] + * apt-pkg/cdrom.cc: + - copy only configured translation files from a CD-ROM and not all + available translation files preventing new installs with d-i from + being initialized with all translations (Closes: #678227) + - handle Components in the reduction for the source.list as multi-arch CDs + otherwise create duplicated source entries (e.g. "wheezy main main") + * apt-pkg/packagemanager.cc: + - unpack versions only in case a different version from the package + is currently in unpack state to recover from broken system states + (like different file in M-A:same package and other dpkg errors) + and avoid re-unpack otherwise (Closes: #670900) + * debian/control: + - let libapt-pkg break apt < 0.9.4 to ensure that the installed http- + method supports the new redirection-style, thanks to Raphael Geissert + for reporting & testing (Closes: #685192) + * doc/apt_preferences.5.xml: + - use the correct interval (x <= P < y) for pin value documentation as + these are the intervals used by the code (Closes: #685989) + * apt-pkg/indexcopy.cc: + - do not create duplicated flat-archive CD-ROM sources for foreign + architectures on multi-arch CD-ROMs + - do not warn about files which have a record in the Release file, but + are not present on the CD to mirror the behavior of the other methods + and to allow uncompressed indexes to be dropped without scaring users + + -- Michael Vogt Tue, 04 Sep 2012 15:42:09 +0200 + +apt (0.9.7.5ubuntu1) quantal; urgency=low + + [ Michael Vogt ] + * merged latest fixes from the debian-sid branch + + [ TJ ] + * apt-pkg/contrib/netrc.cc: + - increase LOGINSIZE/PASSWORDSIZE limits and add proper error + if the limits are reached (LP: #1008289) + + -- Michael Vogt Tue, 28 Aug 2012 12:06:48 +0200 + apt (0.9.7.5) unstable; urgency=low [ Manpages translation updates ] @@@ -613,19 -500,6 +773,19 @@@ apt (0.9.7.2) unstable; urgency=lo -- Michael Vogt Fri, 13 Jul 2012 21:33:56 +0200 +apt (0.9.7.1ubuntu2) quantal; urgency=low + + * ftparchive/override.cc: + - Double maximum override line length to 1000 (LP: #1038961). + + -- Colin Watson Mon, 20 Aug 2012 12:04:30 +0100 + +apt (0.9.7.1ubuntu1) quantal; urgency=low + + * merged from the debian-sid branch + + -- Michael Vogt Fri, 29 Jun 2012 15:33:42 +0200 + apt (0.9.7.1) unstable; urgency=low [ Program translation updates ] @@@ -684,44 -558,6 +844,44 @@@ apt (0.9.7) unstable; urgency=lo -- Michael Vogt Tue, 19 Jun 2012 16:42:43 +0200 +apt (0.9.6ubuntu3) quantal; urgency=low + + * SECURITY UPDATE: Disable apt-key net-update for now, as validation + code is still insecure + - cmdline/apt-key: exit 1 immediately in net_update() + - CVE-2012-0954 + - LP: #1013639 + + -- Jamie Strandboge Fri, 15 Jun 2012 08:03:17 -0500 + +apt (0.9.6ubuntu2) quantal; urgency=low + + * adjust apt-key to ensure no collisions on subkeys too. Patch thanks to + Marc Deslauriers. (LP: #1013128) + + -- Jamie Strandboge Thu, 14 Jun 2012 11:29:48 -0500 + +apt (0.9.6ubuntu1) quantal; urgency=low + + [ Michael Vogt ] + * merged from Debian, remaining changes: + - use ubuntu keyring and ubuntu archive keyring in apt-key + - run update-apt-xapian-index in apt.cron + - support apt-key net-update and verify keys against master-keyring + - run apt-key net-update in cron.daily + - different example sources.list + - APT::pkgPackageManager::MaxLoopCount set to 5000 + - apport pkgfailure handling + - ubuntu changelog download handling + - patch for apt cross-building, see http://bugs.debian.org/666772 + + [ Steve Langasek ] + * Drop upgrade handling for obsolete conffile /etc/apt/apt.conf.d/01ubuntu, + removed in previous LTS. + * prepare-release: declare the packages needed as source build deps. + + -- Steve Langasek Mon, 11 Jun 2012 22:36:16 +0000 + apt (0.9.6) unstable; urgency=low [ David Kalnischkies ] @@@ -1232,189 -1068,43 +1392,189 @@@ apt (0.8.16~exp13) experimental; urgenc -- Michael Vogt Tue, 06 Mar 2012 18:12:57 +0100 -apt (0.8.16~exp12) experimental; urgency=low +apt (0.8.16~exp12ubuntu10) precise-proposed; urgency=low + + [ Malcolm Scott ] + * apt-pkg/packagemanager.cc: + - Fix a regression in the pre-depend handling: where a pre-depend option + other than the first specified is already installed, apt-get enters an + infinite loop (LP: #985852) [ Michael Vogt ] - * apt-pkg/deb/dpkgpm.cc: - - fix segfault on pkg removal + * apt-pkg/packagemanager.cc: + - add APT::pkgPackageManager::MaxLoopCount to ensure that the + ordering code does not get into a endless loop when it flip-flops + between two states [ David Kalnischkies ] - * apt-pkg/cacheiterators.h: - - return the correct version arch for all+foreign, too - * apt-pkg/packagemanager.cc: - - ignore breaks on not-installed versions while searching for - breakage loops as we don't have to avoid them - * debian/control: - - remove APT from the short descriptions as lintian doesn't like it - and it doesn't transport any information for a reader anyway - - apply typofixes by Pascal De Vuyst, thanks! (Closes: #652834, #652835) - * debian/rules: - - apply patch to enable usage of hardning CPPFLAGS and LDFLAGS by - Moritz Muehlenhoff, thanks! (Closes: #653504) - * methods/https.cc: - - use curls list append instead of appending Range and If-Range by hand - which generates malformed requests, thanks Mel Collins for the hint! - (Closes: #646381) - * test/libapt/run-tests: - - hurd doesn't have dmesg yet and we don't really need it either, - so use with $0 a more stable data source for hashsumming + * apt-pkg/cacheset.cc: + - actually return to the fallback modifier if we have detected we + should for packagenames which look like modifiers (Closes: #669591) + LP: #982716 - [ Pino Toscano ] - * test/libapt/globalerror_test.cc: - - errno 0 has a different strerror on hurd, so generate the expected - message dynamically instead of hardcoding 'Success' (Closes: #656530) + -- Michael Vogt Fri, 20 Apr 2012 11:10:12 +0200 - -- Michael Vogt Tue, 24 Jan 2012 12:24:38 +0100 +apt (0.8.16~exp12ubuntu9) precise-proposed; urgency=low -apt (0.8.16~exp11) experimental; urgency=low + * apt-inst/contrib/extracttar.cc: + - ensure that in StartGzip the InFd is set to "AutoClose" to ensure + that the pipe is closed when InFd is closed. This fixes a Fd leak + (LP: #985452) - [ David Kalnischkies ] + -- Michael Vogt Thu, 19 Apr 2012 11:38:43 +0200 + +apt (0.8.16~exp12ubuntu8) precise; urgency=low + + * Set FD_CLOEXEC on history.log's FD (Closes: #610069, LP: #636010) + + -- Adam Conrad Thu, 12 Apr 2012 16:26:20 -0600 + +apt (0.8.16~exp12ubuntu7) precise; urgency=low + + * clean up obsolete conffile /etc/apt/apt.conf.d/01ubuntu, which was + dropped in maverick. + * Build-depend on gettext:any for cross-building support. + * Don't treat build-depends-indep as cross-build-dependencies; we should + always install the host arch versions. LP: #968828. + * Makefile, po/makefile: make sure our pot generation datestamp doesn't + change at build time, since this makes translations fail to be + co-installable with multiarch. Based on a patch by David Kalnischkies. + Closes: #659333, LP: #924628. + * For cross-build-dependencies, Architecture: all packages should be + treated as implicitly Multi-Arch: foreign, because either they *are* + M-A: foreign when used as a build-dependency, or they need to be updated + to not be Architecture: all; and since cross-build-deps are new + functionality in apt, we can safely make this change without breaking + existing systems. Closes: #666772. + + -- Steve Langasek Thu, 05 Apr 2012 18:00:23 -0700 + +apt (0.8.16~exp12ubuntu6) precise; urgency=low + + * cherry pick from + http://bzr.debian.org/bzr/bzr/apt/apt/debian-experimental2/: + * apt-pkg/packagemanager.cc: + - fix bug in predepends handling - ensure that packages that needs + unpackaging are unpacked before they are configured (LP: #927993) + * apt-pkg/packagemanager.cc: + - do not try to a void a breaks if the broken package pre-depends + on the breaker, but let dpkg auto-deconfigure it + * apt-pkg/packagemanager.cc: + - recheck all dependencies if we changed a package in SmartConfigure + as this could break an earlier dependency (LP: #940396) + * recheck dependencies in SmartUnpack after a change, too + * add Debug::pkgAcqArchive::NoQueue to disable package downloading + + -- Michael Vogt Thu, 15 Mar 2012 19:46:08 +0100 + +apt (0.8.16~exp12ubuntu5) precise; urgency=low + + [ Michael Vogt ] + * merged from the debian-sid branch, most notably: + - Correct fi translation for hash sum mismatches (LP: #420403) + Thanks to Jani Uusitalo + - remove 'old' InRelease file if we can't get a new one before + proceeding with Release.gpg to avoid the false impression of a still + trusted repository by a (still present) old InRelease file. + Thanks to Simon Ruderich for reporting this issue! (CVE-2012-0214) + + -- Michael Vogt Tue, 06 Mar 2012 17:52:50 +0100 + +apt (0.8.16~exp12ubuntu4) precise; urgency=low + + * apt-pkg/contrib/fileutl.h: + - fix compatibility with FileFd::OpenDescriptor() in ReadOnlyGzip mode + + -- Michael Vogt Tue, 14 Feb 2012 10:06:28 +0100 + +apt (0.8.16~exp12ubuntu3) precise; urgency=low + + * Fix IndexCopy::CopyPackages and TranslationsCopy::CopyTranslations to + handle compressed files again (LP: #924182). + + -- Colin Watson Tue, 31 Jan 2012 11:19:46 +0000 + +apt (0.8.16~exp12ubuntu2) precise; urgency=low + + [ David Kalnischkies ] + * apt-pkg/deb/dpkgpm.cc: + - chroot if needed before dpkg --assert-multi-arch + - ensure that dpkg binary doesn't have the chroot-directory prefixed + * apt-pkg/depcache.cc: + - if a M-A:same package is marked for reinstall, mark all it's installed + silbings for reinstallation as well (LP: #859188) + * apt-pkg/contrib/configuration.cc: + - do not stop parent transversal in FindDir if the value is empty + * methods/http{s,}.cc: + - if a file without an extension is requested send an 'Accept: text/*' + header to avoid that the server chooses unsupported compressed files + in a content-negotation attempt (Closes: #657560) + * apt-pkg/aptconfiguration.cc: + - chroot if needed before calling dpkg --print-foreign-architectures + + [ Michael Vogt ] + * apt-pkg/deb/dpkgpm.cc: + - fix crash when a package is in removed but residual config state + (LP: #923807) + + -- Michael Vogt Mon, 30 Jan 2012 21:03:12 +0100 + +apt (0.8.16~exp12ubuntu1) precise; urgency=low + + [ Michael Vogt ] + * merge from debian/experimental: + - new ABI + + [ Steve Langasek ] + * apt-pkg/algorithms.cc: iterate Breaks the same way as Conflicts, so that + we resolve virtual package Breaks more effectively. Thanks to Colin + Watson for the patch. Closes: #657695, LP: #922485. + * apt-pkg/algorithms.{cc,h}: use an int to represent resolver scores, not + a signed short, because large upgrades can result in an overflow for + core packages. Thanks again to Colin Watson. Closes: #657732, + LP: #917173. + * Multi-Arch: none build-deps should be DEB_HOST_ARCH, not DEB_BUILD_ARCH. + Closes: #646288. + + -- Steve Langasek Sun, 29 Jan 2012 00:44:16 +0000 + +apt (0.8.16~exp12) experimental; urgency=low + + [ Michael Vogt ] + * apt-pkg/deb/dpkgpm.cc: + - fix segfault on pkg removal + + [ David Kalnischkies ] + * apt-pkg/cacheiterators.h: + - return the correct version arch for all+foreign, too + * apt-pkg/packagemanager.cc: + - ignore breaks on not-installed versions while searching for + breakage loops as we don't have to avoid them + * debian/control: + - remove APT from the short descriptions as lintian doesn't like it + and it doesn't transport any information for a reader anyway + - apply typofixes by Pascal De Vuyst, thanks! (Closes: #652834, #652835) + * debian/rules: + - apply patch to enable usage of hardning CPPFLAGS and LDFLAGS by + Moritz Muehlenhoff, thanks! (Closes: #653504) + * methods/https.cc: + - use curls list append instead of appending Range and If-Range by hand + which generates malformed requests, thanks Mel Collins for the hint! + (Closes: #646381) + * test/libapt/run-tests: + - hurd doesn't have dmesg yet and we don't really need it either, + so use with $0 a more stable data source for hashsumming + + [ Pino Toscano ] + * test/libapt/globalerror_test.cc: + - errno 0 has a different strerror on hurd, so generate the expected + message dynamically instead of hardcoding 'Success' (Closes: #656530) + + -- Michael Vogt Tue, 24 Jan 2012 12:24:38 +0100 + +apt (0.8.16~exp11) experimental; urgency=low + + [ David Kalnischkies ] * apt-pkg/deb/dpkgpm.cc: - redirect out/input of dpkg --assert-multi-arch to /dev/null - if multi-arch is detected ensure that pkg:all is reported as pkg:all @@@ -1570,189 -1260,6 +1730,189 @@@ apt (0.8.16~exp6) experimental; urgency -- Michael Vogt Wed, 14 Sep 2011 21:06:51 +0200 +apt (0.8.16~exp5ubuntu14.2.1) UNRELEASED; urgency=low + + [ Daniel Hahler ] + * doc/apt-key.8.xml: Ubuntu specific documentation changes (LP: #445903) + + -- Michael Vogt Thu, 20 Oct 2011 10:58:20 +0200 + +apt (0.8.16~exp5ubuntu14.2) precise; urgency=low + + * Call update-apt-xapian-index with -u on all arches in + cron.daily to make it behave slightly more pleasantly. + + -- Adam Conrad Mon, 09 Jan 2012 07:41:03 -0700 + +apt (0.8.16~exp5ubuntu14.1) precise; urgency=low + + * apt-pkg/edsp.cc: + - fix FTBFS + + -- Michael Vogt Wed, 19 Oct 2011 17:56:49 +0200 + +apt (0.8.16~exp5ubuntu14) precise; urgency=low + + [ David Kalnischkies ] + * apt-pkg/pkgcachegen.cc: + - refactor MergeList by creating -Group, -Package and -Version specialist + - share description list between "same" versions (LP: #868977) + This also means that descriptions are shared across archives now. + * apt-pkg/pkgcache.cc: + - always prefer "en" over "" for "en"-language regardless of cache-order + (LP: #868977) + + -- Michael Vogt Wed, 19 Oct 2011 16:22:31 +0200 + +apt (0.8.16~exp5ubuntu13) oneiric; urgency=low + + [ Adam Conrad ] + * On armel, call update-apt-xapian-index with '-u' to keep the CPU + and I/O usage low. We would do this on all arches, but there's a + regression risk here, but that's better than killing slow systems. + + [ Michael Vogt ] + * cmdline/apt-key: + - fix apt-key net-update, thanks to Marc Deslauriers and + Adam Conrad for the code review (LP: #857472) + + -- Michael Vogt Thu, 06 Oct 2011 16:14:41 +0200 + +apt (0.8.16~exp5ubuntu12) oneiric; urgency=low + + [ David Kalnischkies ] + * apt-pkg/deb/deblistparser.cc: + - fix crash when the dynamic mmap needs to be remapped during + LoadReleaseInfo (LP: #854090) + + -- Michael Vogt Mon, 26 Sep 2011 13:31:11 +0200 + +apt (0.8.16~exp5ubuntu11) oneiric; urgency=low + + [ Colin Watson ] + * ftparchive/cachedb.cc: + - fix buffersize in bytes2hex + + [ Marc Deslauriers ] + * SECURITY UPDATE: Disable apt-key net-update for now, as validation + code is insecure. + - cmdline/apt-key: exit immediately out of net_update(). + - CVE number pending + + -- Michael Vogt Thu, 22 Sep 2011 17:30:45 +0200 + +apt (0.8.16~exp5ubuntu10) oneiric; urgency=low + + * methods/https.cc: + - cleanup broken downloads properly (just like http) + + -- Michael Vogt Tue, 20 Sep 2011 18:26:13 +0200 + +apt (0.8.16~exp5ubuntu9) oneiric; urgency=low + + [ Michael Vogt ] + * apt-pkg/acquire-item.h, apt-pkg/deb/debmetaindex.cc: + - fix fetching translated package descriptions (including the newly + stripped out english ones) by adding OptionalSubIndexTarget + + [ David Kalnischkies ] + * apt-pkg/acquire-item.cc: + - if no Release.gpg file is found try to verify with hashes, + but do not fail if a hash can't be found + * apt-pkg/indexrecords.cc: + - fix Acquire::Max-ValidTime option by interpreting it really + as seconds as specified in the manpage and not as days + - add an Acquire::Min-ValidTime option (Closes: #640122) + * doc/apt.conf.5.xml: + - reword Acquire::Max-ValidTime documentation to make clear + that it doesn't provide the new Min-ValidTime functionality + + -- Michael Vogt Fri, 16 Sep 2011 09:50:16 +0200 + +apt (0.8.16~exp5ubuntu8) oneiric; urgency=low + + * cherry pick r1825 from lp:~mvo/apt/mvo: + * apt-pkg/contrib/configuration.cc: + - fix double delete (LP: #848907) + - ignore only the invalid regexp instead of all options + + * cherry pick r2165 from lp:~donkult/apt/sid: + [ David Kalnischkies ] + * cmdline/apt-get.cc: + - output list of virtual package providers to c1out in -q=1 + instead of /dev/null to unbreak sbuild (LP: #816155) + + -- Michael Vogt Tue, 13 Sep 2011 18:23:09 +0200 + +apt (0.8.16~exp5ubuntu7) oneiric; urgency=low + + [ Michael Vogt ] + * cherry pick revision 2173 from lp:~donkult/apt/sid + + [ David Kalnischkies ] + - M-A:same lockstep unpack should operate on installed + packages first (LP: #835625) + + -- Michael Vogt Tue, 13 Sep 2011 09:03:33 +0200 + +apt (0.8.16~exp5ubuntu6) oneiric; urgency=low + + [ Michael Vogt + * merged lp:~jr/ubuntu/oneiric/apt/bzr-get-rename, thanks to + Jonathan Riddell + + [ David Kalnischkies ] + * lots of cppcheck fixes + * apt-pkg/packagemanager.cc, apt-pkg/pkgcache.cc: + - ignore "self"-conflicts for all architectures of a package + instead of just for the architecture of the package locked at + in the ordering of installations too (Closes: #802901) + + -- Michael Vogt Wed, 17 Aug 2011 11:32:58 +0200 + +apt (0.8.16~exp5ubuntu5) oneiric; urgency=low + + * debian/control: + - fix VCS location + * methods/mirror.cc: + - include the architecture(s) in the query string as well so + that the server can make better decisions + + -- Michael Vogt Thu, 11 Aug 2011 18:03:19 +0200 + +apt (0.8.16~exp5ubuntu4) oneiric; urgency=low + + * Merge change from Robert Collins to upgrade ubuntu-keyring recommends + to a hard dependency to match Debian behaviour and fix LP: #816606 + + -- Adam Conrad Tue, 09 Aug 2011 14:48:24 -0600 + +apt (0.8.16~exp5ubuntu3) oneiric; urgency=low + + * apt-pkg/acquire.cc: + - fix potential divide-by-zero (LP: #823277) + + -- Michael Vogt Tue, 09 Aug 2011 15:56:44 +0200 + +apt (0.8.16~exp5ubuntu2) oneiric; urgency=low + + * test/integration/test-hashsum-verification: + - add regression test for hashsum verification + * apt-pkg/acquire-item.cc: + - if no Release.gpg file is found, still load the hashes for + verification (closes: #636314) and add test + * apt-pkg/pkgcachegen.cc: + - fix incorrect comparision when checking sources.list freshness + + -- Michael Vogt Tue, 09 Aug 2011 09:22:14 +0200 + +apt (0.8.16~exp5ubuntu1) oneiric; urgency=low + + * merged new version from debian/experimental, this includes + a ABI break and two new library packages + + -- Michael Vogt Mon, 08 Aug 2011 14:30:07 +0200 + apt (0.8.16~exp5) experimental; urgency=low * merged the latest debian-sid fixes @@@ -2039,14 -1546,6 +2199,14 @@@ apt (0.8.15.6) unstable; urgency=lo -- Michael Vogt Mon, 15 Aug 2011 09:20:35 +0200 +apt (0.8.15.5ubuntu1) oneiric; urgency=low + + * apt-pkg/pkgcachegen.{cc,h}: + - fix crash when P.Arch() was used but the cache got remapped + (LP: #812862) + + -- Michael Vogt Mon, 01 Aug 2011 15:18:50 +0200 + apt (0.8.15.5) unstable; urgency=low [ David Kalnischkies ] @@@ -2055,28 -1554,6 +2215,28 @@@ -- Michael Vogt Thu, 28 Jul 2011 16:49:15 +0200 +apt (0.8.15.4ubuntu2) oneiric; urgency=low + + * apt-pkg/contrib/fileutl.{cc,h}: + - add GetModificationTime() helper + * apt-pkg/pkgcachegen.cc: + - regenerate the cache if the sources.list changes to ensure + that changes in the ordering there will be honored by apt + * apt-pkg/sourcelist.{cc,h}: + - add pkgSourceList::GetLastModifiedTime() helper + * apt-pkg/pkgcachegen.{cc,h}: + - use ref-to-ptr semantic in NewDepends() to ensure that the + libapt does not segfault if the cache is remapped in between + (LP: #812862) + + -- Michael Vogt Fri, 29 Jul 2011 18:25:22 +0200 + +apt (0.8.15.4ubuntu1) oneiric; urgency=low + + * merged from debian-sid + + -- Michael Vogt Tue, 26 Jul 2011 13:19:49 +0200 + apt (0.8.15.4) unstable; urgency=low [ David Miller ] @@@ -2141,39 -1618,6 +2301,39 @@@ apt (0.8.15.3) unstable; urgency=lo -- Michael Vogt Mon, 25 Jul 2011 15:04:43 +0200 +apt (0.8.15.2ubuntu2) oneiric; urgency=low + + * cmdline/apt-get.cc: + - fix missing download progress in apt-get download + + -- Michael Vogt Fri, 22 Jul 2011 13:20:49 +0200 + +apt (0.8.15.2ubuntu1) oneiric; urgency=low + + [ Michael Vogt ] + * apt-pkg/acquire-item.cc: + - improve error message for a expired Release file + * apt-pkg/algorithms.cc: + - Hold back packages that would enter "policy-broken" state on upgrade + when doing a "apt-get upgrade" + + [ David Kalnischkies ] + * apt-pkg/pkgcachegen.cc: + - fallback to memory if file is not writeable even if access() + told us the opposite before (e.g. in fakeroot 1.16) (Closes: #630591) + * doc/sources.list.5.xml: + - document available [options] for sources.list entries (Closes: 632441) + * doc/apt.conf.5.xml: + - document APT::Architectures list (Closes: #612102) + * cmdline/apt-get.cc: + - restore all important dependencies for garbage packages (LP: #806274) + * apt-pkg/init.cc: + - use CndSet in pkgInitConfig (Closes: #629617) + * apt-pkg/depcache.cc: + - change default of APT::AutoRemove::SuggestsImportant to true + + -- Michael Vogt Fri, 15 Jul 2011 10:16:45 +0200 + apt (0.8.15.2) unstable; urgency=high * fix from David Kalnischkies for the InRelease gpg verification @@@ -2181,35 -1625,17 +2341,35 @@@ -- Michael Vogt Tue, 12 Jul 2011 11:54:47 +0200 -apt (0.8.15.1) unstable; urgency=low +apt (0.8.15.1ubuntu2) oneiric; urgency=low - [ David Kalnischkies ] - * doc/makefile: - - create doxygen directory to avoid depending on magic (Closes: #628799) - * cmdline/apt-key: - - explicitly state that net-update is not supported if no url is set - - require to be root for add, rm, update and net-update - - clarify update vs. net-update in different distros (Closes: #632043) - * debian/apt.symbols: - - forgot 'mips' in the list for all architecture dependent symbols + [ Brian Murray ] + * apt-pkg/deb/dpkgpm.cc: + - do not report errors encountered when decompressing packages + + [ Michael Vogt ] + * fix from David Kalnischkies for the InRelease gpg verification + code (LP: #784473) + + -- Michael Vogt Wed, 13 Jul 2011 14:42:02 +0200 + +apt (0.8.15.1ubuntu1) oneiric; urgency=low + + * merge from debian/sid + + -- Michael Vogt Thu, 30 Jun 2011 09:16:12 +0100 + +apt (0.8.15.1) unstable; urgency=low + + [ David Kalnischkies ] + * doc/makefile: + - create doxygen directory to avoid depending on magic (Closes: #628799) + * cmdline/apt-key: + - explicitly state that net-update is not supported if no url is set + - require to be root for add, rm, update and net-update + - clarify update vs. net-update in different distros (Closes: #632043) + * debian/apt.symbols: + - forgot 'mips' in the list for all architecture dependent symbols - comment out gcc-4.5 specific symbols as gcc-4.6 is now default - the symbol for PrintStatus() is architecture dependent * apt-pkg/policy.cc: @@@ -2222,17 -1648,6 +2382,17 @@@ -- Michael Vogt Thu, 30 Jun 2011 10:05:36 +0200 +apt (0.8.15ubuntu1) oneiric; urgency=low + + * merged from debian-unstable, remainging changes: + - use ubuntu keyring and ubuntu archive keyring in apt-key + - run update-apt-xapian-index in apt.cron + - support apt-key net-update and verify keys against master-keyring + - run apt-key net-update in cron.daily + - different example sources.list + + -- Michael Vogt Wed, 29 Jun 2011 09:03:39 +0100 + apt (0.8.15) unstable; urgency=low [ Julian Andres Klode ] @@@ -2521,101 -1936,6 +2681,101 @@@ apt (0.8.14.2) UNRELEASED; urgency=lo -- Michael Vogt Mon, 16 May 2011 14:57:52 +0200 +apt (0.8.14.1ubuntu8) UNRELEASED; urgency=low + + [ Michael Vogt ] + * debian/apt.conf.changelog: + - add missing ";", thanks to Julian Andres Klode + + [ Brian Murray ] + * apt-pkg/deb/dpkgpm.cc: + - updated allocate memory string + - cannot access archive string is lowercase + * apt-pkg/deb/dpkgpm.cc: + - resolve issue where AptOrdering is included in DpkgTerminalLog in apport + attachments + + -- Brian Murray Wed, 15 Jun 2011 14:00:43 -0700 + +apt (0.8.14.1ubuntu7) oneiric; urgency=low + + [ Michael Vogt ] + * apt-pkg/deb/deblistparser.cc: + - include all known languages when building the apt cache + (LP: #794907) + * apt-pkg/deb/debindexfile.cc: + - remove some no longer valid checks for "TranslationsAvailable()" + + -- Michael Vogt Thu, 09 Jun 2011 13:56:25 +0200 + +apt (0.8.14.1ubuntu6) oneiric; urgency=low + + [ Brian Murray ] + * apt-pkg/deb/dpkgpm.cc: + - prevent reporting of package installation failures due to inaccessible + local files (LP: #791102, #790040) + - include /var/log/apt/history.log in apport-package reports so we know + the context for the package management request + + [ Michael Vogt ] + * methods/mirror.cc: + - ignore lines starting with "#" in the mirror file + - ignore non http urls in the mirrors + - append the dist (e.g. sid, wheezy) as a query string when + asking for a suitable mirror + + -- Michael Vogt Tue, 07 Jun 2011 15:55:07 +0200 + +apt (0.8.14.1ubuntu5) oneiric; urgency=low + + * apt-pkg/acquire-item.cc: + - do not reject empty Packages files when checking them for + correctness + + -- Michael Vogt Tue, 31 May 2011 10:41:30 +0200 + +apt (0.8.14.1ubuntu4) oneiric; urgency=low + + [ Julian Andres Klode ] + * apt-pkg/acquire-item.cc: + - Reject files known to be invalid (LP: #346386) (Closes: #627642) + + -- Michael Vogt Mon, 30 May 2011 17:12:27 +0200 + +apt (0.8.14.1ubuntu3) oneiric; urgency=low + + * Rebuild with recent binutils. LP: #774175. + + -- Matthias Klose Mon, 23 May 2011 19:15:34 +0200 + +apt (0.8.14.1ubuntu2) oneiric; urgency=low + + * debian/rules: + - build in verbose mode by default (thanks to Matthias Klose) + * debian/control: + - add temporary build-dependency on gcc-4.6 (>= 4.6.0-6ubuntu2) + + -- Michael Vogt Tue, 03 May 2011 13:58:10 +0200 + +apt (0.8.14.1ubuntu1) oneiric; urgency=low + + [ Michael Vogt ] + * merged from the debian-sid bzr branch + + [ Julian Andres Klode ] + * apt-pkg/depcache.cc: + - Really release action groups only once (Closes: #622744) + - Make purge work again for config-files (LP: #244598) (Closes: #150831) + * debian/apt.cron.daily: + - Check power after wait, patch by manuel-soto (LP: #705269) + * debian/control: + - Move ${shlibs:Depends} to Pre-Depends, as we do not want APT + unpacked if a library is too old and thus break upgrades + * doc/apt-key.8.xml: + - Document apt-key net-update (LP: #192810) + + -- Michael Vogt Fri, 29 Apr 2011 17:55:20 +0200 + apt (0.8.14.1) unstable; urgency=low * apt-pkg/acquire-item.cc: @@@ -2658,42 -1978,6 +2818,42 @@@ apt (0.8.14) unstable; urgency=lo -- Julian Andres Klode Fri, 15 Apr 2011 14:28:15 +0200 +apt (0.8.13.2ubuntu3) natty-proposed; urgency=low + + * apt-pkg/deb/dpkgpm.cc: + - stop reporting of apport-package bug reports regarding + dpkg I/O errors (LP: #767776) + + -- Brian Murray Wed, 20 Apr 2011 15:05:12 -0700 + +apt (0.8.13.2ubuntu2) natty; urgency=low + + [ Michael Vogt ] + * debian/apt.cron.daily: + - run unattended-upgrades even if there was a error during + the apt-get update (LP: #676295) + + [ Julian Andres Klode ] + * apt-pkg/indexcopy.cc: + - Use RealFileExists() instead of FileExists(), allows amongst other + things a directory named Sources to exist on a CD-ROM (LP: #750694). + + [ David Kalnischkies ] + * apt-pkg/pkgcache.cc: + - use the native Architecture stored in the cache header instead of + loading it from configuration as suggested by Julian Andres Klode + + -- Michael Vogt Thu, 07 Apr 2011 12:52:21 +0200 + +apt (0.8.13.2ubuntu1) natty; urgency=low + + * merge fixes from debian-sid, most notable the handling of + arch=all architectures in python-apt (LP: #733741) + * apt-pkg/aptconfiguration.cc: + - fix comparing for a empty string + + -- Michael Vogt Tue, 05 Apr 2011 13:19:56 +0200 + apt (0.8.13.2) unstable; urgency=low [ David Kalnischkies ] @@@ -2730,12 -2014,6 +2890,12 @@@ -- Michael Vogt Tue, 05 Apr 2011 09:40:28 +0200 +apt (0.8.13.1ubuntu1) natty; urgency=low + + * merged fixes from the debian-sid (LP: #744832) + + -- Michael Vogt Mon, 04 Apr 2011 14:40:51 +0200 + apt (0.8.13.1) unstable; urgency=low * apt-pkg/acquire-item.cc: Use stat buffer if stat was @@@ -2743,24 -2021,6 +2903,24 @@@ -- Julian Andres Klode Sat, 02 Apr 2011 20:55:35 +0200 +apt (0.8.13ubuntu2) natty; urgency=low + + * po/makefile: + - add hack to run MSGMERGE again if it segfaults. this is to help + powerpc to bootstrap + * mirror method: + - merge fix from Matt Zimmerman, many thanks (LP: #741098) + - do not crash if the mirror file fails to download + + -- Michael Vogt Thu, 24 Mar 2011 18:01:38 +0100 + +apt (0.8.13ubuntu1) natty; urgency=low + + * merged from debian/sid, this adds important fixes in the + apt mirror method + + -- Michael Vogt Wed, 16 Mar 2011 08:23:19 +0100 + apt (0.8.13) unstable; urgency=low [ Thorsten Spindler ] @@@ -2782,29 -2042,6 +2942,29 @@@ -- Michael Vogt Wed, 16 Mar 2011 08:04:42 +0100 +apt (0.8.12ubuntu2) unstable; urgency=low + + [ Thorsten Spindler ] + * methods/rsh.cc + - fix rsh/ssh option parsing (LP: #678080), thanks to + Ville Mattila + + [ Michael Vogt ] + * apt-pkg/acquire-item.cc: + - mark pkgAcqIndexTrans as Index-File to avoid asking the + user to insert the CD on each apt-get update + * methods/mirror.cc: + - improve debug output and fix bug in TryNextMirror + + -- Michael Vogt Thu, 10 Mar 2011 15:56:54 +0100 + +apt (0.8.12ubuntu1) natty; urgency=low + + * merged from debian/sid, this adds important fixes in the udev based + cdrom handling and multiarch handling + + -- Michael Vogt Thu, 10 Mar 2011 16:12:22 +0100 + apt (0.8.12) unstable; urgency=low [ Michael Vogt ] @@@ -2858,23 -2095,6 +3018,23 @@@ -- Michael Vogt Thu, 10 Mar 2011 14:46:48 +0100 +apt (0.8.11.5ubuntu2) natty; urgency=low + + [ Michael Vogt ] + * apt-pkg/deb/debindexfile.cc: + - ignore missing deb-src files in /var/lib/apt/lists, thanks + to Thorsten Spindler (LP: #85590) + * apt-pkg/contrib/fileutl.cc, apt-pkg/deb/dpkgpm.cc: + - honor Dpkg::Chroot-Directory in the RunScripts*() methods + + -- Michael Vogt Thu, 03 Mar 2011 17:39:30 +0100 + +apt (0.8.11.5ubuntu1) natty; urgency=low + + * Merged from debian/sid + + -- Michael Vogt Fri, 18 Feb 2011 12:01:19 +0100 + apt (0.8.11.5) unstable; urgency=low [ Christian Perrier ] @@@ -3106,27 -2326,6 +3266,27 @@@ apt (0.8.10.1) unstable; urgency=lo -- Michael Vogt Mon, 17 Jan 2011 13:41:04 +0100 +apt (0.8.10ubuntu2) UNRELEASED; urgency=low + + * apt-pkg/deb/dpkgpm.cc: + - ignore lzma "Cannot allocate memory" errors, thanks to Brian + Murray + - add i18n support for the "short read in buffer_copy %s" handling + from dpkg + + -- Michael Vogt Tue, 11 Jan 2011 18:26:05 +0100 + +apt (0.8.10ubuntu1) natty; urgency=low + + [ Julian Andres Klode ] + * cmdline/apt-cache.cc: Create an error for apt-cache depends + if packages could not found (LP: #647045) + + [ Michael Vogt ] + * merged from debian-sid + + -- Michael Vogt Tue, 07 Dec 2010 15:53:49 +0100 + apt (0.8.10) unstable; urgency=low [ Programs translations ] @@@ -3146,48 -2345,6 +3306,48 @@@ -- Michael Vogt Tue, 30 Nov 2010 10:42:17 +0100 +apt (0.8.9ubuntu4) natty; urgency=low + + [ Michael Vogt ] + * cmdline/apt-key: + - set timeout of wget for net-update to 90 seconds (thanks to \sh) + + [ Martin Pitt ] + * Revert r1819 and r1820 to disable compressed indexes by default again. + Testing has brought up a few places where this seriously degrades + performance, mostly in applications which iterate through all available + package records, like update-apt-xapian-index or synaptic. See + https://bugs.launchpad.net/ubuntu/+bugs?field.tag=apt-compressed-indexes + + -- Martin Pitt Thu, 25 Nov 2010 08:50:37 +0100 + +apt (0.8.9ubuntu3) natty; urgency=low + + * methods/http.cc: + - do not hang if Acquire::http::ProxyAutoDetect can not be + executed or returns no data (LP: #654393) + + -- Michael Vogt Mon, 22 Nov 2010 10:42:50 +0100 + +apt (0.8.9ubuntu2) natty; urgency=low + + * drop apt-changelog, apt-get changelog implements all the + features it provides + + -- Michael Vogt Thu, 18 Nov 2010 15:22:40 +0100 + +apt (0.8.9ubuntu1) natty; urgency=low + + * re-merged from the debian-sid bzr branch + * merged lp:~mvo/apt/mvo, this brings two new commands: + - apt-get download binary-pkgname to download a deb + - apt-get changelog binary-pkgname to display the changelog + * cmdline/apt-get.cc: + - if the changelog download failed, do not show the generic error + but point to launchpad instead + + -- Michael Vogt Thu, 18 Nov 2010 15:02:14 +0100 + apt (0.8.9) unstable; urgency=low [ Christian Perrier ] @@@ -3219,47 -2376,6 +3379,47 @@@ -- Michael Vogt Thu, 18 Nov 2010 09:25:04 +0100 +apt (0.8.8ubuntu3) natty; urgency=low + + * cmdline/apt-changelog: Filter out multiple results for a source package, + just take the latest one. + * cmdline/apt-changelog: Read server name from configuration + APT::Changelog::Server instead of hardcoding it. This allows local users + to point to a local changelog mirror, or make this script work for Debian. + * Add debian/apt.conf.changelog: Configuration for apt-changelog with the + server for Ubuntu (changelogs.ubuntu.com). Install it in debian/rules. + * doc/apt-changelog.1.xml: Document the new option. + * test/integration/test-compressed-indexes, test/test-indexes.sh: + - Explicitly disable compressed indexes at the start. This ensures that we + will actually test uncompressed indexes regardless of the internal + default value of Acquire::GzipIndexes. + * apt-pkg/acquire-item.cc: Set Acquire::GzipIndexes to "true" by default, to + store compressed indexes. This feature is now mature enough for general + consumption. Update doc/apt.conf.5.xml accordingly. + * apt-pkg/aptconfiguration.cc: Have Acquire::CompressionTypes::Order default + to preferring "gz", so that compressed indexes will actually work. + + -- Martin Pitt Mon, 15 Nov 2010 12:14:15 +0100 + +apt (0.8.8ubuntu2) natty; urgency=low + + * Add cmdline/apt-changelog: Script to fetch package changelog from + changelogs.ubuntu.com. Install it in cmdline/makefile and debian/rules. + * Add doc/apt-changelog.1.xml, and install it in debian/rules. + + -- Martin Pitt Tue, 09 Nov 2010 11:32:27 +0100 + +apt (0.8.8ubuntu1) natty; urgency=low + + * merged from debian-unstable, remainging changes: + - use ubuntu keyring and ubuntu archive keyring in apt-key + - run update-apt-xapian-index in apt.cron + - support apt-key net-update and verify keys against master-keyring + - run apt-key net-update in cron.daily + - different example sources.list + + -- Michael Vogt Fri, 29 Oct 2010 10:07:09 -0400 + apt (0.8.8) unstable; urgency=low [ David Kalnischkies ] @@@ -3279,17 -2395,6 +3439,17 @@@ -- Michael Vogt Thu, 28 Oct 2010 21:22:21 +0200 +apt (0.8.7ubuntu1) natty; urgency=low + + * merged from debian-unstable, remainging changes: + - use ubuntu keyring and ubuntu archive keyring in apt-key + - run update-apt-xapian-index in apt.cron + - support apt-key net-update and verify keys against master-keyring + - run apt-key net-update in cron.daily + - different example sources.list + + -- Michael Vogt Fri, 15 Oct 2010 18:31:17 +0200 + apt (0.8.7) unstable; urgency=low [ Manpages translations ] @@@ -3408,148 -2513,62 +3568,148 @@@ apt (0.8.4) unstable; urgency=lo -- Michael Vogt Fri, 10 Sep 2010 20:45:15 +0200 -apt (0.8.3) unstable; urgency=low +apt (0.8.3ubuntu7) maverick; urgency=low - [ Programs translations ] - * German (Holger Wansing). Closes: #596141 + [ David Kalnischkies ] + * apt-pkg/depcache.cc: + - do not remove packages which the user requested for installation + explicitly while satisfying other install requests (Closes: #598669) + Test case: debootstrap, install exim4, run "apt-get install postfix" + This will result in exim4-heavy instead of postfix - [ Manpages translations ] - * Japanese (KURASAWA Nozomu). Closes: #595862 + -- Michael Vogt Tue, 05 Oct 2010 14:13:38 +0200 + +apt (0.8.3ubuntu6) maverick; urgency=low [ Michael Vogt ] - * apt-pkg/indexcopy.cc: - - only use trusted.gpg.d directory if it exists - - do not replace /dev/null when running in APT::CDROM::NoAct - mode (LP: #612666), thanks to Colin Watson + * debian/apt.cron.daily: + - source /etc/default/locale (if available) so that the + apt-get update cron job fetches the right translated package + descriptions (LP: #652951) [ David Kalnischkies ] - * ftparchive/apt-ftparchive.cc: - - ensure that BinDirectory as well as Tree settings get - the correct default FileMode setting (Closes: #595922) + * apt-pkg/depcache.cc: + - do not check endpointer packages instead of only those which prevented + NeverAutoRemove settings from having an effect (Closes: #598452) + * cmdline/apt-cache.cc: + - use the TranslatedDescription for searching and not the first + available one as it is maybe not an expected language (Closes: #597925) - -- Michael Vogt Tue, 07 Sep 2010 15:28:41 +0200 + -- Michael Vogt Fri, 01 Oct 2010 15:25:00 +0200 -apt (0.8.2) unstable; urgency=low +apt (0.8.3ubuntu5) maverick; urgency=low - [ Manpages translations ] - * Spanish (Omar Campagne). Closes: #595557 + * debian/apt.dirs: + - add missing /usr/share/apt so that the keyring is installed + into the right place (LP: #620576) - [ David Kalnischkies ] - * apt-pkg/versionmatch.cc: - - do not accept 'Pin: origin "' (missing closing ") as a valid - way to pin a local archive: either "" or none… - * apt-pkg/deb/dpkgpm.cc: - - create Dir::Log if needed to support /var/log as tmpfs or similar, - inspired by Thomas Bechtold, thanks! (Closes: #523919, LP: #220239) - * apt-pkg/indexcopy.cc: - - support really still the APT::GPGV::TrustedKeyring setting, - as it breaks d-i badly otherwise (Closes: #595428) - * cmdline/apt-key: - - support also Dir::Etc::Trusted so that apt-key works in the same - way as the library part which works with the trusted files - * methods/{gzip,bzip2}.cc: - - empty files can never be valid archives (Closes: #595691) + -- Michael Vogt Wed, 22 Sep 2010 18:34:18 +0200 - -- Michael Vogt Mon, 06 Sep 2010 18:10:06 +0200 +apt (0.8.3ubuntu4) maverick; urgency=low -apt (0.8.1) unstable; urgency=low + * merged lp:~mvo/apt/conflicts-on-virtuals to better deal + with conflicts/breaks against virtual packages (LP: #614993) - [ Programs translations ] - * Thai (Theppitak Karoonboonyanan). Closes: #592695 - * Russian (Yuri Kozlov). Closes: #594232 - * Slovak (Ivan Masár). Closes: #594255 - * Swedish (Daniel Nylander). Closes: #594241 - * Japanese (Kenshi Muto, Osamu Aoki). Closes: #594265 - * Italian (Milo Casagrande). Closes: #594238 - * Asturian (maacub). Closes: #594303 - * Simplified Chinese (Aron Xu). Closes: #594458 - * Bulgarian (Damyan Ivanov). Closes: #594627 + -- Michael Vogt Wed, 15 Sep 2010 19:48:26 +0200 + +apt (0.8.3ubuntu3) maverick; urgency=low + + * merged fixes from debian-sid + + [ Michael Vogt ] + * apt-pkg/contrib/cdromutl.cc: + - if apt-cdrom is used on writable media (like usb-sticks), do + not use the root directory to identify the medium (as all + changes there change the ident id). Use the .disk directory + instead + + [ David Kalnischkies ] + * ftparchive/writer.cc: + - null the valid string instead of the date if Valid-Until is not set + * apt-pkg/acquire-item.cc: + - use also unsigned Release files again (Closes: #596189) + + [ Christian Perrier ] + * Fix missing space after dot in a message from apt-pkg + Translations unfuzzied. Thanks to Holger Wansing. + + -- Michael Vogt Fri, 10 Sep 2010 21:45:49 +0200 + +apt (0.8.3ubuntu2) maverick; urgency=low + + * ftparchive/writer.cc: + - write out {Files,Checksum-Sha1,Checksum-Sha256} only if + available LP: #633967. Thanks to Colin Watson + + -- Michael Vogt Thu, 09 Sep 2010 15:30:19 +0200 + +apt (0.8.3ubuntu1) maverick; urgency=low + + * merged fixes from debian-sid + * debian/rules: + - put ubuntu-archive.gpg back into the package (LP: #620576) + * apt-pkg/init.cc: + - ignore ".distUpgrade" and ".save" files in sources.list.d + (LP: #631770) + + -- Michael Vogt Tue, 07 Sep 2010 09:27:24 +0200 + +apt (0.8.3) unstable; urgency=low + + [ Programs translations ] + * German (Holger Wansing). Closes: #596141 + + [ Manpages translations ] + * Japanese (KURASAWA Nozomu). Closes: #595862 + + [ Michael Vogt ] + * apt-pkg/indexcopy.cc: + - only use trusted.gpg.d directory if it exists + - do not replace /dev/null when running in APT::CDROM::NoAct + mode (LP: #612666), thanks to Colin Watson + + [ David Kalnischkies ] + * ftparchive/apt-ftparchive.cc: + - ensure that BinDirectory as well as Tree settings get + the correct default FileMode setting (Closes: #595922) + + -- Michael Vogt Tue, 07 Sep 2010 15:28:41 +0200 + +apt (0.8.2) unstable; urgency=low + + [ Manpages translations ] + * Spanish (Omar Campagne). Closes: #595557 + + [ David Kalnischkies ] + * apt-pkg/versionmatch.cc: + - do not accept 'Pin: origin "' (missing closing ") as a valid + way to pin a local archive: either "" or none… + * apt-pkg/deb/dpkgpm.cc: + - create Dir::Log if needed to support /var/log as tmpfs or similar, + inspired by Thomas Bechtold, thanks! (Closes: #523919, LP: #220239) + * apt-pkg/indexcopy.cc: + - support really still the APT::GPGV::TrustedKeyring setting, + as it breaks d-i badly otherwise (Closes: #595428) + * cmdline/apt-key: + - support also Dir::Etc::Trusted so that apt-key works in the same + way as the library part which works with the trusted files + * methods/{gzip,bzip2}.cc: + - empty files can never be valid archives (Closes: #595691) + + -- Michael Vogt Mon, 06 Sep 2010 18:10:06 +0200 + +apt (0.8.1) unstable; urgency=low + + [ Programs translations ] + * Thai (Theppitak Karoonboonyanan). Closes: #592695 + * Russian (Yuri Kozlov). Closes: #594232 + * Slovak (Ivan Masár). Closes: #594255 + * Swedish (Daniel Nylander). Closes: #594241 + * Japanese (Kenshi Muto, Osamu Aoki). Closes: #594265 + * Italian (Milo Casagrande). Closes: #594238 + * Asturian (maacub). Closes: #594303 + * Simplified Chinese (Aron Xu). Closes: #594458 + * Bulgarian (Damyan Ivanov). Closes: #594627 * Portuguese (Miguel Figueiredo). Closes: #594668 * Korean (Changwoo Ryu). Closes: #594809 * Norwegian BokmÃ¥l (Hans Nordhaug). Closes: #595182 @@@ -3586,69 -2605,6 +3746,69 @@@ -- Michael Vogt Fri, 03 Sep 2010 18:36:11 +0200 +apt (0.8.0ubuntu3) maverick; urgency=low + + * merged fixes from the debian-sid bzr branch: + + [ Programs translations ] + * Simplified Chinese (Aron Xu). Closes: #594458 + * Bulgarian (Damyan Ivanov). Closes: #594627 + * Portuguese (Miguel Figueiredo). Closes: #594668 + * Korean (Changwoo Ryu). Closes: #594809 + + [ Manpages translations ] + * Portuguese (Américo Monteiro) + + [ David Kalnischkies ] + * cmdline/apt-cache.cc: + - remove useless GetInitialize method + * cmdline/apt-get.cc: + - remove direct calls of ReadMainList and use the wrapper instead + to protect us from useless re-reads and two-times notice display + - remove death code by removing unused GetInitialize + * apt-pkg/depcache.cc: + - now that apt-get purge works on 'rc' packages let the MarkDelete + pass this purge forward to the non-pseudo package for pseudos + * apt-pkg/contrib/fileutl.cc: + - apply SilentlyIgnore also on files without an extension + * apt-pkg/contrib/configuration.cc: + - fix autoremove by using correct config-option name and + don't make faulty assumptions in error handling (Closes: #594689) + * apt-pkg/versionmatch.cc: + - let the pin origin actually work as advertised in the manpage + which means "" are optional and pinning a local archive does + work - even if it is a non-flat archive (Closes: #594435) + + -- Michael Vogt Fri, 03 Sep 2010 17:05:53 +0200 + +apt (0.8.0ubuntu2) maverick; urgency=low + + * merged fixes from the debian-sid bzr branch: + + [ Programs translations ] + * Thai (Theppitak Karoonboonyanan). Closes: #592695 + * Russian (Yuri Kozlov). Closes: #594232 + * Slovak (Ivan Masár). Closes: #594255 + * Swedish (Daniel Nylander). Closes: #594241 + * Japanese (Kenshi Muto, Osamu Aoki). Closes: #594265 + * Italian (Milo Casagrande). Closes: #594238 + * Asturian (maacub). Closes: #594303 + + [ Christian Perrier ] + * Fix spelling error in cmdline/apt-get.cc. Thanks to Osamu Aoki + Closes: #594211 + + [ David Kalnischkies ] + * show in madison command again also source packages (LP: #614589) + + -- Michael Vogt Thu, 26 Aug 2010 18:56:23 +0200 + +apt (0.8.0ubuntu1) maverick; urgency=low + + * merged from debian/unstable + + -- Michael Vogt Tue, 24 Aug 2010 21:39:06 +0200 + apt (0.8.0) unstable; urgency=low [ Michael Vogt ] @@@ -3691,20 -2647,6 +3851,20 @@@ apt (0.8.0~pre2) experimental; urgency= -- Michael Vogt Mon, 23 Aug 2010 19:09:08 +0200 +apt (0.8.0~pre1ubuntu2) maverick; urgency=low + + * apt-pkg/deb/dpkgpm.cc: + - enable apport reports again (got lost in the previous merge), + thanks to Matt Zimmerman + + -- Michael Vogt Mon, 23 Aug 2010 13:53:09 +0200 + +apt (0.8.0~pre1ubuntu1) maverick; urgency=low + + * merged fixes from debian/experimental + + -- Michael Vogt Fri, 13 Aug 2010 17:49:40 +0200 + apt (0.8.0~pre1) experimental; urgency=low [ Programs translations ] @@@ -3747,56 -2689,6 +3907,56 @@@ -- Michael Vogt Fri, 13 Aug 2010 17:00:49 +0200 +apt (0.7.26~exp12ubuntu4) maverick; urgency=low + + [ Julian Andres Klode ] + * apt-pkg/contrib/fileutl.cc: + - Add WriteAtomic mode. + - Revert WriteEmpty to old behavior (LP: #613211) + * apt-pkg, methods: + - Convert users of WriteEmpty to WriteAtomic. + * apt-pkg/depcache.cc: + - Only try upgrade for Breaks if there is a newer version, otherwise + handle it as Conflicts (by removing it) (helps for #591882). + + [ Michael Vogt ] + * debian/control: + - Add recommends on gnupg to apt, apt-key uses it. + (changed from debian) + + -- Michael Vogt Wed, 11 Aug 2010 12:01:30 +0200 + +apt (0.7.26~exp12ubuntu3) maverick; urgency=low + + [ Colin Watson ] + * apt-pkg/cdrom.cc: + - fix off-by-one error in DropBinaryArch + + -- Michael Vogt Mon, 02 Aug 2010 21:04:18 +0200 + +apt (0.7.26~exp12ubuntu2) maverick; urgency=low + + * debian/apt.postinst: + - do not fail if ubuntu-keyring is not installed + + -- Michael Vogt Mon, 02 Aug 2010 11:47:59 +0200 + +apt (0.7.26~exp12ubuntu1) maverick; urgency=low + + * ABI break upload + * merged from debian/experimental, remaining changes: + - use ubuntu keyring and ubuntu archive keyring in apt-key + - run update-apt-xapian-index in apt.cron + - support apt-key net-update and verify keys against master-keyring + - run apt-key net-update in cron.daily + - different example sources.list + * debian/apt.postinst + - drop set_apt_proxy_from_gconf(), no longer needed in maverick + * apt-pkg/pkgcache.cc: + - re-evaluate the architectures cache when the cache is (re)opened + + -- Michael Vogt Fri, 30 Jul 2010 19:32:15 +0200 + apt (0.7.26~exp12) experimental; urgency=low [ Michael Vogt ] @@@ -4411,231 -3303,85 +4571,231 @@@ apt (0.7.26~exp1) experimental; urgency -- Michael Vogt Thu, 18 Feb 2010 16:11:39 +0100 -apt (0.7.25.3) unstable; urgency=low +apt (0.7.25.3ubuntu10) maverick; urgency=low - [ Christian Perrier ] - * Italian translation update. Closes: #567532 + [ Michael Vogt ] + * debian/apt.conf.ubuntu: + - no longer install (empty) apt.conf.d/01ubuntu + * apt-pkg/deb/dpkgpm.cc: + - make the apt/term.log output unbuffered (thanks to Matt Zimmerman) + - fix FTBFS (LP: #600155) - [ David Kalnischkies ] - * apt-pkg/contrib/macros.h: - - install the header system.h with a new name to be able to use - it in other headers (Closes: #567662) - * cmdline/acqprogress.cc: - - Set Mode to Medium so that the correct prefix is used. - Thanks Stefan Haller for the patch! (Closes: #567304 LP: #275243) - * ftparchive/writer.cc: - - generate sha1 and sha256 checksums for dsc (Closes: #567343) - * cmdline/apt-get.cc: - - don't mark as manually if in download only (Closes: #468180) + [ Matthias G. ] + * apt-pkg/deb/dpkgpm.cc: + - Fix segmentation fault when /var/log/apt ist missing. LP: #535509 - -- Michael Vogt Mon, 01 Feb 2010 18:41:15 +0100 + -- Michael Vogt Thu, 08 Jul 2010 09:37:03 +0200 -apt (0.7.25.2) unstable; urgency=low +apt (0.7.25.3ubuntu9) lucid-proposed; urgency=low - [ Michael Vogt ] - * apt-pkg/contrib/cdromutl.cc: - - fix UnmountCdrom() fails, give it a bit more time and try - the umount again - * apt-pkg/cdrom.cc: - - fix crash in pkgUdevCdromDevices - * methods/cdrom.cc: - - fixes in multi cdrom setup code (closes: #549312) - - add new "Acquire::cdrom::AutoDetect" config that enables/disables - the dlopen of libudev for automatic cdrom detection. Off by default - currently, feedback/testing welcome - * cmdline/apt-cdrom.cc: - - add new --auto-detect option that uses libudev to figure out - the cdrom/mount-point - * cmdline/apt-mark: - - merge fix from Gene Cash that supports markauto for - packages that are not in the extended_states file yet - (closes: #534920) - * ftparchive/writer.{cc,h}: - - merge crash fix for apt-ftparchive on hurd, thanks to - Samuel Thibault for the patch (closes: #566664) + * debian/apt.postinst: + - do not fail if getent returns nothing useful (LP: #579647) + thanks to Jean-Baptiste Lallement - [ David Kalnischkies ] - * apt-pkg/contrib/fileutl.cc: - - Fix the newly introduced method GetListOfFilesInDir to not - accept every file if no extension is enforced - (= restore old behaviour). (Closes: #565213) - * apt-pkg/policy.cc: - - accept also partfiles with "pref" file extension as valid - * apt-pkg/contrib/configuration.cc: - - accept also partfiles with "conf" file extension as valid - * doc/apt.conf.5.xml: - - reorder description and split out syntax - - add partfile name convention (Closes: #558348) - * doc/apt_preferences.conf.5.xml: - - describe partfile name convention also here - * apt-pkg/deb/dpkgpm.cc: - - don't segfault if term.log file can't be opened. - Thanks Sam Brightman for the patch! (Closes: #475770) - * doc/*: - - replace the per language addendum with a global addendum - - add a explanation why translations include (maybe) english - parts to the new global addendum (Closes: #561636) - * apt-pkg/contrib/strutl.cc: - - fix malloc asseration fail with ja_JP.eucJP locale in - apt-cache search. Thanks Kusanagi Kouichi! (Closes: #548884) + -- Michael Vogt Fri, 14 May 2010 09:40:50 +0200 - [ Christian Perrier ] - * French translation update +apt (0.7.25.3ubuntu8) lucid-proposed; urgency=low - -- Michael Vogt Wed, 27 Jan 2010 16:16:10 +0100 + [ Loïc Minier ] + * Use https:// in Vcs-Bzr URL. -apt (0.7.25.1) unstable; urgency=low + [ Michael Vogt ] + * apt-pkg/deb/debrecords.cc: + - fix max tag buffer size (LP: #545336, closes: #578959) + * apt-pkg/indexfile.cc: + - If no "_" is found in the language code, try to find a "." + This is required for languages like Esperanto that have no + county associated with them (LP: #560956) + Thanks to "Aisano" for the fix - [ Christian Perrier ] - * French manpage translation update - * Russian translation update by Yuri Kozlov - Closes: #564171 + -- Michael Vogt Wed, 05 May 2010 10:33:46 +0200 + +apt (0.7.25.3ubuntu7) lucid; urgency=low + + Cherry pick fixes from the lp:~mvo/apt/mvo branch: + + [ Evan Dandrea ] + * Remember hosts with general failures for + https://wiki.ubuntu.com/NetworklessInstallationFixes (LP: #556831). + + [ Michael Vogt ] + * improve debug output for Debug::pkgPackageManager + + -- Michael Vogt Wed, 14 Apr 2010 20:30:03 +0200 + +apt (0.7.25.3ubuntu6) lucid; urgency=low + + * cmdline/apt-get.cc: + - fix crash when pkg.VersionList() is empty (LP: #556056) + + -- Michael Vogt Thu, 08 Apr 2010 21:13:25 +0200 + +apt (0.7.25.3ubuntu5) lucid; urgency=low + + [ David Kalnischkies ] + * 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 Wed, 31 Mar 2010 21:59:42 +0200 + +apt (0.7.25.3ubuntu4) lucid; urgency=low + + [ David Kalnischkies ] + * 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() + * apt-pkg/deb/dpkgpm.cc: + - fix error message construction in OpenLog() + + -- Michael Vogt Fri, 26 Mar 2010 16:57:49 +0100 + +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 ] + * 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 "oldlibs" to the APT::Never-MarkAuto-Sections as its used + for transitional packages + * apt-pkg/deb/dpkgpm.cc: + - fix backgrounding when dpkg runs (closes: #486222) + * cmdline/apt-mark: + - show error on incorrect aguments (LP: #517917), thanks to + Torsten Spindler + * cmdline/apt-get.cc: + - if apt-get source foo=version or foo/distro can not be found, + 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 + useful when using several different archives on the same host. + (Closes: #329814, LP: #22354) + + -- Michael Vogt Fri, 12 Mar 2010 23:10:52 +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 + + -- Michael Vogt Wed, 17 Feb 2010 23:33:32 +0100 + +apt (0.7.25.3) unstable; urgency=low + + [ Christian Perrier ] + * Italian translation update. Closes: #567532 + + [ David Kalnischkies ] + * apt-pkg/contrib/macros.h: + - install the header system.h with a new name to be able to use + it in other headers (Closes: #567662) + * cmdline/acqprogress.cc: + - Set Mode to Medium so that the correct prefix is used. + Thanks Stefan Haller for the patch! (Closes: #567304 LP: #275243) + * ftparchive/writer.cc: + - generate sha1 and sha256 checksums for dsc (Closes: #567343) + * cmdline/apt-get.cc: + - don't mark as manually if in download only (Closes: #468180) + + -- Michael Vogt Mon, 01 Feb 2010 18:41:15 +0100 + +apt (0.7.25.2) unstable; urgency=low + + [ Michael Vogt ] + * apt-pkg/contrib/cdromutl.cc: + - fix UnmountCdrom() fails, give it a bit more time and try + the umount again + * apt-pkg/cdrom.cc: + - fix crash in pkgUdevCdromDevices + * methods/cdrom.cc: + - fixes in multi cdrom setup code (closes: #549312) + - add new "Acquire::cdrom::AutoDetect" config that enables/disables + the dlopen of libudev for automatic cdrom detection. Off by default + currently, feedback/testing welcome + * cmdline/apt-cdrom.cc: + - add new --auto-detect option that uses libudev to figure out + the cdrom/mount-point + * cmdline/apt-mark: + - merge fix from Gene Cash that supports markauto for + packages that are not in the extended_states file yet + (closes: #534920) + * ftparchive/writer.{cc,h}: + - merge crash fix for apt-ftparchive on hurd, thanks to + Samuel Thibault for the patch (closes: #566664) + + [ David Kalnischkies ] + * apt-pkg/contrib/fileutl.cc: + - Fix the newly introduced method GetListOfFilesInDir to not + accept every file if no extension is enforced + (= restore old behaviour). (Closes: #565213) + * apt-pkg/policy.cc: + - accept also partfiles with "pref" file extension as valid + * apt-pkg/contrib/configuration.cc: + - accept also partfiles with "conf" file extension as valid + * doc/apt.conf.5.xml: + - reorder description and split out syntax + - add partfile name convention (Closes: #558348) + * doc/apt_preferences.conf.5.xml: + - describe partfile name convention also here + * apt-pkg/deb/dpkgpm.cc: + - don't segfault if term.log file can't be opened. + Thanks Sam Brightman for the patch! (Closes: #475770) + * doc/*: + - replace the per language addendum with a global addendum + - add a explanation why translations include (maybe) english + parts to the new global addendum (Closes: #561636) + * apt-pkg/contrib/strutl.cc: + - fix malloc asseration fail with ja_JP.eucJP locale in + apt-cache search. Thanks Kusanagi Kouichi! (Closes: #548884) + + [ Christian Perrier ] + * French translation update + + -- Michael Vogt Wed, 27 Jan 2010 16:16:10 +0100 + +apt (0.7.25.1) unstable; urgency=low + + [ Christian Perrier ] + * French manpage translation update + * Russian translation update by Yuri Kozlov + Closes: #564171 [Chris Leick] * spot & fix various typos in all manpages @@@ -4677,39 -3423,6 +4837,39 @@@ -- Michael Vogt Sat, 09 Jan 2010 21:52:36 +0100 +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" + * methods/http.cc: + - add cache-control headers even if no cache is given to allow + adding options for intercepting proxies + + -- Michael Vogt Tue, 02 Feb 2010 16:58:59 -0800 + +apt (0.7.25ubuntu3) lucid; urgency=low + + * cmdline/apt-get.cc: + - don't mark as manually if in download only (Closes: #468180) + + -- Michael Vogt Mon, 01 Feb 2010 18:41:15 +0100 + +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 + * merged from the lp:~mvo/apt/history branch + + -- Michael Vogt Tue, 22 Dec 2009 09:44:08 +0100 + apt (0.7.25) unstable; urgency=low [ Christian Perrier ] @@@ -4853,29 -3566,6 +5013,29 @@@ -- Michael Vogt Tue, 15 Dec 2009 09:21:55 +0100 +apt (0.7.24ubuntu1) lucid; urgency=low + + [ Michael Vogt ] + * apt-pkg/deb/dpkgpm.cc: + - include df -l output in the apport log as well (thanks to + tjaalton) + * apt-pkg/packagemanager.cc: + - add output about pre-depends configuring when debug::pkgPackageManager + is used + * methods/https.cc: + - fix incorrect use of CURLOPT_TIMEOUT, closes: #497983, LP: #354972 + thanks to Brian Thomason for the patch + * merge lp:~mvo/apt/netrc branch, this adds support for a + /etc/apt/auth.conf that can be used to store username/passwords + in a "netrc" style file (with the extension that it supports "/" + in a machine definition). Based on the maemo git branch. + + [ Brian Murray ] + * apt-pkg/depcache.cc, apt-pkg/indexcopy.cc: + - typo fix (LP: #462328) + + -- Michael Vogt Mon, 14 Dec 2009 09:27:26 +0100 + apt (0.7.24) unstable; urgency=low [ Nicolas François ] @@@ -4945,59 -3635,6 +5105,59 @@@ -- Michael Vogt Fri, 25 Sep 2009 19:57:25 +0200 +apt (0.7.23.1ubuntu2) karmic; urgency=low + + [ Michael Vogt ] + * debian/control: + - fix Vcr-Bzr header + + [ Kees Cook ] + * debian/apt.cron.daily: + - fix quotes for use with "eval", thanks to Lars Ljung (LP: #449535). + + -- Michael Vogt Thu, 15 Oct 2009 19:05:19 +0200 + +apt (0.7.23.1ubuntu1) karmic; urgency=low + + [ 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) + + [ Loïc Minier ] + * cmdline/apt-key: + - Emit a warning if removed keys keyring is missing and skip associated + checks (LP: #218971) + + [ Brian Murray ] + * cmdline/apt-get.cc: + - typo fix (LP: #370094) + + [ Michael Vogt ] + * apt-pkg/deb/dpkgpm.cc: + - when tcgetattr() returns non-zero skip all pty magic + (thanks to Simon Richter, closes: #509866) + * apt-inst/contrib/arfile.cc: + - show propper error message for Invalid archive members + * 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) + * debian/apt.cron.daily: + - if the timestamp is too far in the future, delete it + (LP: #135262) + + [ Merge ] + * merged from debian, reverted the libdlopen-udev branch + because its too late in the release process for this now + * not merged the proxy behaviour change from 0.7.23 (that will + be part of lucid) + + -- Michael Vogt Wed, 23 Sep 2009 18:15:10 +0200 + apt (0.7.23.1) unstable; urgency=low [ Michael Vogt ] @@@ -5227,34 -3864,6 +5387,34 @@@ apt (0.7.22) unstable; urgency=lo -- Michael Vogt Wed, 29 Jul 2009 19:16:22 +0200 +apt (0.7.21ubuntu1) karmic; urgency=low + + * merged from the debian-sid bzr branch + + [ Christian Perrier ] + * Documentation translations: + - Fix a typo in apt-get(8) French translation. Closes: #525043 + Thanks to Guillaume Delacour for spotting it. + * Translations: + - fr.po + - sk.po. Closes: #525857 + - ru.po. Closes: #526816 + - eu.po. Closes: #528985 + - zh_CN.po. Closes: #531390 + - fr.po + - it.po. Closes: #531758 + - ca.po. Closes: #531921 + * Added translations + - ast.po (Asturian by Marcos Alvareez Costales). + Closes: #529007, #529730 + + [ Michael Vogt ] + * apt-pkg/acquire.cc: + - 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 + apt (0.7.21) unstable; urgency=low [ Christian Perrier ] @@@ -5298,140 -3907,21 +5458,140 @@@ -- Michael Vogt Tue, 14 Apr 2009 14:12:51 +0200 -apt (0.7.20.2) unstable; urgency=medium +apt (0.7.20.2ubuntu7) karmic; urgency=low - [ Eugene V. Lyubimkin ] - * Urgency set to medium due to RC bug fix. - * doc/apt.ent, apt-get.8.xml: - - Fix invalid XML entities. (Closes: #514402) + * 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 + * include apt ordering into apport package failures - -- Eugene V. Lyubimkin Sat, 07 Feb 2009 16:48:21 +0200 + -- Michael Vogt Fri, 24 Apr 2009 10:14:01 +0200 -apt (0.7.20.1) unstable; urgency=low +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 (LP: #354793) [ Michael Vogt ] - * apt-pkg/pkgcachegen.cc: - - fix apt-cache search for localized description - (closes: #512110) + * 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 + + [ 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) + - 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 + +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: + - 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: + - 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 Mon, 09 Mar 2009 16:33:28 +0100 + +apt (0.7.20.2ubuntu1) jaunty; urgency=low + + [ Christian Perrier ] + * Translations: + - bg.po. Closes: #513211 + - zh_TW.po. Closes: #513311 + - nb.po. Closes: #513843 + + [ Michael Vogt ] + * merged from the debian-sid branch + * [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) + * apt-pkg/contrib/strutl.cc: + - fix TimeToStr i18n (LP: #289807) + * debian/apt.conf.autoremove: + - readd "linux-image" (and friends) to the auto-remove + blacklist + * 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: + - 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 + * 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) + + [ Ian Weisser ] + * /apt-pkg/deb/debsystem.cc: + - add 'sudo' to the error message to "run 'dpkg --configure -a'" + (LP: #52697) + + -- Michael Vogt Mon, 09 Feb 2009 14:21:05 +0100 + +apt (0.7.20.2) unstable; urgency=medium + + [ Eugene V. Lyubimkin ] + * Urgency set to medium due to RC bug fix. + * doc/apt.ent, apt-get.8.xml: + - Fix invalid XML entities. (Closes: #514402) + + -- Eugene V. Lyubimkin Sat, 07 Feb 2009 16:48:21 +0200 + +apt (0.7.20.1) unstable; urgency=low + + [ Michael Vogt ] + * apt-pkg/pkgcachegen.cc: + - fix apt-cache search for localized description + (closes: #512110) [ Christian Perrier ] * Translations: @@@ -5485,12 -3975,6 +5645,12 @@@ apt (0.7.20) unstable; urgency=lo -- Michael Vogt Mon, 05 Jan 2009 08:59:20 +0100 +apt (0.7.19ubuntu1) jaunty; urgency=low + + * merge from debian + + -- Michael Vogt Mon, 24 Nov 2008 10:52:20 +0100 + apt (0.7.19) unstable; urgency=low [ Eugene V. Lyubimkin ] @@@ -5789,90 -4273,6 +5949,90 @@@ apt (0.7.15~exp1) experimental; urgency -- Michael Vogt Tue, 16 Sep 2008 21:27:03 +0200 +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 + + * 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) + * apt-pkg/indexcopy.cc: + - 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) + - do not report disk full errors from dpkg via apport + + -- Michael Vogt Thu, 07 Aug 2008 16:28:05 +0200 + +apt (0.7.14ubuntu5) intrepid; urgency=low + + * fix various -Wall warnings + * make "apt-get build-dep" installed packages marked automatic + by default. This can be changed by setting the value of + APT::Get::Build-Dep-Automatic to false (thanks to Aaron + Haviland, closes: #44874, LP: #248268) + + -- Michael Vogt Wed, 06 Aug 2008 14:00:51 +0200 + +apt (0.7.14ubuntu4) intrepid; urgency=low + + [ Michael Vogt ] + * apt-pkg/deb/dpkgpm.cc: + - fix uninitialized variable that caused no apport reports + to be written sometimes (thanks to Matt Zimmerman) + * merge patch that enforces stricter https server certificate + checking (thanks to Arnaud Ebalard, closes: #485960) + * allow per-mirror specific https settings + (thanks to Arnaud Ebalard, closes: #485965) + * add doc/examples/apt-https-method-example.cof + (thanks to Arnaud Ebalard, closes: #485964) + * add DPkg::NoTriggers option so that applications that call + apt/aptitude (like the installer) defer trigger processing + (thanks to Joey Hess) + * document --install-recommends and --no-install-recommends + (thanks to Dereck Wonnacott, LP: #126180) + + [ Dereck Wonnacott ] + * apt-ftparchive might write corrupt Release files (LP: #46439) + * Apply --important option to apt-cache depends (LP: #16947) + + -- Michael Vogt Tue, 05 Aug 2008 10:10:49 +0200 + +apt (0.7.14ubuntu3) intrepid; urgency=low + + [ Otavio Salvador ] + * Apply patch to avoid truncating of arbitrary files. Thanks to Bryan + Donlan for the patch. Closes: #482476 + * Avoid using dbus if dbus-daemon isn't running. Closes: #438803 + + [ Michael Vogt ] + * apt-pkg/deb/dpkgpm.cc: + - improve apt progress reporting, display trigger actions + * apt-pkg/depcache.cc: + - when checking for new important deps, skip critical ones + (LP: #236360) + + -- Michael Vogt Tue, 03 Jun 2008 17:27:07 +0200 + +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.14) unstable; urgency=low [ Christian Perrier ] @@@ -6099,581 -4499,132 +6259,581 @@@ apt (0.7.10) unstable; urgency=lo -- Michael Vogt Mon, 07 Jan 2008 21:40:47 +0100 -apt (0.7.9) unstable; urgency=low +apt (0.7.9ubuntu17) hardy-proposed; urgency=low - [ Christian Perrier ] - * Add several languages to LINGUAS and, therefore, really ship the relevant - translation: - Arabic, Dzongkha, Khmer, Marathi, Nepali, Thai - Thanks to Theppitak Karoonboonyanan for checking this out. Closes: #448321 + * apt-pkg/acquire-item.cc: + - fix signaure removal on transient network failures LP: #220627 + (thanks to Scott James Remnant) - [ Program translations ] - - Korean updated. Closes: #448430 - - Galician updated. Closes: #448497 - - Swedish updated. + -- Michael Vogt Tue, 22 Apr 2008 16:32:49 +0200 - [ Otavio Salvador ] - * Fix configure script to check for CURL library and headers presense. - * Applied patch from Brian M. Carlson - to add backward support for arches that lacks pselect support, - closes: #448406. - * Umount CD-ROM when calling apt-cdrom ident, except when called with - -m, closes: #448521. +apt (0.7.9ubuntu16) hardy; urgency=low - -- Otavio Salvador Wed, 31 Oct 2007 13:37:26 -0200 + * cmdline/apt-key: + - only check against master-keys in net-update to not break + custom CDs (thanks to Colin Watson) -apt (0.7.8) unstable; urgency=low + -- Michael Vogt Tue, 08 Apr 2008 14:17:14 +0200 - * Applied patch from Daniel Leidert to fix - APT::Acquire::Translation "none" support, closes: #437523. - * Applied patch from Daniel Burrows to add support - for the Homepage field (ABI break), closes: #447970. - * Applied patch from Frans Pop to fix a trailing - space after cd label, closes: #448187. +apt (0.7.9ubuntu15) hardy; urgency=low - -- Otavio Salvador Fri, 26 Oct 2007 18:20:13 -0200 + * 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) -apt (0.7.7) unstable; urgency=low + -- Michael Vogt Thu, 13 Mar 2008 23:25:45 +0100 + +apt (0.7.9ubuntu14) hardy; urgency=low - [ Michael Vogt ] - * apt-inst/contrib/extracttar.cc: - - fix fd leak for zero size files (thanks to Bill Broadley for - reporting this bug) - * apt-pkg/acquire-item.cc: - - remove zero size files on I-M-S hit - * methods/https.cc: - - only send LastModified if we actually have a file - - send range request with if-range - - delete failed downloads - - 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 - (ABI break) - - fix parse error when dpkg sends unexpected data - * merged apt--sha256 branch to fully support the new - sha256 checksums in the Packages and Release files - (ABI break) - * apt-pkg/pkgcachegen.cc: - - 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 - * fix missing SetExecClose() call when the status-fd is used - * debian/apt.cron.daily: - - move unattended-upgrade before apt-get autoclean - * fix "purge" commandline argument, closes: #133421 - (thanks to Julien Danjou for the patch) * cmdline/apt-get.cc: - - do not change the auto-installed information if a package - is reinstalled - * apt-pkg/acquire-item.cc: - - fix crash in diff acquire code - * cmdline/apt-mark: - - Fix chmoding after have renamed the extended-states file (LP: #140019) - (thanks to Laurent Bigonville) - * apt-pkg/depcache.cc: - - set "APT::Install-Recommends" to true by default (OMG!) - * debian/apt.cron.daily: - - only run the cron job if apt-get check succeeds (LP: #131719) - - [ Program translations ] - - French updated - - Basque updated. Closes: #436425 - - Fix the zh_CN translator's name in debian/changelog for 0.7.2 - Closes: #423272 - - Vietnamese updated. Closes: #440611 - - Danish updated. Closes: #441102 - - Thai added. Closes: #442833 - - Swedish updated. - - Galician updated. Closes: #446626 + - 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) - [ Otavio Salvador ] - * Add hash support to copy method. Thanks Anders Kaseorg by the patch - (closes: #436055) - * Reset curl options and timestamp between downloaded files. Thanks to - Ryan Murray for the patch (closes: #437150) - * Add support to apt-key to export keys to stdout. Thanks to "Dwayne - C. Litzenberger" for the patch (closes: #441942) - * Fix compilation warnings: - - apt-pkg/indexfile.cc: conversion from string constant to 'char*'; - - apt-pkg/acquire-item.cc: likewise; - - apt-pkg/cdrom.cc: '%lu' expects 'long unsigned int', but argument - has type 'size_t'; - - apt-pkg/deb/dpkgpm.cc: initialization order and conversion from - string constant to 'char*'; - - methods/gpgv.cc: conversion from string constant to 'char*'; - - methods/ftp.cc: likewise; - - cmdline/apt-extracttemplates.cc: likewise; - - apt-pkg/deb/debmetaindex.cc: comparison with string literal results - in unspecified behaviour; - * cmdline/apt-get.cc: adds 'autoremove' as a valid comment to usage - statement of apt-get (closes: #445468). - * cmdline/apt-get.cc: really applies Julien Danjou - patch to add 'purge' command line argument (closes: #133421). + -- Michael Vogt Tue, 11 Mar 2008 21:46:07 +0100 - [ Ian Jackson ] - * dpkg-triggers: Deal properly with new package states. +apt (0.7.9ubuntu13) hardy; urgency=low - [ Colin Watson ] - * apt-pkg/contrib/mmap.cc: - - don't fail if msync() returns > 0 - - -- Michael Vogt Tue, 23 Oct 2007 14:58:03 +0200 + [ Lionel Porcheron ] + * debian/apt.cron.daily: + - only call gconftool if gcontool is installed (LP: #194281) -apt (0.7.6) unstable; urgency=low + [ Michael Vogt ] + * doc/apt_preferences.5.xml: + - 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 + +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) + + -- Michael Vogt Thu, 21 Feb 2008 15:07:44 +0100 + +apt (0.7.9ubuntu11) hardy; urgency=low + + * apt-pkg/algorithms.cc: + - add APT::Update::Post-Invoke-Success script slot + (LP: #188127) + + -- Michael Vogt Thu, 10 Jan 2008 12:06:12 +0100 + +apt (0.7.9ubuntu10) hardy; urgency=low + + * cmdline/apt-key: + - add "net-update" command that fetches the + 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 + + -- Michael Vogt Wed, 13 Feb 2008 15:50:28 +0100 + +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: + - 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: + - remember hosts with Resolve failures or connect Timeouts + see https://wiki.ubuntu.com/NetworklessInstallationFixes + * cmdlines/apt-key: + - fix bug in the new apt-key update code that imports only + keys signed with the master key (thanks to cjwatson) + + -- Michael Vogt Fri, 08 Feb 2008 11:38:35 +0100 + +apt (0.7.9ubuntu6) hardy; urgency=low + + * cmdline/apt-key: + - add support for a master-keyring that contains signing keys + that can be used to sign the archive signing keys. This should + make key-rollover easier. + * apt-pkg/deb/dpkgpm.cc: + - merged patch from Kees Cook to fix anoying upper-case display + on amd64 in sbuild + * apt-pkg/algorithms.cc: + - add APT::Update::Post-Invoke-Success script slot + - Make the breaks handling use the kill list. This means, that a + Breaks: Pkg (<< version) may put Pkg onto the remove list. + * 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/debmetaindex.cc: + - add missing "Release" file uri when apt-get update --print-uris + is run + + -- Michael Vogt Mon, 04 Feb 2008 14:28:02 +0100 + +apt (0.7.9ubuntu5) hardy; urgency=low + + * Merged apt-authentication-reliabilty branch. This means + that apt will refuse to update and use the old lists if + the authentication of a repository that used to be + authenticated fails. See + https://wiki.ubuntu.com/AptAuthenticationReliability + for more details. + + -- Michael Vogt Wed, 16 Jan 2008 10:36:10 +0100 + +apt (0.7.9ubuntu4) hardy; 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:34:37 +0000 + +apt (0.7.9ubuntu3) hardy; urgency=low + + * merged the apt--DoListUpdate branch, this provides a common interface + 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 19:02:11 +0100 + +apt (0.7.9ubuntu2) hardy; urgency=low + + [ Otavio Salvador ] + * Applied patch from Aurelien Jarno to fix building + with newest dpkg-shlibdeps changing the packaging building order and a + patch from Robert Millan to fix parallel building, + closes: #452862. + * Applied patch from Alexander Winston + to use 'min' as symbol for minute, closes: #219034. + * Applied patch from Amos Waterland to allow apt to + work properly in initramfs, closes: #448316. + * Applied patch from Robert Millan to make apt-key and + apt-get to ignore time conflicts, closes: #451328. + * Applied patch from Peter Eisentraut to fix a + grammatical error ("manual installed" -> "manually installed"), + closes: #438136. + * Fix cron.daily job to not call fail if apt isn't installed, closes: + #443286. + + [ Daniel Burrows ] + * apt-pkg/contrib/configuration.cc: + - if RootDir is set, then FindFile and FindDir will return paths + relative to the directory stored in RootDir, closes: #456457. + + [ Christian Perrier ] + * Fix wording for "After unpacking...". Thans to Michael Gilbert + for the patch. Closes: #260825 + + [ Program translations ] + - Vietnamese updated. Closes: #453774 + - Japanese updated. Closes: #456909 + - French updated. + + [ Michael Vogt ] + * apt-pkg/packagemanager.{cc,h}: + - propergate the Immediate flag to make hitting the + "E: Internal Error, Could not perform immediate configuration (2)" + harder. (LP: #179247) + * debian/apt.conf.daily: + - print warning if the cache can not be locked (closes: #454561), + thanks to Bastian Kleineidam + * debian/control: + - build against libdb-dev (instead of libdb4.4-dev) + + -- Michael Vogt Thu, 03 Jan 2008 11:31:45 +0100 + +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. + * Applied patch from Andrei Popescu to add a + note about some frontends in apt.8 manpage, closes: #438545. + * Applied patch from Aurelien Jarno to avoid CPU + getting crazy when /dev/null is redirected to stdin (which breaks + buildds), closes: #452858. + + [ Program translations ] + - Basque updated. Closes: #453088 + + [ Michael Vogt ] + * debian/rules + - fix https install location + * methods/gpgv.cc: + - remove cruft code that caused timestamp/I-M-S issues + * ftparchive/contents.cc: + - fix error output + * methods/mirror.{cc,h}: + - only update mirror list on IndexFile updates + * apt-pkg/acquire-item.{cc,h}: + - make the authentication download code more robust against + servers/proxies with broken If-Range implementations + * debian/control: + - build against libdb-dev (instead of libdb4.4-dev) + * merged the apt--DoListUpdate branch, this provides a common interface + for "apt-get update" like operations for the frontends and also provides + hooks to run stuff in APT::Update::{Pre,Post}-Invoke + + [ Chris Cheney ] + * ftparchive/contents.cc: + - support lzma data members + * ftparchive/multicompress.cc: + - support lzma output + + -- Michael Vogt Thu, 13 Dec 2007 14:46:27 +0100 + +apt (0.7.9) unstable; urgency=low + + [ Christian Perrier ] + * Add several languages to LINGUAS and, therefore, really ship the relevant + translation: + Arabic, Dzongkha, Khmer, Marathi, Nepali, Thai + Thanks to Theppitak Karoonboonyanan for checking this out. Closes: #448321 + + [ Program translations ] + - Korean updated. Closes: #448430 + - Galician updated. Closes: #448497 + - Swedish updated. + + [ Otavio Salvador ] + * Fix configure script to check for CURL library and headers presense. + * Applied patch from Brian M. Carlson + to add backward support for arches that lacks pselect support, + closes: #448406. + * Umount CD-ROM when calling apt-cdrom ident, except when called with + -m, closes: #448521. + + -- Otavio Salvador Wed, 31 Oct 2007 13:37:26 -0200 + +apt (0.7.8) unstable; urgency=low + + * Applied patch from Daniel Leidert to fix + APT::Acquire::Translation "none" support, closes: #437523. + * Applied patch from Daniel Burrows to add support + for the Homepage field (ABI break), closes: #447970. + * Applied patch from Frans Pop to fix a trailing + space after cd label, closes: #448187. + + -- Otavio Salvador Fri, 26 Oct 2007 18:20:13 -0200 + +apt (0.7.7) unstable; urgency=low + + [ Michael Vogt ] + * apt-inst/contrib/extracttar.cc: + - fix fd leak for zero size files (thanks to Bill Broadley for + reporting this bug) + * apt-pkg/acquire-item.cc: + - remove zero size files on I-M-S hit + * methods/https.cc: + - only send LastModified if we actually have a file + - send range request with if-range + - delete failed downloads + - 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 + (ABI break) + - fix parse error when dpkg sends unexpected data + * merged apt--sha256 branch to fully support the new + sha256 checksums in the Packages and Release files + (ABI break) + * apt-pkg/pkgcachegen.cc: + - 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 + * fix missing SetExecClose() call when the status-fd is used + * debian/apt.cron.daily: + - move unattended-upgrade before apt-get autoclean + * fix "purge" commandline argument, closes: #133421 + (thanks to Julien Danjou for the patch) + * cmdline/apt-get.cc: + - do not change the auto-installed information if a package + is reinstalled + * apt-pkg/acquire-item.cc: + - fix crash in diff acquire code + * cmdline/apt-mark: + - Fix chmoding after have renamed the extended-states file (LP: #140019) + (thanks to Laurent Bigonville) + * apt-pkg/depcache.cc: + - set "APT::Install-Recommends" to true by default (OMG!) + * debian/apt.cron.daily: + - only run the cron job if apt-get check succeeds (LP: #131719) + + [ Program translations ] + - French updated + - Basque updated. Closes: #436425 + - Fix the zh_CN translator's name in debian/changelog for 0.7.2 + Closes: #423272 + - Vietnamese updated. Closes: #440611 + - Danish updated. Closes: #441102 + - Thai added. Closes: #442833 + - Swedish updated. + - Galician updated. Closes: #446626 + + [ Otavio Salvador ] + * Add hash support to copy method. Thanks Anders Kaseorg by the patch + (closes: #436055) + * Reset curl options and timestamp between downloaded files. Thanks to + Ryan Murray for the patch (closes: #437150) + * Add support to apt-key to export keys to stdout. Thanks to "Dwayne + C. Litzenberger" for the patch (closes: #441942) + * Fix compilation warnings: + - apt-pkg/indexfile.cc: conversion from string constant to 'char*'; + - apt-pkg/acquire-item.cc: likewise; + - apt-pkg/cdrom.cc: '%lu' expects 'long unsigned int', but argument + has type 'size_t'; + - apt-pkg/deb/dpkgpm.cc: initialization order and conversion from + string constant to 'char*'; + - methods/gpgv.cc: conversion from string constant to 'char*'; + - methods/ftp.cc: likewise; + - cmdline/apt-extracttemplates.cc: likewise; + - apt-pkg/deb/debmetaindex.cc: comparison with string literal results + in unspecified behaviour; + * cmdline/apt-get.cc: adds 'autoremove' as a valid comment to usage + statement of apt-get (closes: #445468). + * cmdline/apt-get.cc: really applies Julien Danjou + patch to add 'purge' command line argument (closes: #133421). + + [ Ian Jackson ] + * dpkg-triggers: Deal properly with new package states. + + [ Colin Watson ] + * apt-pkg/contrib/mmap.cc: + - don't fail if msync() returns > 0 + + -- Michael Vogt Tue, 23 Oct 2007 14:58:03 +0200 + +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 Sat, 20 Oct 2007 07:51:12 +0200 + +apt (0.7.6ubuntu14) gutsy; urgency=low + + * apt-pkg/deb/dpkgpm.cc: + - fix resource leak (LP: #148806) + + -- Michael Vogt Mon, 15 Oct 2007 20:57:44 +0200 + +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) + * methods/https.cc: + - fix off-by-one error I-M-S handling + - cleanup after I-M-S hit + + -- 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 + (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 + 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 + + * apt-pkg/contrib/mmap.cc: + - don't fail if msync() returns > 0 (LP: #144001) + + -- Colin Watson Sat, 22 Sep 2007 21:39:29 +0100 + +apt (0.7.6ubuntu10) gutsy; urgency=low + + * apt-pkg/deb/dpkgpm.cc: + - fix parse error when dpkg sends unexpected data + + -- Michael Vogt Tue, 18 Sep 2007 17:25:09 +0100 + +apt (0.7.6ubuntu9) gutsy; urgency=low + + * apt-pkg/deb/dpkgpm.cc: + - fix progress reporting precent calculation (LP: #137798) + * make apt build with g++ 4.3 + * fix missing SetExecClose() call when the status-fd is used + (LP: #136767) + * debian/apt.cron.daily: + - move unattended-upgrade before apt-get autoclean + * fix "purge" commandline argument, closes LP: #125733 + (thanks to Julien Danjou for the patch) + * cmdline/apt-get.cc: + - do not change the auto-installed information if a package + is reinstalled (LP: #139448) + + -- Michael Vogt Tue, 11 Sep 2007 20:55:00 +0200 + +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 + + -- 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. + + -- Ian Jackson Wed, 15 Aug 2007 20:44:37 +0100 + +apt (0.7.6ubuntu5) UNRELEASED; urgency=low + + * apt-pkg/acquire-item.cc: + - fix file removal on local repo i-m-s hit (LP: #131166) + * tests/local-repo: + - added regression test for this bug + + -- Michael Vogt Thu, 09 Aug 2007 12:34:07 +0200 + +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) + * methods/copy.cc: + - take hashes here too + * apt-pkg/acquire-worker.cc: + - only pass on computed hash if we recived one from the method + + -- Michael Vogt Wed, 08 Aug 2007 19:30:29 +0200 + +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) + + -- Michael Vogt Tue, 07 Aug 2007 09:52:00 +0200 + +apt (0.7.6ubuntu2) gutsy; urgency=low + + * doc/examples/sources.list: + - change example source to gutsy + * apt-pkg/deb/dpkgpm.cc: + - do not break if no /dev/pts is available + + -- Michael Vogt Mon, 06 Aug 2007 15:17:57 +0200 + +apt (0.7.6ubuntu1) gutsy; urgency=low + + [ Michael Vogt ] + * apt-inst/contrib/extracttar.cc: + - fix fd leak for zero size files (thanks to Bill Broadley for + reporting this bug) + * apt-pkg/acquire-item.cc: + - remove zero size files on I-M-S hit + * methods/https.cc: + - 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 + (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) + * apt-pkg/pkgcachegen.cc: + - increase default mmap size + * tests/local-repo: + - added local repository testcase + * make apt build with g++ 4.3 + * fix missing SetExecClose() call when the status-fd is used + * debian/apt.cron.daily: + - move unattended-upgrade before apt-get autoclean + * fix "purge" commandline argument, closes: #133421 + (thanks to Julien Danjou for the patch) + * cmdline/apt-get.cc: + - do not change the auto-installed information if a package + is reinstalled + * cmdline/apt-mark: + - Fix chmoding after have renamed the extended-states file (LP: #140019) + (thanks to Laurent Bigonville) + + [ Ian Jackson ] + * dpkg-triggers: Deal properly with new package states. + + -- Michael Vogt Thu, 02 Aug 2007 11:55:54 +0200 + +apt (0.7.6) unstable; urgency=low * Applied patch from Aurelien Jarno to fix wrong directory downloading on non-linux architectures (closes: #435597) @@@ -6700,14 -4651,6 +6860,14 @@@ apt (0.7.5) unstable; urgency=lo -- Otavio Salvador Wed, 25 Jul 2007 20:16:46 -0300 +apt (0.7.4ubuntu1) gutsy; urgency=low + + * debian/apt.conf.ubuntu, apt.conf.autoremove: + - Change metapackages to {restricted,universe,multiverse}/metapackages + in Install-Recommends-Sections and Never-MarkAuto-Sections + + -- Michael Vogt Thu, 26 Jul 2007 10:42:29 +0200 + apt (0.7.4) unstable; urgency=low [ Michael Vogt ] @@@ -6768,90 -4711,6 +6928,90 @@@ apt (0.7.3) unstable; urgency=lo -- Michael Vogt Sun, 01 Jul 2007 12:31:29 +0200 +apt (0.7.2ubuntu7) gutsy; urgency=low + + * fix build-dependencies + * fixes in the auto-mark code (thanks to Daniel + Burrows) + + -- Michael Vogt Mon, 9 Jul 2007 19:02:54 +0200 + +apt (0.7.2ubuntu6) gutsy; urgency=low + + [ Michael Vogt] + * cmdline/apt-get.cc: + - 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 + + [ 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 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 Mon, 09 Jul 2007 01:15:57 +1000 + +apt (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 + + * Rebuild for the libcurl4 -> libcurl3 transition mess. + + -- Steve Kowalik Fri, 6 Jul 2007 12:44:05 +1000 + +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++ 4.3 (thanks to + Daniel Burrows, closes: #429378) + * fix FTFBFS by changing build-depends to + libcurl4-gnutls-dev (closes: #428363) + + -- Michael Vogt Tue, 19 Jun 2007 13:47:03 +0200 + +apt (0.7.2ubuntu1) gutsy; urgency=low + + * apt-pkg/deb/dpkgpm.cc: + - apport integration added, this means that a apport + report is written on dpkg failures + * cmdline/apt-get.cc: + - merged http://people.ubuntu.com/~mvo/bzr/apt/xs-vcs-bzr/ + this will warn when Vcs- headers are found on apt-get source + (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 + apt (0.7.2-0.1) unstable; urgency=low * Non-maintainer upload. @@@ -6945,144 -4804,34 +7105,144 @@@ apt (0.7.1) experimental; urgency=lo * apt-pkg/policy.cc: - allow multiple packages (thanks to David Foerster) - -- Michael Vogt Wed, 2 May 2007 13:43:44 +0200 + -- Michael Vogt Wed, 2 May 2007 13:43:44 +0200 + +apt (0.7.0) experimental; urgency=low + + * Package that contains all the new features + * Removed all #pragma interface/implementation + * Branch that contains all the new features: + * translated package descriptions + * task install support + * automatic dependency removal (thanks to Daniel Burrows) + * merged support for the new dpkg "Breaks" field + (thanks to Ian Jackson) + * handle network failures more gracefully on "update" + * support for unattended-upgrades (via unattended-upgrades + package) + * added apt-transport-https method + * merged "install-recommends" branch (ABI break): + - new "--install-recommends" + - install new recommends on "upgrade" if --install-recommends is + given + - new "--fix-policy" option to install all packages with unmet + important dependencies (usefull with --install-recommends to + see what not-installed recommends are on the system) + - fix of recommended packages display (only show CandidateVersion + fix or-group handling) + * merged "install-task" branch (use with "apt-get install taskname^") + + -- Michael Vogt Fri, 12 Jan 2007 20:48:07 +0100 + +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 (LP#59893) + - ensure proper permissions in the extended_state file (LP#67037) + * debian/apt.conf.ubuntu: + - 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 (LP#72007) + - do not show packages already marked for removal as auto-installed + (LP#64493) + - applied patch to (optionally) hide the auto-remove information + (thanks to Frode M. Døving) (LP#69148) + + -- Michael Vogt Wed, 14 Mar 2007 13:32:32 +0100 + +apt (0.6.46.4ubuntu9) feisty; urgency=low + + * debian/control: + - set XS-Vcs-Bzr header + - Set Ubuntu maintainer address + * apt-pkg/cdrom.cc: + - only unmount if APT::CDROM::NoMount is false + - 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) + * apt-pkg/indexfile.cc: + - fix problem overwriting APT::Acquire::Translation + * 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 + + * fix segfault in the pkgRecords destructor + * Bump ABI version + * 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 + + * Merged the apt--mirror branch. This means that a new 'mirror' + method is available that will allow dynamic mirror updates. + The sources.list entry looks something like this: + "deb mirror://mirrors.lp.net/get_mirror feisty main restricted" + + 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 + +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 + 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: + - only increase the score of installed applications if they + are not obsolete + + -- Michael Vogt Mon, 18 Dec 2006 19:39:05 +0100 + +apt (0.6.46.4ubuntu3) feisty; urgency=low -apt (0.7.0) experimental; urgency=low + * apt-pkg/algorithm.cc: + - use clog for all debugging + * apt-pkg/depcache.cc: + - never mark Required package for autoremoval (lp: #75882) - * Package that contains all the new features - * Removed all #pragma interface/implementation - * Branch that contains all the new features: - * translated package descriptions - * task install support - * automatic dependency removal (thanks to Daniel Burrows) - * merged support for the new dpkg "Breaks" field + -- Michael Vogt Mon, 18 Dec 2006 11:56:05 +0100 + +apt (0.6.46.4ubuntu2) feisty; urgency=low + + * apt-pkg/algorithms.cc: add missing call to MarkKeep + so that dist-upgrade isn't broken by unsatisfiable Breaks. (thanks to Ian Jackson) - * handle network failures more gracefully on "update" - * support for unattended-upgrades (via unattended-upgrades - package) - * added apt-transport-https method - * merged "install-recommends" branch (ABI break): - - new "--install-recommends" - - install new recommends on "upgrade" if --install-recommends is - given - - new "--fix-policy" option to install all packages with unmet - important dependencies (usefull with --install-recommends to - see what not-installed recommends are on the system) - - fix of recommended packages display (only show CandidateVersion - fix or-group handling) - * merged "install-task" branch (use with "apt-get install taskname^") - -- Michael Vogt Fri, 12 Jan 2007 20:48:07 +0100 + -- Michael Vogt Thu, 7 Dec 2006 23:07:24 +0100 + +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-0.1) unstable; urgency=emergency @@@ -7113,33 -4862,13 +7273,33 @@@ apt (0.6.46.4) unstable; urgency=hig -- Michael Vogt Thu, 7 Dec 2006 10:49:50 +0100 +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: + - documented autoremove, thanks to Vladimír Lapá%Gč%@ek + (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) + * add apt-secure.8 to "See also" section + + -- Michael Vogt Thu, 23 Nov 2006 07:24:12 +0100 + apt (0.6.46.3-0.2) unstable; urgency=high * Non-maintainer upload with permission of Michael Vogt. * Fix FTBFS on most arches (regression from the fix of #400874) -- Andreas Barth Tue, 5 Dec 2006 15:51:22 +0000 - + apt (0.6.46.3-0.1) unstable; urgency=high * Non-maintainer upload with permission of Michael Vogt. @@@ -7245,173 -4974,6 +7405,173 @@@ apt (0.6.46) unstable; urgency=lo -- Michael Vogt Thu, 21 Sep 2006 10:25:03 +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 + 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: + - fix in the sweep() code, set garbage flag for packages scheduled + for removal too + - do not change the autoFlag in MarkKeep(), this can lead to suprising + side effects + + -- Michael Vogt Thu, 21 Sep 2006 00:58:24 +0200 + +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 + + * methods/http.cc: + - check more careful for incorrect proxy settings (closes: #378868) + * methods/gzip.cc: + - don't hang when /var is full (closes: #341537), thanks to + Luis Rodrigo Gallardo Cruz for the patch + * doc/examples/sources.list: + - removed non-us.debian.org from the example (closes: #380030,#316196) + * Merged from Christian Perrier bzr branch: + * ro.po: Updated to 514t. Closes: #388402 + * dz.po: Updated to 514t. Closes: #388184 + * it.po: Fixed typos. Closes: #387812 + * ku.po: New kurdish translation. Closes: #387766 + * sk.po: Updated to 514t. Closes: #386851 + * ja.po: Updated to 514t. Closes: #386537 + * gl.po: Updated to 514t. Closes: #386397 + * fr.po: Updated to 516t. + * fi.po: Updated to 512t. Closes: #382702 + * share/archive-archive.gpg: + - removed the outdated amd64 and debian-2004 keys + * apt-pkg/tagfile.cc: + - applied patch from Jeroen van Wolffelaar to make the tags + caseinsensitive (closes: #384182) + - 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 + +apt (0.6.45ubuntu9) edgy; urgency=low + + * cmdline/apt-get.cc: + - if --no-remove is given, do not run the AutoRemove code + + -- Michael Vogt Wed, 13 Sep 2006 11:54:20 +0200 + +apt (0.6.45ubuntu8) edgy; urgency=low + + * apt-pkg/algorithm.cc: + - fix pkgProblemResolver.InstallProtect() to preserve the auto-install + 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 + +apt (0.6.45ubuntu7) edgy; urgency=low + + * apt-pkg/depcache.cc: + - fix a bug in the install-recommends-section code + + -- Michael Vogt Thu, 7 Sep 2006 18:22:38 +0200 + +apt (0.6.45ubuntu6) edgy; urgency=low + + [Michael Vogt] + * cmdline/apt-get.cc: + - always show auto-removable packages and give a hint how to remove + them + * debian/apt.conf.ubuntu: + - exlucde linux-image and linux-restricted-modules from ever being + auto-removed + - added "metapackages" as the section we want to install recommends + by default + * apt-pkg/depcache.cc: + - added support to turn install-recommends selectively on/off by + section + [Ian Jackson] + * Tests pass without code changes! Except that we need this: + * Bump cache file major version to force rebuild so that Breaks + dependencies are included. + * Don't depend on or suggest any particular dpkg or dpkg-dev versions; + --auto-deconfigure is very very old and dpkg-dev's Breaks support + is more or less orthogonal. + * Initial draft of `Breaks' implementation. Appears to compile, + but as yet *completely untested*. + + -- Michael Vogt Thu, 7 Sep 2006 11:50:52 +0200 + +apt (0.6.45ubuntu5) edgy; urgency=low + + * apt-pkg/pkgcachegen.cc: + - increase the APT::Cache-Limit to deal with the increased demand due + to the translated descriptions + * apt-pkg/deb/dpkgpm.cc: + - pass "--auto-deconfigure" to dpkg on install to support the + new "breaks" in dpkg + + -- Michael Vogt Tue, 15 Aug 2006 12:06:26 +0200 + +apt (0.6.45ubuntu4) edgy; urgency=low + + * cmdline/apt-get.cc: + - fix in the new --fix-polciy code + + -- Michael Vogt Mon, 14 Aug 2006 21:08:11 +0200 + +apt (0.6.45ubuntu3) edgy; urgency=low + + * ABI break + * merged latest apt--install-recommends (closes: #559000) + * added "--fix-policy" option to can be used as "--fix-broken" and + will install missing weak depends (recommends, and/or suggests + depending on the settings) + * merged the apt--ddtp branch + + -- Michael Vogt Fri, 11 Aug 2006 12:53:23 +0200 + +apt (0.6.45ubuntu2) edgy; urgency=low + + * debian/control: + - switched to libdb4.4 for building (closes: #381019) + * cmdline/apt-get.cc: + - show only the recommends/suggests for the candidate-version, not for all + versions of the package (closes: #257054) + - properly handle recommends/suggests or-groups when printing the list of + suggested/recommends packages (closes: #311619) + * merged "apt--install-recommends" branch: + - added "{no-}install-recommends" commandline option + - added APT::Install-{Recommends,Suggests} option + - currently Install-Recommends defaults to "False" + + -- Michael Vogt Wed, 9 Aug 2006 23:38:46 +0200 + +apt (0.6.45ubuntu1) edgy; urgency=low + + * merged with debian/unstable + + -- Michael Vogt Tue, 1 Aug 2006 15:43:22 +0200 + apt (0.6.45) unstable; urgency=low * apt-pkg/contrib/sha256.cc: @@@ -7457,37 -5019,6 +7617,37 @@@ -- Michael Vogt Thu, 27 Jul 2006 00:52:05 +0200 +apt (0.6.44.2ubuntu4) edgy; urgency=low + + * Make apt-get dselect-upgrade happy again + + -- Michael Vogt Fri, 21 Jul 2006 11:03:02 +0200 + +apt (0.6.44.2ubuntu3) edgy; urgency=low + + * Close extended_states file after writing it. + + -- Colin Watson Tue, 18 Jul 2006 00:12:13 +0100 + +apt (0.6.44.2ubuntu2) edgy; urgency=low + + * create a empty extended_states file if none exists already + + -- Michael Vogt Tue, 4 Jul 2006 09:23:03 +0200 + +apt (0.6.44.2ubuntu1) edgy; urgency=low + + * merged with debian/unstable + * merged the "auto-mark" branch to support aptitude like + marking of automatically installed dependencies and added + "apt-get remove --auto-remove" to remove unused auto-installed + packages again + * changed library version from 3.11 to 3.50 to make it clearly + different from the debian version (we are ABI incompatible because + of the auto-mark patch) + + -- Michael Vogt Mon, 3 Jul 2006 18:30:46 +0200 + apt (0.6.44.2exp1) experimental; urgency=low * added support for i18n of the package descriptions @@@ -7576,26 -5107,6 +7736,26 @@@ apt (0.6.44) unstable; urgency=lo -- Michael Vogt Mon, 8 May 2006 22:28:53 +0200 +apt (0.6.43.3ubuntu3) dapper; urgency=low + + * methods/http.cc: + - fix the user-agent string + + -- Michael Vogt Fri, 26 May 2006 18:09:32 +0200 + +apt (0.6.43.3ubuntu2) dapper; urgency=low + + * apt-pkg/deb/dpkgpm.cc: wording fixes (thanks to Matt Zimmerman) + + -- Michael Vogt Tue, 18 Apr 2006 13:24:40 +0200 + +apt (0.6.43.3ubuntu1) dapper; urgency=low + + * apt-pkg/acquire.cc: don't show ETA if it is 0 or absurdely large in + the status-fd (ubuntu #28954) + + -- Michael Vogt Tue, 28 Mar 2006 20:34:46 +0200 + apt (0.6.43.3) unstable; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-186: @@@ -7628,38 -5139,6 +7788,38 @@@ -- Michael Vogt Wed, 22 Feb 2006 10:13:04 +0100 +apt (0.6.43.2ubuntu1) dapper; urgency=low + + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-182: + * ca.po: Completed to 512t. Closes: #351592 + * eu.po: Completed to 512t. Closes: #350483 + * ja.po: Completed to 512t. Closes: #349806 + * pl.po: Completed to 512t. Closes: #349514 + * sk.po: Completed to 512t. Closes: #349474 + * gl.po: Completed to 512 strings Closes: #349407 + * vi.po: Completed to 512 strings + * sv.po: Completed to 512 strings Closes: #349210 + * ru.po: Completed to 512 strings Closes: #349154 + * da.po: Completed to 512 strings Closes: #349084 + * fr.po: Completed to 512 strings + * LINGUAS: Add Welsh + * *.po: Updated from sources (512 strings) + * vi.po: Completed to 511 strings Closes: #348968 + * apt-pkg/deb/deblistparser.cc: + - don't explode on a DepCompareOp in a Provides line, but warn about + it and ignore it otherwise (thanks to James Troup for reporting it) + * cmdline/apt-get.cc: + - don't lock the lists directory in DoInstall, breaks --print-uri + (thanks to James Troup for reporting it) + * debian/apt.dirs: create /etc/apt/sources.list.d + * make apt-cache madison work without deb-src entries (#352583) + * cmdline/apt-get.cc: only run the list-cleaner if a update was + successfull + * apt-get update errors are only warnings nowdays + * be more careful with the signature file on network failures + + -- Michael Vogt Mon, 20 Feb 2006 22:27:48 +0100 + apt (0.6.43.2) unstable; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-166: @@@ -7683,24 -5162,6 +7843,24 @@@ -- Michael Vogt Thu, 19 Jan 2006 00:06:33 +0100 +apt (0.6.43.1ubuntu1) dapper; urgency=low + + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-159: + - en_GB.po, de.po: fix spaces errors in "Ign " translations + Closes: #347258 + - makefile: make update-po a pre-requisite of clean target so + that POT and PO files are always up-to-date + - sv.po: Completed to 511t. Closes: #346450 + - sk.po: Completed to 511t. Closes: #346369 + - fr.po: Completed to 511t + - *.po: Updated from sources (511 strings) + * add patch to fix http download corruption problem (thanks to + Petr Vandrovec, closes: #280844, #290694) + * added APT::Periodic::Unattended-Upgrade (requires the package + "unattended-upgrade") + + -- Michael Vogt Tue, 10 Jan 2006 17:09:31 +0100 + apt (0.6.43.1) unstable; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-148: @@@ -7724,19 -5185,6 +7884,19 @@@ -- Michael Vogt Fri, 6 Jan 2006 01:17:08 +0100 +apt (0.6.43ubuntu2) dapper; urgency=low + + * merged some missing bits that wheren't merged by baz in the previous + upload (*grumble*) + + -- Michael Vogt Thu, 8 Dec 2005 18:35:58 +0100 + +apt (0.6.43ubuntu1) dapper; urgency=low + + * merged with debian + + -- Michael Vogt Fri, 25 Nov 2005 11:36:29 +0100 + apt (0.6.43) unstable; urgency=medium * Merge bubulle@debian.org--2005/apt--main--0 up to patch-132: @@@ -7757,22 -5205,6 +7917,22 @@@ -- Michael Vogt Tue, 29 Nov 2005 00:17:07 +0100 +apt (0.6.42.3ubuntu2) dapper; urgency=low + + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-131: + * zh_CN.po: Completed to 507 strings(Closes: #338267) + * gl.po: Completed to 510 strings (Closes: #338356) + * added support for "/etc/apt/sources.list.d" directory + (closes: #66325) + + -- Michael Vogt Mon, 14 Nov 2005 15:30:12 +0100 + +apt (0.6.42.3ubuntu1) dapper; urgency=low + + * synced with debian + + -- Michael Vogt Thu, 10 Nov 2005 05:05:56 +0100 + apt (0.6.42.3) unstable; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-129: @@@ -7801,7 -5233,7 +7961,7 @@@ apt (0.6.42.2) unstable; urgency=hig * Priority high to get the AMD key into testing ASAP. -- Frans Pop Sun, 30 Oct 2005 21:29:11 +0100 - + apt (0.6.42.1) unstable; urgency=low * fix a incorrect example in the apt_prefrences man page @@@ -7879,80 -5311,6 +8039,80 @@@ apt (0.6.41) unstable; urgency=lo -- Michael Vogt Mon, 5 Sep 2005 22:59:03 +0200 +apt (0.6.40.1ubuntu8) breezy; urgency=low + + * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-62: + - fix for a bad memory/file leak in the mmap code (ubuntu #15603) + * po/de.po, po/fr.po: + - updated the translations + * po/makefile: + - create a single pot file in each domain dir to make rosetta happy + + -- Michael Vogt Wed, 28 Sep 2005 10:16:06 +0200 + +apt (0.6.40.1ubuntu7) breezy; urgency=low + + * updated the pot/po files , no code changes + + -- Michael Vogt Tue, 27 Sep 2005 18:38:16 +0200 + +apt (0.6.40.1ubuntu6) breezy; urgency=low + + * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-56: + - make it possible for apt to handle a failed MediaChange event and + fall back to other sources (ubuntu #13713) + + -- Michael Vogt Tue, 13 Sep 2005 22:09:50 +0200 + +apt (0.6.40.1ubuntu5) breezy; urgency=low + + * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-{50,51}. + This adds media-change reporting to the apt status-fd (ubuntu #15213) + * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-55: + apt-pkg/cdrom.cc: + - unmount the cdrom when apt failed to locate any package files + + -- Michael Vogt Mon, 12 Sep 2005 15:44:26 +0200 + +apt (0.6.40.1ubuntu4) breezy; urgency=low + + * debian/apt.cron.daily: + - fix a embarrassing typo + + -- Michael Vogt Wed, 7 Sep 2005 10:10:37 +0200 + +apt (0.6.40.1ubuntu3) breezy; urgency=low + + * debian/apt.cron.daily: + - use the ctime as well when figuring what packages need to + be removed. This fixes the problem that packages copied with + "cp -a" (e.g. from the installer) have old mtimes (ubuntu #14504) + + -- Michael Vogt Tue, 6 Sep 2005 18:30:46 +0200 + +apt (0.6.40.1ubuntu2) breezy; urgency=low + + * improved the support for "error" and "conffile" reporting from + dpkg, added the format to README.progress-reporting + * added README.progress-reporting to the apt-doc package + * Do md5sum checking for file and cdrom method (closes: #319142) + * Change pkgPolicy::Pin from private to protected to let subclasses + access it too (closes: #321799) + * methods/connect.cc: + - send failure reason for EAI_AGAIN (TmpResolveFailure) to acuire-item + * apt-pkg/acquire-item.cc: + - fail early if a FailReason is TmpResolveFailure (avoids hangs during + the install when no network is available) + * merged michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0 + + -- Michael Vogt Tue, 23 Aug 2005 19:44:55 +0200 + +apt (0.6.40.1ubuntu1) breezy; urgency=low + + * Synchronize with Debian + + -- Michael Vogt Fri, 5 Aug 2005 14:20:56 +0200 + apt (0.6.40.1) unstable; urgency=low * bugfix in the parsing code for the apt<->dpkg communication. apt @@@ -7962,12 -5320,6 +8122,12 @@@ -- Michael Vogt Fri, 5 Aug 2005 13:24:58 +0200 +apt (0.6.40ubuntu1) breezy; urgency=low + + * Synchronize with Debian + + -- Matt Zimmerman Thu, 4 Aug 2005 15:53:22 -0700 + apt (0.6.40) unstable; urgency=low * Patch from Jordi Mallach to mark some additional strings for translation @@@ -7983,39 -5335,6 +8143,39 @@@ -- Matt Zimmerman Thu, 28 Jul 2005 11:57:32 -0700 +apt (0.6.39ubuntu4) breezy; urgency=low + + * Fix keyring paths in apt-key, apt.postinst (I swear I remember doing this + before...) + + -- Matt Zimmerman Wed, 29 Jun 2005 08:39:17 -0700 + +apt (0.6.39ubuntu3) breezy; urgency=low + + * Fix keyring locations for Ubuntu in apt-key too. + + -- Colin Watson Wed, 29 Jun 2005 14:45:36 +0100 + +apt (0.6.39ubuntu2) breezy; urgency=low + + * Install ubuntu-archive.gpg rather than debian-archive.gpg as + /etc/apt/trusted.gpg. + + -- Colin Watson Wed, 29 Jun 2005 11:53:34 +0100 + +apt (0.6.39ubuntu1) breezy; urgency=low + + * Michael Vogt + - Change debian/bugscript to use #!/bin/bash (Closes: #313402) + - Fix a incorrect example in the man-page (closes: #282918) + - Support architecture-specific extra overrides + (closes: #225947). Thanks to Anthony Towns for idea and + the patch, thanks to Colin Watson for testing it. + - better report network timeouts from the methods to the acuire code, + only timeout once per sources.list line + + -- Matt Zimmerman Tue, 28 Jun 2005 11:52:24 -0700 + apt (0.6.39) unstable; urgency=low * Welsh translation update: daf@muse.19inch.net--2005/apt--main--0--patch-6 @@@ -8028,13 -5347,6 +8188,13 @@@ -- Matt Zimmerman Tue, 28 Jun 2005 11:51:09 -0700 +apt (0.6.38ubuntu1) breezy; urgency=low + + * First release from Ubuntu branch + * Merge with --main--0, switch back to Ubuntu keyring + + -- Matt Zimmerman Sat, 25 Jun 2005 16:52:41 -0700 + apt (0.6.38) unstable; urgency=low * Merge michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-6, a workaround @@@ -9913,4 -7225,3 +10073,4 @@@ apt (0.0.1) unstable; urgency=lo * Initial Release. -- Scott K. Ellis Tue, 31 Mar 1998 12:49:28 -0500 + diff --combined debian/control index 5cdacfc34,7730c2491..3d4fcc86d --- a/debian/control +++ b/debian/control @@@ -1,24 -1,23 +1,24 @@@ Source: apt Section: admin Priority: important -Maintainer: APT Development Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: APT Development Team Uploaders: Michael Vogt , Otavio Salvador , Christian Perrier , Daniel Burrows , Julian Andres Klode Standards-Version: 3.9.3 Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev, - gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0), + gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.4~), zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml, po4a (>= 0.34-2), autotools-dev, autoconf, automake Build-Depends-Indep: doxygen, debiandoc-sgml Build-Conflicts: autoconf2.13, automake1.4 - Vcs-Bzr: lp:~ubuntu-core-dev/apt/ubuntu - Vcs-Browser: http://code.launchpad.net/apt/ubuntu -Vcs-Git: git://anonscm.debian.org/apt/apt.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=apt/apt.git ++XS-Original-Vcs-Git: git://anonscm.debian.org/apt/apt.git ++XS-Original-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=apt/apt.git Package: apt Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, debian-archive-keyring, gnupg +Depends: ubuntu-keyring, ${shlibs:Depends}, ${misc:Depends}, gnupg Replaces: manpages-pl (<< 20060617-3~), manpages-it Conflicts: python-apt (<< 0.7.93.2~) Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, xz-utils, python-apt diff --combined debian/rules index a2dbe513e,79a6dbe0c..bdd8d09c7 --- a/debian/rules +++ b/debian/rules @@@ -3,9 -3,6 +3,9 @@@ # Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess. # Some lines taken from debmake, by Christoph Lameter. +# build in verbose mode by default to make it easy to diangose issues +export NOISY=1 + export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) @@@ -185,10 -182,6 +185,10 @@@ apt: build build-manpage # apt install # cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove + cp debian/apt.conf.changelog debian/$@/etc/apt/apt.conf.d/20changelog + cp debian/apt.auto-removal.sh debian/$@/etc/kernel/postinst.d/apt-auto-removal + chmod 755 debian/$@/etc/kernel/postinst.d/apt-auto-removal + cp share/ubuntu-archive.gpg debian/$@/usr/share/$@ # make rosetta happy and remove pot files in po/ (but leave stuff # in po/domains/* untouched) and cp *.po into each domain dir @@@ -210,7 -203,7 +210,7 @@@ dh_bugfiles -p$@ dh_lintian -p$@ dh_installexamples -p$@ $(BLD)/docs/examples/* - dh_installman -p$@ $(wildcard $(patsubst %,doc/%.[158],$(apt_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt_MANPAGES))) + dh_installman -p$@ $(wildcard $(patsubst %,doc/en/%.[158],$(apt_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt_MANPAGES))) dh_installcron -p$@ dh_installdocs -p$@ dh_installchangelogs -p$@ @@@ -260,7 -253,7 +260,7 @@@ apt-utils: build build-manpage dh_installexamples -p$@ # Install the man pages.. - dh_installman -p$@ $(wildcard $(patsubst %,doc/%.[158],$(apt-utils_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt-utils_MANPAGES))) + dh_installman -p$@ $(wildcard $(patsubst %,doc/en/%.[158],$(apt-utils_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt-utils_MANPAGES))) dh_installchangelogs -p$@ dh_strip -p$@ diff --combined doc/makefile index 2516cd128,274fbc278..266caa990 --- a/doc/makefile +++ b/doc/makefile @@@ -1,7 -1,6 +1,6 @@@ # -*- make -*- BASE=.. SUBDIR=doc - SUBDIRS= $(dir $(wildcard */makefile)) # Bring in the default rules include ../buildlib/defaults.mak @@@ -13,36 -12,8 +12,8 @@@ include $(DEBIANDOC_H doc: manpages debiandoc - # Do not use XMLTO, build the manpages directly with XSLTPROC - ifdef XSLTPROC - # generate a list of accepted man page translations - SOURCE = $(patsubst %.xml,%,$(wildcard *.?.xml)) - INCLUDES = apt.ent apt-verbatim.ent - STYLESHEET=manpage-style.xsl - - LOCAL := manpage-$(firstword $(SOURCE)) - $(LOCAL)-LIST := $(SOURCE) - - # Install generation hooks - manpages: $($(LOCAL)-LIST) - - $($(LOCAL)-LIST) :: % : %.xml $(STYLESHEET) $(INCLUDES) - echo Creating man page $@ - $(XSLTPROC) -o $@ $(STYLESHEET) $< - - # Clean rule - .PHONY: veryclean/$(LOCAL) - veryclean: veryclean/$(LOCAL) - veryclean/$(LOCAL): - -rm -rf $($(@F)-LIST) - endif - - # Chain to the manpage rule - SOURCE = apt.8 - include $(MANPAGE_H) - examples/sources.list: examples/sources.list.in apt-verbatim.ent - sed -e 's#&stable-codename;#$(shell grep --max-count=1 '^ examples/sources.list + sed -e 's#&ubuntu-codename;#$(shell grep --max-count=1 '^ examples/sources.list # Examples SOURCE = examples/apt.conf examples/sources.list examples/configure-index examples/apt-https-method-example.conf @@@ -50,42 -21,43 +21,43 @@@ TO = $(DOC TARGET = binary include $(COPY_H) - .PHONY: clean clean-subdirs veryclean veryclean-subdirs all binary doc stats + .PHONY: clean clean/subdirs veryclean veryclean/subdirs manpages/subdirs debiandoc/subdirs all binary doc stats - clean: clean-subdirs - veryclean: veryclean-subdirs + clean: clean/subdirs + veryclean: veryclean/subdirs + manpages: manpages/subdirs + debiandoc: debiandoc/subdirs - clean-subdirs: - for dir in $(SUBDIRS); do\ - $(MAKE) -C $$dir clean; \ - done + DOCUMENTATIONPO = $(patsubst %.po,%,$(notdir $(wildcard po/*.po))) + DOCDIRLIST = $(addsuffix /makefile,$(DOCUMENTATIONPO)) - veryclean-subdirs: - for dir in $(SUBDIRS); do\ - rm -rf $$dir; \ + dirs: $(DOCDIRLIST) + $(DOCDIRLIST) :: %/makefile : lang.makefile + test -d $(dir $@) || mkdir $(dir $@) + sed "s#@@LANG@@#$(subst /,,$(dir $@))#" $< > $@ + + debiandoc/subdirs manpages/subdirs clean/subdirs veryclean/subdirs: + for dir in en $(dir $(DOCDIRLIST)); do \ + $(MAKE) -C $$dir $(patsubst %/subdirs,%,$@); \ done stats: for i in po/*.po; do echo -n "$$i: "; msgfmt --output-file=/dev/null --statistics $$i; done ifdef PO4A - DOCUMENTATIONPO = $(patsubst %.po,%,$(notdir $(wildcard po/*.po))) MANPAGEPOLIST = $(addprefix manpages-translation-,$(DOCUMENTATIONPO)) DEBIANDOCPOLIST = $(addprefix debiandoc-translation-,$(DOCUMENTATIONPO)) - MANPAGEDIRLIST = $(addsuffix /makefile,$(DOCUMENTATIONPO)) + .PHONY: update-po po4a $(MANPAGEPOLIST) $(DEBIANDOCPOLIST) $(DOCDIRLIST) - .PHONY: update-po po4a $(MANPAGEPOLIST) $(MANPAGEDIRLIST) - - manpages: $(MANPAGEPOLIST) - debiandoc: $(DEBIANDOCPOLIST) - po4a: $(MANPAGEPOLIST) $(DEBIANDOCPOLIST) + po4a: manpages/subdirs debiandoc/subdirs update-po: po4a --previous --no-backups --force --no-translations \ --package-name='$(PACKAGE)-doc' --package-version='$(PACKAGE_VERSION)' \ --msgid-bugs-address='$(PACKAGE_MAIL)' po4a.conf + manpages/subdirs: $(MANPAGEPOLIST) $(MANPAGEPOLIST) :: manpages-translation-% : %/makefile po4a.conf # first line is for apt.8 (see Bug#696923) po4a --previous --no-backups --translate-only $(dir $<)apt.ent \ @@@ -100,19 -72,13 +72,13 @@@ $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.8.xml,%.$(subst /,,$(dir $<)).8.xml,$(wildcard *.8.xml))) \ --package-name='$(PACKAGE)-doc' --package-version='$(PACKAGE_VERSION)' \ --msgid-bugs-address='$(PACKAGE_MAIL)' po4a.conf - $(MAKE) -C $(dir $<) manpages + debiandoc/subdirs: $(DEBIANDOCPOLIST) $(DEBIANDOCPOLIST) :: debiandoc-translation-% : %/makefile po4a.conf po4a --previous --no-backups --translate-only $(dir $<)apt.ent \ $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.sgml,%.$(subst /,,$(dir $<)).sgml,$(wildcard *.sgml))) \ --package-name='$(PACKAGE)-doc' --package-version='$(PACKAGE_VERSION)' \ --msgid-bugs-address='$(PACKAGE_MAIL)' po4a.conf - $(MAKE) -C $(dir $<) debiandoc - - dirs: $(MANPAGEDIRLIST) - $(MANPAGEDIRLIST) :: %/makefile : lang.makefile - test -d $(dir $@) || mkdir $(dir $@) - sed "s#@@LANG@@#$(subst /,,$(dir $@))#" $< > $@ endif ifdef DOXYGEN diff --combined doc/po/de.po index e2052297f,8ecbf4cbf..7ef5d39c0 --- a/doc/po/de.po +++ b/doc/po/de.po @@@ -7,7 -7,7 +7,11 @@@ msgid " msgstr "" "Project-Id-Version: apt-doc 0.9.7\n" "Report-Msgid-Bugs-To: APT Development Team \n" ++<<<<<<< HEAD +"POT-Creation-Date: 2013-04-30 10:29+0300\n" ++======= + "POT-Creation-Date: 2013-06-13 13:46+0300\n" ++>>>>>>> upstream/debian/sid "PO-Revision-Date: 2012-06-25 22:49+0100\n" "Last-Translator: Chris Leick \n" "Language-Team: German \n" @@@ -763,9 -763,9 +767,9 @@@ msgid " "installation or upgrading. Each package is a package name, not a fully " "qualified filename (for instance, in a Debian system, apt-utils would be the argument provided, not apt-utils_&apt-" - "product-version;_amd64.deb). All packages required by the package" - "(s) specified for installation will also be retrieved and installed. The " - "/etc/apt/sources.list file is used to locate the " + "product-version;_amd64.deb). All packages required by the " + "package(s) specified for installation will also be retrieved and installed. " + "The /etc/apt/sources.list 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 " @@@ -1543,14 -1543,14 +1547,14 @@@ msgstr " #. type: Content of: #: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125 - #: apt.conf.5.xml:1168 apt_preferences.5.xml:698 + #: apt.conf.5.xml:1167 apt_preferences.5.xml:698 msgid "Files" msgstr "Dateien" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 #: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109 - #: apt.conf.5.xml:1174 apt_preferences.5.xml:705 sources.list.5.xml:252 + #: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 #: apt-ftparchive.1.xml:607 msgid "See Also" @@@ -2261,19 -2261,12 +2265,19 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:130 +#, fuzzy +#| msgid "" +#| "Update the local keyring with the archive keyring and remove from the " +#| "local keyring the archive keys which are no longer valid. The archive " +#| "keyring is shipped in the <literal>archive-keyring</literal> package of " +#| "your distribution, e.g. the <literal>debian-archive-keyring</literal> " +#| "package in Debian." msgid "" "Update the local keyring with the archive keyring and remove from the local " "keyring the archive keys which are no longer valid. The archive keyring is " "shipped in the <literal>archive-keyring</literal> package of your " -"distribution, e.g. the <literal>debian-archive-keyring</literal> package in " -"Debian." +"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in " +"Ubuntu." msgstr "" "aktualisiert den lokalen Schlüsselbund mit dem Archivschlüsselbund und " "entfernt die Archivschlüssel, die nicht länger gültig sind, aus dem lokalen " @@@ -2342,33 -2335,24 +2346,33 @@@ msgstr "lokale Datenbank vertrauenswür #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:183 -msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" +#, fuzzy +#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" +msgid "<filename>/usr/share/keyrings/ubuntu-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:184 -msgid "Keyring of Debian archive trusted keys." +#, fuzzy +#| msgid "Keyring of Debian archive trusted keys." +msgid "Keyring of Ubuntu archive trusted keys." msgstr "Schlüsselbund vertrauenswürdiger Schlüssel des Debian-Archivs" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:187 +#, fuzzy +#| msgid "" +#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgid "" -"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" +"<filename>/usr/share/keyrings/ubuntu-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:188 -msgid "Keyring of Debian archive removed trusted keys." +#, fuzzy +#| msgid "Keyring of Debian archive removed trusted keys." +msgid "Keyring of Ubuntu archive removed trusted keys." msgstr "" "Schlüsselbund entfernter vertrauenswürdiger Schlüssel des Debian-Archivs" @@@ -3274,15 -3258,14 +3278,14 @@@ msgstr "DPkg::Pre-Install-Pkgs {\"/usr/ #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:101 msgid "" - "In general the sample configuration file in <filename>&docdir;examples/apt." - "conf</filename> &configureindex; is a good guide for how it should look." + "In general the sample configuration file &configureindex; is a good guide " + "for how it should look." msgstr "" - "Im Allgemeinen bietet die Beispielkonfigurationsdatei in <filename>&docdir;" - "examples/apt.conf</filename> &configureindex; eine gute Anleitung, wie dies " - "aussehen könnte." + "Im Allgemeinen bietet die Beispielkonfigurationsdatei &configureindex; eine " + "gute Anleitung, wie dies aussehen könnte." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:105 + #: apt.conf.5.xml:104 msgid "" "Case is not significant in names of configuration items, so in the previous " "example you could use <literal>dpkg::pre-install-pkgs</literal>." @@@ -3292,7 -3275,7 +3295,7 @@@ msgstr " "<literal>dpkg::pre-install-pkgs</literal> benutzen." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:108 + #: apt.conf.5.xml:107 msgid "" "Names for the configuration items are optional if a list is defined as can " "be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If " @@@ -3308,7 -3291,7 +3311,7 @@@ msgstr " "überschreiben, indem Sie der Option erneut einen neuen Wert zuweisen." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:113 + #: apt.conf.5.xml:112 msgid "" "Two special commands are defined: <literal>#include</literal> (which is " "deprecated and not supported by alternative implementations) and " @@@ -3328,7 -3311,7 +3331,7 @@@ msgstr " "(Beachten Sie, dass diese Zeilen auch mit einem Schrägstrich enden müssen.)" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:123 + #: apt.conf.5.xml:122 msgid "" "The <literal>#clear</literal> command is the only way to delete a list or a " "complete scope. Reopening a scope (or using the syntax described below with " @@@ -3345,7 -3328,7 +3348,7 @@@ msgstr " "nicht außer Kraft gesetzt, sondern nur bereinigt werden." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:131 + #: apt.conf.5.xml:130 msgid "" "All of the APT tools take an -o option which allows an arbitrary " "configuration directive to be specified on the command line. The syntax is a " @@@ -3365,7 -3348,7 +3368,7 @@@ msgstr " "Befehlszeile benutzt werden.)" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:139 + #: apt.conf.5.xml:138 msgid "" "Note that appending items to a list using <literal>::</literal> only works " "for one item per line, and that you should not use it in combination with " @@@ -3397,12 -3380,12 +3400,12 @@@ msgstr " "beklagt." #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:154 + #: apt.conf.5.xml:153 msgid "The APT Group" msgstr "Die APT-Gruppe" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:155 + #: apt.conf.5.xml:154 msgid "" "This group of options controls general APT behavior as well as holding the " "options for all of the tools." @@@ -3411,7 -3394,7 +3414,7 @@@ msgstr " "wie es die Optionen für alle Werkzeuge enthält." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:160 + #: apt.conf.5.xml:159 msgid "" "System Architecture; sets the architecture to use when fetching files and " "parsing package lists. The internal default is the architecture apt was " @@@ -3422,7 -3405,7 +3425,7 @@@ msgstr " "die Architektur für die APT kompiliert wurde." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:167 + #: apt.conf.5.xml:166 msgid "" "All Architectures the system supports. For instance, CPUs implementing the " "<literal>amd64</literal> (also called <literal>x86-64</literal>) " @@@ -3444,7 -3427,7 +3447,7 @@@ msgstr " "print-architectures</command> registriert werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:180 + #: apt.conf.5.xml:179 msgid "" "Default release to install packages from if more than one version is " "available. Contains release name, codename or release version. Examples: " @@@ -3457,7 -3440,7 +3460,7 @@@ msgstr " "codename;«, »4.0«, »5.0*«. Siehe auch &apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:186 + #: apt.conf.5.xml:185 msgid "" "Ignore held packages; this global option causes the problem resolver to " "ignore held packages in its decision making." @@@ -3466,7 -3449,7 +3469,7 @@@ msgstr " "Problemlöser, gehaltene Pakete beim Treffen von Entscheidungen zu ignorieren." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:191 + #: apt.conf.5.xml:190 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 " @@@ -3481,7 -3464,7 +3484,7 @@@ msgstr " "Möglichkeiten bereitstellt, um sie erneut zu installieren." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:199 + #: apt.conf.5.xml:198 msgid "" "Defaults to on, which will cause APT to install essential and important " "packages as soon as possible in an install/upgrade operation, in order to " @@@ -3509,7 -3492,7 +3512,7 @@@ msgstr " "Abhängigkeit von A nicht länger erfüllt wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:211 + #: apt.conf.5.xml:210 msgid "" "The immediate configuration marker is also applied in the potentially " "problematic case of circular dependencies, since a dependency with the " @@@ -3539,7 -3522,7 +3542,7 @@@ msgstr " "Stelle verhindern kann." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:224 + #: apt.conf.5.xml:223 msgid "" "Before a big operation like <literal>dist-upgrade</literal> is run with this " "option disabled you should try to explicitly <literal>install</literal> the " @@@ -3557,7 -3540,7 +3560,7 @@@ msgstr " "des Upgrade-Prozesses arbeiten können." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:235 + #: apt.conf.5.xml:234 msgid "" "Never enable this option unless you <emphasis>really</emphasis> know what " "you are doing. It permits APT to temporarily remove an essential package to " @@@ -3579,7 -3562,7 +3582,7 @@@ msgstr " "davon abhängt, sind." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:247 + #: apt.conf.5.xml:246 msgid "" "APT uses since version 0.7.26 a resizable memory mapped cache file to store " "the available information. <literal>Cache-Start</literal> acts as a hint of " @@@ -3616,13 -3599,13 +3619,13 @@@ msgstr " "auf 0 gesetzt ist, kann der Zwischenspeicher nicht automatisch wachsen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:263 + #: apt.conf.5.xml:262 msgid "Defines which packages are considered essential build dependencies." msgstr "" "definiert, welche Pakete als essentielle Bauabhängigkeiten betrachtet werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:267 + #: apt.conf.5.xml:266 msgid "" "The Get subsection controls the &apt-get; tool; please see its documentation " "for more information about the options here." @@@ -3632,7 -3615,7 +3635,7 @@@ msgstr " "erhalten." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:272 + #: apt.conf.5.xml:271 msgid "" "The Cache subsection controls the &apt-cache; tool; please see its " "documentation for more information about the options here." @@@ -3642,7 -3625,7 +3645,7 @@@ msgstr " "erhalten." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:277 + #: apt.conf.5.xml:276 msgid "" "The CDROM subsection controls the &apt-cdrom; tool; please see its " "documentation for more information about the options here." @@@ -3652,12 -3635,12 +3655,12 @@@ msgstr " "erhalten." #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:283 + #: apt.conf.5.xml:282 msgid "The Acquire Group" msgstr "Die Erwerbgruppe" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:284 + #: apt.conf.5.xml:283 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages as well as the various \"acquire methods\" responsible for the " @@@ -3668,7 -3651,7 +3671,7 @@@ msgstr " "Herunterladen selbst zuständig sind (siehe auch &sources-list;)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:291 + #: apt.conf.5.xml:290 msgid "" "Security related option defaulting to true, as giving a Release file's " "validation an expiration date prevents replay attacks over a long timescale, " @@@ -3690,7 -3673,7 +3693,7 @@@ msgstr " "ValidTime</literal> unten benutzt werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:304 + #: apt.conf.5.xml:303 msgid "" "Maximum time (in seconds) after its creation (as indicated by the " "<literal>Date</literal> header) that the <filename>Release</filename> file " @@@ -3709,7 -3692,7 +3712,7 @@@ msgstr " "Anhängen der Archivbezeichnung an den Optionsnamen vorgenommen werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:316 + #: apt.conf.5.xml:315 msgid "" "Minimum time (in seconds) after its creation (as indicated by the " "<literal>Date</literal> header) that the <filename>Release</filename> file " @@@ -3729,7 -3712,7 +3732,7 @@@ msgstr " "Optionsnamen vorgenommen werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:328 + #: apt.conf.5.xml:327 msgid "" "Try to download deltas called <literal>PDiffs</literal> for indexes (like " "<filename>Packages</filename> files) instead of downloading whole ones. True " @@@ -3740,7 -3723,7 +3743,7 @@@ msgstr " "der kompletten Dateien. Vorgabe ist True." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:331 + #: apt.conf.5.xml:330 msgid "" "Two sub-options to limit the use of PDiffs are also available: " "<literal>FileLimit</literal> can be used to specify a maximum number of " @@@ -3758,7 -3741,7 +3761,7 @@@ msgstr " "komplette Datei anstelle der Patche heruntergeladen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:341 + #: apt.conf.5.xml:340 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@@ -3774,7 -3757,7 +3777,7 @@@ msgstr " "URI-Art geöffnet wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:349 + #: apt.conf.5.xml:348 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." @@@ -3783,7 -3766,7 +3786,7 @@@ msgstr " "APT fehlgeschlagene Dateien in der angegebenen Zahl erneut versuchen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:354 + #: apt.conf.5.xml:353 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." @@@ -3793,7 -3776,7 +3796,7 @@@ msgstr " "kopiert zu werden. True ist die Vorgabe." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:359 + #: apt.conf.5.xml:358 msgid "" "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. " "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</" @@@ -3804,15 -3787,15 +3807,15 @@@ "be used." msgstr "" "<literal>http::Proxy</literal> ist der zu benutzende Standard-HTTP-Proxy. Er " - "wird standardmäßig in der Form <literal>http://[[Anwender][:Passwort]@]" - "Rechner[:Port]/</literal> angegeben. Durch Rechner-Proxies kann außerdem in " - "der Form <literal>http::Proxy::<host></literal> mit dem speziellen " - "Schlüsselwort <literal>DIRECT</literal> angegeben werden, dass keine Proxies " - "benutzt werden. Falls keine der obigen Einstellungen angegeben wurde, wird " - "die Umgebungsvariable <envar>http_proxy</envar> benutzt." + "wird standardmäßig in der Form <literal>http://[[Anwender][:" + "Passwort]@]Rechner[:Port]/</literal> angegeben. Durch Rechner-Proxies kann " + "außerdem in der Form <literal>http::Proxy::<host></literal> mit dem " + "speziellen Schlüsselwort <literal>DIRECT</literal> angegeben werden, dass " + "keine Proxies benutzt werden. Falls keine der obigen Einstellungen angegeben " + "wurde, wird die Umgebungsvariable <envar>http_proxy</envar> benutzt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:367 + #: apt.conf.5.xml:366 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy not to use its cached " @@@ -3833,7 -3816,7 +3836,7 @@@ msgstr " "Zwischenspeicher mit (großen) .deb-Dateien verunreinigt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:377 apt.conf.5.xml:449 + #: apt.conf.5.xml:376 apt.conf.5.xml:448 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method; this value applies to the connection as well as the data timeout." @@@ -3843,7 -3826,7 +3846,7 @@@ msgstr " "Datenzeitüberschreitungen angewandt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:380 + #: apt.conf.5.xml:379 msgid "" "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to " "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e." @@@ -3863,7 -3846,7 +3866,7 @@@ msgstr " "HTTP/1.1-Spezifikation entsprechen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:387 + #: apt.conf.5.xml:386 msgid "" "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will " "follow redirects, which is enabled by default." @@@ -3872,7 -3855,7 +3875,7 @@@ msgstr " "folgen wird, was standardmäßig aktiviert ist." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:390 + #: apt.conf.5.xml:389 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobytes. The default value is 0 " @@@ -3888,7 -3871,7 +3891,7 @@@ msgstr " "deaktiviert.)" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:395 + #: apt.conf.5.xml:394 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 " @@@ -3900,7 -3883,7 +3903,7 @@@ msgstr " "bekannten Bezeichner verwendet." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:403 + #: apt.conf.5.xml:402 msgid "" "The <literal>Cache-control</literal>, <literal>Timeout</literal>, " "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and " @@@ -3917,7 -3900,7 +3920,7 @@@ msgstr " "<literal>Pipeline-Depth</literal> wird noch nicht unterstützt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:411 + #: apt.conf.5.xml:410 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is the " @@@ -3958,7 -3941,7 +3961,7 @@@ msgstr " "Rechner ist <literal><host>::SslForceVersion</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:432 + #: apt.conf.5.xml:431 msgid "" "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs. " "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</" @@@ -3993,7 -3976,7 +3996,7 @@@ msgstr " "literal> und <literal>$(SITE_PORT)</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:452 + #: apt.conf.5.xml:451 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, " @@@ -4010,7 -3993,7 +4013,7 @@@ msgstr " "Musterkonfigurationsdatei)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:459 + #: apt.conf.5.xml:458 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to an HTTP URL - see the discussion of the http " @@@ -4024,7 -4007,7 +4027,7 @@@ msgstr " "Effizienz nicht empfohlen FTP über HTTP zu benutzen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:464 + #: apt.conf.5.xml:463 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@@ -4040,13 -4023,13 +4043,13 @@@ msgstr " "Server RFC2428 unterstützen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout> - #: apt.conf.5.xml:478 + #: apt.conf.5.xml:477 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "/cdrom/::Mount \"foo\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:473 + #: apt.conf.5.xml:472 msgid "" "For URIs using the <literal>cdrom</literal> method, the only configurable " "option is the mount point, <literal>cdrom::Mount</literal>, which must be " @@@ -4068,7 -4051,7 +4071,7 @@@ msgstr " "Aushängebefehle können per UMount angegeben werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:486 + #: apt.conf.5.xml:485 msgid "" "For GPGV URIs the only configurable option is <literal>gpgv::Options</" "literal>, which passes additional parameters to gpgv." @@@ -4077,13 -4060,13 +4080,13 @@@ msgstr " "literal>, um zusätzliche Parameter an Gpgv weiterzuleiten." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:497 + #: apt.conf.5.xml:496 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "Acquire::CompressionTypes::<replaceable>Dateierweiterung</replaceable> \"<replaceable>Methodenname</replaceable>\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:492 + #: apt.conf.5.xml:491 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@@ -4103,19 -4086,19 +4106,19 @@@ msgstr " "\"synopsis\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:502 + #: apt.conf.5.xml:501 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "Acquire::CompressionTypes::Order:: \"gz\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:505 + #: apt.conf.5.xml:504 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:498 + #: apt.conf.5.xml:497 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 " @@@ -4147,13 -4130,13 +4150,13 @@@ msgstr " "explizit zur Liste hinzuzufügen, da es automatisch hinzufügt wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout> - #: apt.conf.5.xml:512 + #: apt.conf.5.xml:511 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:507 + #: apt.conf.5.xml:506 msgid "" "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></" "literal> will be checked at run time. If this option has been set, the " @@@ -4179,7 -4162,7 +4182,7 @@@ msgstr " "nicht überschreiben, es wird diesen Typ nur vor die Liste setzen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:517 + #: apt.conf.5.xml:516 msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " @@@ -4191,7 -4174,7 +4194,7 @@@ msgstr " "dies meist nur für lokale Spiegel benutzt werden kann." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:524 + #: apt.conf.5.xml:523 msgid "" "When downloading <literal>gzip</literal> compressed indexes (Packages, " "Sources, or Translations), keep them gzip compressed locally instead of " @@@ -4205,7 -4188,7 +4208,7 @@@ msgstr " "False." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:532 + #: apt.conf.5.xml:531 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the description-" @@@ -4225,13 -4208,13 +4228,13 @@@ msgstr " "langen Sprachcodes selten." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting> - #: apt.conf.5.xml:549 + #: apt.conf.5.xml:548 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:537 + #: apt.conf.5.xml:536 msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: it will be " @@@ -4272,7 -4255,7 +4275,7 @@@ msgstr " "\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:550 + #: apt.conf.5.xml:549 msgid "" "Note: To prevent problems resulting from APT being executed in different " "environments (e.g. by different users or by other programs) all Translation " @@@ -4286,22 -4269,22 +4289,22 @@@ msgstr " "Liste hinzugefügt (nach einem impliziten »<literal>none</literal>«)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:559 + #: apt.conf.5.xml:558 msgid "When downloading, force to use only the IPv4 protocol." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:565 + #: apt.conf.5.xml:564 msgid "When downloading, force to use only the IPv6 protocol." msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:572 + #: apt.conf.5.xml:571 msgid "Directories" msgstr "Verzeichnisse" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:574 + #: apt.conf.5.xml:573 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@@ -4321,7 -4304,7 +4324,7 @@@ msgstr " "nicht mit <filename>/</filename> oder <filename>./</filename> beginnen." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:581 + #: apt.conf.5.xml:580 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@@ -4344,7 -4327,7 +4347,7 @@@ msgstr " "Standardverzeichnis in <literal>Dir::Cache</literal> enthalten." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:590 + #: apt.conf.5.xml:589 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@@ -4359,7 -4342,7 +4362,7 @@@ msgstr " "Konfigurationsdatei erfolgt)." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:596 + #: apt.conf.5.xml:595 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 " @@@ -4371,7 -4354,7 +4374,7 @@@ msgstr " "geladen." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:600 + #: apt.conf.5.xml:599 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@@ -4389,7 -4372,7 +4392,7 @@@ msgstr " "Programms an." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:608 + #: apt.conf.5.xml:607 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@@ -4409,7 -4392,7 +4412,7 @@@ msgstr " "<filename>/tmp/staging/var/lib/dpkg/status</filename> nachgesehen." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:621 + #: apt.conf.5.xml:620 msgid "" "The <literal>Ignore-Files-Silently</literal> list can be used to specify " "which files APT should silently ignore while parsing the files in the " @@@ -4427,12 -4410,12 +4430,12 @@@ msgstr " "diese Muster verwandt werden." #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:630 + #: apt.conf.5.xml:629 msgid "APT in DSelect" msgstr "APT in DSelect" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:632 + #: apt.conf.5.xml:631 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behavior. These are in the <literal>DSelect</literal> " @@@ -4443,7 -4426,7 +4446,7 @@@ msgstr " "<literal>DSelect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:637 + #: apt.conf.5.xml:636 msgid "" "Cache Clean mode; this value may be one of <literal>always</literal>, " "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</" @@@ -4466,7 -4449,7 +4469,7 @@@ msgstr " "vor dem Herunterladen neuer Pakete durch." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:651 + #: apt.conf.5.xml:650 msgid "" "The contents of this variable are passed to &apt-get; as command line " "options when it is run for the install phase." @@@ -4475,7 -4458,7 +4478,7 @@@ msgstr " "übermittelt, wenn es für die Installationsphase durchlaufen wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:656 + #: apt.conf.5.xml:655 msgid "" "The contents of this variable are passed to &apt-get; as command line " "options when it is run for the update phase." @@@ -4484,7 -4467,7 +4487,7 @@@ msgstr " "übermittelt, wenn es für die Aktualisierungsphase durchlaufen wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:661 + #: apt.conf.5.xml:660 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." @@@ -4493,12 -4476,12 +4496,12 @@@ msgstr " "nachfragen, um fortzufahren. Vorgabe ist es, nur bei Fehlern nachzufragen." #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:667 + #: apt.conf.5.xml:666 msgid "How APT calls &dpkg;" msgstr "Wie APT &dpkg; aufruft" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:668 + #: apt.conf.5.xml:667 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." @@@ -4507,7 -4490,7 +4510,7 @@@ msgstr " "stehen im Abschnitt <literal>DPkg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:673 + #: apt.conf.5.xml:672 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 " @@@ -4518,7 -4501,7 +4521,7 @@@ msgstr " "jedes Listenelement wird als einzelnes Argument an &dpkg; übermittelt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:679 + #: apt.conf.5.xml:678 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 " @@@ -4532,7 -4515,7 +4535,7 @@@ msgstr " "APT abgebrochen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:686 + #: apt.conf.5.xml:685 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 " @@@ -4548,7 -4531,7 +4551,7 @@@ msgstr " "die es installieren wird, auf der Standardeingabe übergeben, einen pro Zeile." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:692 + #: apt.conf.5.xml:691 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@@ -4564,7 -4547,7 +4567,7 @@@ msgstr " "literal> gegeben wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:700 + #: apt.conf.5.xml:699 msgid "" "APT chdirs to this directory before invoking &dpkg;, the default is " "<filename>/</filename>." @@@ -4573,7 -4556,7 +4576,7 @@@ msgstr " "die Vorgabe ist <filename>/</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:705 + #: apt.conf.5.xml:704 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages; the " "default is to disable signing and produce all binaries." @@@ -4583,12 -4566,12 +4586,12 @@@ msgstr " "Programme werden erstellt." #. type: Content of: <refentry><refsect1><refsect2><title> - #: apt.conf.5.xml:710 + #: apt.conf.5.xml:709 msgid "dpkg trigger usage (and related options)" msgstr "Dpkd-Trigger-Benutzung (und zugehörige Optionen)" #. type: Content of: <refentry><refsect1><refsect2><para> - #: apt.conf.5.xml:711 + #: apt.conf.5.xml:710 msgid "" "APT can call &dpkg; in such a way as to let it make aggressive use of " "triggers over multiple calls of &dpkg;. Without further options &dpkg; will " @@@ -4615,7 -4598,7 +4618,7 @@@ msgstr " "Pakete konfiguriert werden." #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> - #: apt.conf.5.xml:726 + #: apt.conf.5.xml:725 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@@ -4629,7 -4612,7 +4632,7 @@@ msgstr " "DPkg::TriggersPending \"true\";" #. type: Content of: <refentry><refsect1><refsect2><para> - #: apt.conf.5.xml:720 + #: apt.conf.5.xml:719 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 " @@@ -4654,7 -4637,7 +4657,7 @@@ msgstr " "Optionenkombination wäre <placeholder type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:733 + #: apt.conf.5.xml:732 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 " @@@ -4677,7 -4660,7 +4680,7 @@@ msgstr " "anhängen." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:741 + #: apt.conf.5.xml:740 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". The default value is \"<literal>all</literal>" @@@ -4707,7 -4690,7 +4710,7 @@@ msgstr " "enden könnte und möglicherweise nicht mehr startbar ist." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:756 + #: apt.conf.5.xml:755 msgid "" "If this option is set APT will call <command>dpkg --configure --pending</" "command> to let &dpkg; handle all required configurations and triggers. This " @@@ -4726,7 -4709,7 +4729,7 @@@ msgstr " "deaktivieren." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:763 + #: apt.conf.5.xml:762 msgid "" "Useful for the <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal>, and " @@@ -4742,7 -4725,7 +4745,7 @@@ msgstr " "benötigt werden." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> - #: apt.conf.5.xml:776 + #: apt.conf.5.xml:775 #, no-wrap msgid "" "OrderList::Score {\n" @@@ -4760,7 -4743,7 +4763,7 @@@ msgstr " "};" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:769 + #: apt.conf.5.xml:768 msgid "" "Essential packages (and their dependencies) should be configured immediately " "after unpacking. It is a good idea to do this quite early in the upgrade " @@@ -4784,12 -4767,12 +4787,12 @@@ msgstr " "mit ihren Vorgabewerten. <placeholder type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:789 + #: apt.conf.5.xml:788 msgid "Periodic and Archives options" msgstr "Periodische- und Archivoptionen" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:790 + #: apt.conf.5.xml:789 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by the " @@@ -4803,12 -4786,12 +4806,12 @@@ msgstr " "Dokumentation dieser Optionen zu erhalten." #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:798 + #: apt.conf.5.xml:797 msgid "Debug options" msgstr "Fehlersuchoptionen" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:800 + #: apt.conf.5.xml:799 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@@ -4826,7 -4809,7 +4829,7 @@@ msgstr " "könnten es sein:" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> - #: apt.conf.5.xml:811 + #: apt.conf.5.xml:810 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@@ -4837,7 -4820,7 +4840,7 @@@ msgstr " "getroffenen Entscheidungen ein." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> - #: apt.conf.5.xml:819 + #: apt.conf.5.xml:818 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@@ -4848,7 -4831,7 +4851,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:828 + #: apt.conf.5.xml:827 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@@ -4860,7 -4843,7 +4863,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:836 + #: apt.conf.5.xml:835 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CD-ROM IDs." @@@ -4869,12 -4852,12 +4872,12 @@@ msgstr " "Daten in CD-ROM-IDs aus." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:846 + #: apt.conf.5.xml:845 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><listitem><para> - #: apt.conf.5.xml:855 + #: apt.conf.5.xml:854 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" @@@ -4882,28 -4865,28 +4885,28 @@@ "literal>-Quellen beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:866 + #: apt.conf.5.xml:865 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><listitem><para> - #: apt.conf.5.xml:877 + #: apt.conf.5.xml:876 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><listitem><para> - #: apt.conf.5.xml:888 + #: apt.conf.5.xml:887 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><listitem><para> - #: apt.conf.5.xml:899 + #: apt.conf.5.xml:898 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@@ -4912,7 -4895,7 +4915,7 @@@ msgstr " "mittels <literal>gpg</literal> beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:910 + #: apt.conf.5.xml:909 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." @@@ -4921,13 -4904,13 +4924,13 @@@ msgstr " "CD-ROMs gespeichert sind." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:920 + #: apt.conf.5.xml:919 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><listitem><para> - #: apt.conf.5.xml:930 + #: apt.conf.5.xml:929 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." @@@ -4936,7 -4919,7 +4939,7 @@@ msgstr " "Bibliotheken generiert wurde." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:940 + #: apt.conf.5.xml:939 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 " @@@ -4947,7 -4930,7 +4950,7 @@@ msgstr " "ID für eine CD-ROM generiert wird." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:951 + #: apt.conf.5.xml:950 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." @@@ -4957,14 -4940,14 +4960,14 @@@ msgstr " "gleichen Zeit laufen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:963 + #: apt.conf.5.xml:962 msgid "Log when items are added to or removed from the global download queue." msgstr "" "protokolliert, wenn Elemente aus der globalen Warteschlange zum " "Herunterladen hinzugefügt oder entfernt werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:973 + #: apt.conf.5.xml:972 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." @@@ -4973,7 -4956,7 +4976,7 @@@ msgstr " "und kryptografischen Signaturen von heruntergeladenen Dateien beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:983 + #: apt.conf.5.xml:982 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." @@@ -4982,7 -4965,7 +4985,7 @@@ msgstr " "Diffs und Fehler, die die Paketindexlisten-Diffs betreffen, aus." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:995 + #: apt.conf.5.xml:994 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." @@@ -4992,7 -4975,7 +4995,7 @@@ msgstr " "werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1006 + #: apt.conf.5.xml:1005 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" @@@ -5000,7 -4983,7 +5003,7 @@@ "durchführen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1017 + #: apt.conf.5.xml:1016 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." @@@ -5010,7 -4993,7 +5013,7 @@@ msgstr " "beziehen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1027 + #: apt.conf.5.xml:1026 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@@ -5026,7 -5009,7 +5029,7 @@@ msgstr " "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1041 + #: apt.conf.5.xml:1040 msgid "" "Generate debug messages describing which packages are marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@@ -5048,18 -5031,18 +5051,18 @@@ msgstr " "auslösen. Sie werden nach zwei eingerückten Leerzeichen unter dem " "Originaleintrag angezeigt. Jede Zeile hat das Format <literal>MarkKeep</" "literal>, <literal>MarkDelete</literal> oder <literal>MarkInstall</literal> " - "gefolgt von <literal>Paketname <a.b.c -> d.e.f | x.y.z> (Abschnitt)" - "</literal> wobei <literal>a.b.c</literal> die aktuelle Version des Paketes " - "ist, <literal>d.e.f</literal> die Version ist, die zur Installation " - "vorgesehen ist und <literal>x.y.z</literal> eine neuere Version ist, die " - "aber nicht zur Installation vorgesehen ist (aufgrund einer niedrigen Pinning-" - "Bewertung). Die letzten beiden können weggelassen werden, wenn es keine gibt " - "oder wenn sie die gleiche Version haben, wie die, die installiert ist. " - "<literal>section</literal> ist der Name des Abschnitts, in dem das Paket " - "erscheint." + "gefolgt von <literal>Paketname <a.b.c -> d.e.f | x.y.z> " + "(Abschnitt)</literal> wobei <literal>a.b.c</literal> die aktuelle Version " + "des Paketes ist, <literal>d.e.f</literal> die Version ist, die zur " + "Installation vorgesehen ist und <literal>x.y.z</literal> eine neuere Version " + "ist, die aber nicht zur Installation vorgesehen ist (aufgrund einer " + "niedrigen Pinning-Bewertung). Die letzten beiden können weggelassen werden, " + "wenn es keine gibt oder wenn sie die gleiche Version haben, wie die, die " + "installiert ist. <literal>section</literal> ist der Name des Abschnitts, in " + "dem das Paket erscheint." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1062 + #: apt.conf.5.xml:1061 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." @@@ -5069,7 -5052,7 +5072,7 @@@ msgstr " "sind, aus." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1073 + #: apt.conf.5.xml:1072 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." @@@ -5078,7 -5061,7 +5081,7 @@@ msgstr " "und alle während deren Auswertung gefundenen Fehler aus." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1084 + #: apt.conf.5.xml:1083 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." @@@ -5088,7 -5071,7 +5091,7 @@@ msgstr " "soll." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1096 + #: apt.conf.5.xml:1095 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" @@@ -5096,12 -5079,12 +5099,12 @@@ "von &dpkg; ausgeführt werden." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1107 + #: apt.conf.5.xml:1106 msgid "Output the priority of each package list on startup." msgstr "gibt die Priorität jeder Paketliste beim Start aus." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1117 + #: apt.conf.5.xml:1116 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." @@@ -5111,7 -5094,7 +5114,7 @@@ msgstr " "aufgetreten ist)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1128 + #: apt.conf.5.xml:1127 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 " @@@ -5123,7 -5106,7 +5126,7 @@@ msgstr " "Marker</literal> beschrieben." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1140 + #: apt.conf.5.xml:1139 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@@ -5132,13 -5115,13 +5135,13 @@@ msgstr " "filename> gelesenen Anbieter aus." #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:1162 apt_preferences.5.xml:545 sources.list.5.xml:211 + #: apt.conf.5.xml:1161 apt_preferences.5.xml:545 sources.list.5.xml:211 #: apt-ftparchive.1.xml:596 msgid "Examples" msgstr "Beispiele" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:1163 + #: apt.conf.5.xml:1162 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@@ -5148,7 -5131,7 +5151,7 @@@ msgstr " #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:1175 + #: apt.conf.5.xml:1174 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." @@@ -6301,9 -6284,9 +6304,9 @@@ msgid " "id=\"0\"/>" msgstr "" "Mit einer geeigneten &sources-list;-Datei und der obigen Einstellungsdatei " - "wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die neuste" - "(n) <literal>stable</literal>-Version(en) durchzuführen. <placeholder type=" - "\"programlisting\" id=\"0\"/>" + "wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die " + "neuste(n) <literal>stable</literal>-Version(en) durchzuführen. <placeholder " + "type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> #: apt_preferences.5.xml:584 @@@ -6384,9 -6367,9 +6387,9 @@@ msgid " "id=\"0\"/>" msgstr "" "Mit einer geeigneten &sources-list;-Datei und der obigen Einstellungsdatei " - "wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die neuste" - "(n) <literal>testing</literal>-Version(en) durchzuführen. <placeholder type=" - "\"programlisting\" id=\"0\"/>" + "wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die " + "neuste(n) <literal>testing</literal>-Version(en) durchzuführen. <placeholder " + "type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> #: apt_preferences.5.xml:633 @@@ -6489,8 -6472,8 +6492,8 @@@ msgid " "<placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" "Mit einer geeigneten &sources-list;-Datei und der obigen Einstellungsdatei " - "wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die letzte" - "(n) Version(en) im Release mit Codenamen <literal>&testing-codename;</" + "wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die " + "letzte(n) Version(en) im Release mit Codenamen <literal>&testing-codename;</" "literal> durchzuführen. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> @@@ -6658,13 -6641,13 +6661,13 @@@ msgstr " #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:92 msgid "" - "<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)" - "</literal> which expands to the Debian architecture (such as <literal>amd64</" - "literal> or <literal>armel</literal>) 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." + "<literal>distribution</literal> may also contain a variable, <literal>" + "$(ARCH)</literal> which expands to the Debian architecture (such as " + "<literal>amd64</literal> or <literal>armel</literal>) 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> könnte außerdem eine Variable, <literal>" "$(ARCH)</literal>, enthalten, die zur Debian-Architektur (wie " @@@ -8183,9 -8166,9 +8186,9 @@@ msgstr "BESCHREIBUNG #: 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<aptitude>" - "(8) for the command line or B<synaptic>(8) for the X Window System. Some " - "options are only implemented in B<apt-get>(8) though." + "package management there are several frontends available, such as " + "B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window " + "System. Some options are only implemented in B<apt-get>(8) though." msgstr "" "APT ist ein Verwaltungssystem für Softwarepakete. Für normale alltägliche " "Paketverwaltung sind mehrere Oberflächen, wie B<aptitude>(8) für die " @@@ -8770,9 -8753,9 +8773,9 @@@ msgstr " "Bevor sie beginnen, <prgn>dselect</prgn> zu benutzen, ist es notwendig, die " "Verfügbarkeitsliste zu aktualisieren, indem sie aus dem Menü [E]rneuern " "auswählen. Dies ist eine Obermenge von <tt>apt-get update</tt>, das " - "<prgn>dselect</prgn> heruntergeladene Informationen zur Verfügung stellt. [E]" - "rneuern muss auch dann durchgeführt werden, wenn vorher <tt>apt-get update</" - "tt> ausgeführt wurde." + "<prgn>dselect</prgn> heruntergeladene Informationen zur Verfügung stellt. " + "[E]rneuern muss auch dann durchgeführt werden, wenn vorher <tt>apt-get " + "update</tt> ausgeführt wurde." #. type: <p></p> #: guide.sgml:253 diff --combined doc/po/es.po index bfdfd6372,38b2645ea..a6fbc5da2 --- a/doc/po/es.po +++ b/doc/po/es.po @@@ -38,7 -38,7 +38,11 @@@ msgid " msgstr "" "Project-Id-Version: apt 0.9.7.1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" ++<<<<<<< HEAD +"POT-Creation-Date: 2013-04-30 10:29+0300\n" ++======= + "POT-Creation-Date: 2013-06-13 13:46+0300\n" ++>>>>>>> upstream/debian/sid "PO-Revision-Date: 2012-07-14 12:21+0200\n" "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n" "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n" @@@ -848,9 -848,9 +852,9 @@@ msgid " "installation or upgrading. Each package is a package name, not a fully " "qualified filename (for instance, in a Debian system, <package>apt-utils</" "package> would be the argument provided, not <filename>apt-utils_&apt-" - "product-version;_amd64.deb</filename>). 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 " + "product-version;_amd64.deb</filename>). 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 " @@@ -1619,14 -1619,14 +1623,14 @@@ msgstr " #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125 - #: apt.conf.5.xml:1168 apt_preferences.5.xml:698 + #: apt.conf.5.xml:1167 apt_preferences.5.xml:698 msgid "Files" msgstr "Ficheros" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 #: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109 - #: apt.conf.5.xml:1174 apt_preferences.5.xml:705 sources.list.5.xml:252 + #: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 #: apt-ftparchive.1.xml:607 msgid "See Also" @@@ -2330,19 -2330,12 +2334,19 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:130 +#, fuzzy +#| msgid "" +#| "Update the local keyring with the archive keyring and remove from the " +#| "local keyring the archive keys which are no longer valid. The archive " +#| "keyring is shipped in the <literal>archive-keyring</literal> package of " +#| "your distribution, e.g. the <literal>debian-archive-keyring</literal> " +#| "package in Debian." msgid "" "Update the local keyring with the archive keyring and remove from the local " "keyring the archive keys which are no longer valid. The archive keyring is " "shipped in the <literal>archive-keyring</literal> package of your " -"distribution, e.g. the <literal>debian-archive-keyring</literal> package in " -"Debian." +"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in " +"Ubuntu." msgstr "" "Actualiza el registro de claves local con el registro de claves del archivo " "y elimina del registro local las claves de archivo que ya no son válidas. El " @@@ -2411,33 -2404,24 +2415,33 @@@ msgstr "Base de datos local de las clav #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:183 -msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" +#, fuzzy +#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" +msgid "<filename>/usr/share/keyrings/ubuntu-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:184 -msgid "Keyring of Debian archive trusted keys." +#, fuzzy +#| msgid "Keyring of Debian archive trusted keys." +msgid "Keyring of Ubuntu archive trusted keys." msgstr "Registro de las claves de confianza del archivo de Debian." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:187 +#, fuzzy +#| msgid "" +#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgid "" -"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" +"<filename>/usr/share/keyrings/ubuntu-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:188 -msgid "Keyring of Debian archive removed trusted keys." +#, fuzzy +#| msgid "Keyring of Debian archive removed trusted keys." +msgid "Keyring of Ubuntu archive removed trusted keys." msgstr "Registro de las claves de confianza eliminadas del archivo de Debian." #. type: Content of: <refentry><refsect1><para> @@@ -3335,15 -3319,14 +3339,14 @@@ msgstr "DPkg::Pre-Install-Pkgs {\"/usr/ #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:101 msgid "" - "In general the sample configuration file in <filename>&docdir;examples/apt." - "conf</filename> &configureindex; is a good guide for how it should look." + "In general the sample configuration file &configureindex; is a good guide " + "for how it should look." msgstr "" - "En general, el fichero de configuración de ejemplo <filename>&docdir;" - "examples/apt.conf</filename> &configureindex; es una buena guía para " - "entender su aspecto." + "En general, el fichero de configuración de ejemplo &configureindex; es una " + "buena guía para entender su aspecto." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:105 + #: apt.conf.5.xml:104 msgid "" "Case is not significant in names of configuration items, so in the previous " "example you could use <literal>dpkg::pre-install-pkgs</literal>." @@@ -3353,7 -3336,7 +3356,7 @@@ msgstr " "<literal>dpkg::pre-install-pkgs</literal>." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:108 + #: apt.conf.5.xml:107 msgid "" "Names for the configuration items are optional if a list is defined as can " "be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If " @@@ -3368,7 -3351,7 +3371,7 @@@ msgstr " "cualquier otra opción reasignando un nuevo valor a la opción." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:113 + #: apt.conf.5.xml:112 msgid "" "Two special commands are defined: <literal>#include</literal> (which is " "deprecated and not supported by alternative implementations) and " @@@ -3388,7 -3371,7 +3391,7 @@@ msgstr " "acabar con punto y coma)." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:123 + #: apt.conf.5.xml:122 msgid "" "The <literal>#clear</literal> command is the only way to delete a list or a " "complete scope. Reopening a scope (or using the syntax described below with " @@@ -3404,7 -3387,7 +3407,7 @@@ msgstr " "los ámbitos no se pueden redefinir, sólo eliminar." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:131 + #: apt.conf.5.xml:130 msgid "" "All of the APT tools take an -o option which allows an arbitrary " "configuration directive to be specified on the command line. The syntax is a " @@@ -3423,7 -3406,7 +3426,7 @@@ msgstr " "sintaxis de ámbitos en la línea de órdenes)." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:139 + #: apt.conf.5.xml:138 msgid "" "Note that appending items to a list using <literal>::</literal> only works " "for one item per line, and that you should not use it in combination with " @@@ -3453,12 -3436,12 +3456,12 @@@ msgstr " "declaraciones ahora que APT no muestra fallos de forma explícita." #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:154 + #: apt.conf.5.xml:153 msgid "The APT Group" msgstr "El grupo APT" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:155 + #: apt.conf.5.xml:154 msgid "" "This group of options controls general APT behavior as well as holding the " "options for all of the tools." @@@ -3467,7 -3450,7 +3470,7 @@@ msgstr " "mantiene las opciones para todas las herramientas." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:160 + #: apt.conf.5.xml:159 msgid "" "System Architecture; sets the architecture to use when fetching files and " "parsing package lists. The internal default is the architecture apt was " @@@ -3478,7 -3461,7 +3481,7 @@@ msgstr " "arquitectura para la que apt se compiló." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:167 + #: apt.conf.5.xml:166 msgid "" "All Architectures the system supports. For instance, CPUs implementing the " "<literal>amd64</literal> (also called <literal>x86-64</literal>) " @@@ -3500,7 -3483,7 +3503,7 @@@ msgstr " "add-architecture</command>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:180 + #: apt.conf.5.xml:179 msgid "" "Default release to install packages from if more than one version is " "available. Contains release name, codename or release version. Examples: " @@@ -3514,7 -3497,7 +3517,7 @@@ msgstr " "«5.0*». Consulte también &apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:186 + #: apt.conf.5.xml:185 msgid "" "Ignore held packages; this global option causes the problem resolver to " "ignore held packages in its decision making." @@@ -3523,7 -3506,7 +3526,7 @@@ msgstr " "problemas ignore los paquetes retenidos en la toma de decisiones." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:191 + #: apt.conf.5.xml:190 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 " @@@ -3537,7 -3520,7 +3540,7 @@@ msgstr " "mecanismo directo para reinstalarlos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:199 + #: apt.conf.5.xml:198 msgid "" "Defaults to on, which will cause APT to install essential and important " "packages as soon as possible in an install/upgrade operation, in order to " @@@ -3564,7 -3547,7 +3567,7 @@@ msgstr " "del paquete A, ya que no se satisface la dependencia sobre éste." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:211 + #: apt.conf.5.xml:210 msgid "" "The immediate configuration marker is also applied in the potentially " "problematic case of circular dependencies, since a dependency with the " @@@ -3593,7 -3576,7 +3596,7 @@@ msgstr " "anteriormente." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:224 + #: apt.conf.5.xml:223 msgid "" "Before a big operation like <literal>dist-upgrade</literal> is run with this " "option disabled you should try to explicitly <literal>install</literal> the " @@@ -3610,7 -3593,7 +3613,7 @@@ msgstr " "para que así pueden mejorar y corregir el proceso de actualización." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:235 + #: apt.conf.5.xml:234 msgid "" "Never enable this option unless you <emphasis>really</emphasis> know what " "you are doing. It permits APT to temporarily remove an essential package to " @@@ -3631,7 -3614,7 +3634,7 @@@ msgstr " "sobre la que estos paquetes dependen." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:247 + #: apt.conf.5.xml:246 msgid "" "APT uses since version 0.7.26 a resizable memory mapped cache file to store " "the available information. <literal>Cache-Start</literal> acts as a hint of " @@@ -3668,14 -3651,14 +3671,14 @@@ msgstr " "desactiva el crecimiento automático de la caché." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:263 + #: apt.conf.5.xml:262 msgid "Defines which packages are considered essential build dependencies." msgstr "" "Define los paquetes que se consideran dependencias de construcción " "esenciales." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:267 + #: apt.conf.5.xml:266 msgid "" "The Get subsection controls the &apt-get; tool; please see its documentation " "for more information about the options here." @@@ -3684,7 -3667,7 +3687,7 @@@ msgstr " "documentación para más información sobre esta opción." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:272 + #: apt.conf.5.xml:271 msgid "" "The Cache subsection controls the &apt-cache; tool; please see its " "documentation for more information about the options here." @@@ -3693,7 -3676,7 +3696,7 @@@ msgstr " "documentación para más información sobre esta opción." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:277 + #: apt.conf.5.xml:276 msgid "" "The CDROM subsection controls the &apt-cdrom; tool; please see its " "documentation for more information about the options here." @@@ -3702,12 -3685,12 +3705,12 @@@ msgstr " "documentación para más información sobre esta opción." #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:283 + #: apt.conf.5.xml:282 msgid "The Acquire Group" msgstr "El grupo Acquire" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:284 + #: apt.conf.5.xml:283 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages as well as the various \"acquire methods\" responsible for the " @@@ -3718,7 -3701,7 +3721,7 @@@ msgstr " "sí mismo (consulte también &sources-list;)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:291 + #: apt.conf.5.xml:290 msgid "" "Security related option defaulting to true, as giving a Release file's " "validation an expiration date prevents replay attacks over a long timescale, " @@@ -3739,7 -3722,7 +3742,7 @@@ msgstr " "utilizar la opción <literal>Max-ValidTime</literal> a continuación." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:304 + #: apt.conf.5.xml:303 msgid "" "Maximum time (in seconds) after its creation (as indicated by the " "<literal>Date</literal> header) that the <filename>Release</filename> file " @@@ -3758,7 -3741,7 +3761,7 @@@ msgstr " "se pueden realizar añadiendo la etiqueta del archivo al nombre de opción." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:316 + #: apt.conf.5.xml:315 msgid "" "Minimum time (in seconds) after its creation (as indicated by the " "<literal>Date</literal> header) that the <filename>Release</filename> file " @@@ -3778,7 -3761,7 +3781,7 @@@ msgstr " "y deben utilizar añadiendo la etiqueta del archivo al nombre de opción." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:328 + #: apt.conf.5.xml:327 msgid "" "Try to download deltas called <literal>PDiffs</literal> for indexes (like " "<filename>Packages</filename> files) instead of downloading whole ones. True " @@@ -3789,7 -3772,7 +3792,7 @@@ msgstr " "enteros. Su valor predeterminado es «true»." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:331 + #: apt.conf.5.xml:330 msgid "" "Two sub-options to limit the use of PDiffs are also available: " "<literal>FileLimit</literal> can be used to specify a maximum number of " @@@ -3807,7 -3790,7 +3810,7 @@@ msgstr " "parches." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:341 + #: apt.conf.5.xml:340 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@@ -3822,7 -3805,7 +3825,7 @@@ msgstr " "se abrirá una conexión por cada tipo de URI." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:349 + #: apt.conf.5.xml:348 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." @@@ -3831,7 -3814,7 +3834,7 @@@ msgstr " "intentar obtener los ficheros fallidos el número de veces proporcionado." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:354 + #: apt.conf.5.xml:353 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." @@@ -3841,7 -3824,7 +3844,7 @@@ msgstr " "«true» de forma predeterminada." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:359 + #: apt.conf.5.xml:358 msgid "" "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. " "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</" @@@ -3861,7 -3844,7 +3864,7 @@@ msgstr " "opciones anteriores." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:367 + #: apt.conf.5.xml:366 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy not to use its cached " @@@ -3880,7 -3863,7 +3883,7 @@@ msgstr " "impedir que el proxy contamine la caché con ficheros «.deb» (de gran tamaño)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:377 apt.conf.5.xml:449 + #: apt.conf.5.xml:376 apt.conf.5.xml:448 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method; this value applies to the connection as well as the data timeout." @@@ -3890,7 -3873,7 +3893,7 @@@ msgstr " "y a la recepción de datos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:380 + #: apt.conf.5.xml:379 msgid "" "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to " "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e." @@@ -3910,7 -3893,7 +3913,7 @@@ msgstr " "cumplir la especificación HTTP/1.1." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:387 + #: apt.conf.5.xml:386 msgid "" "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will " "follow redirects, which is enabled by default." @@@ -3919,7 -3902,7 +3922,7 @@@ msgstr " "redirección; activado por omisión." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:390 + #: apt.conf.5.xml:389 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobytes. The default value is 0 " @@@ -3934,7 -3917,7 +3937,7 @@@ msgstr " "implícitamente la descarga simultánea desde varios servidores)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:395 + #: apt.conf.5.xml:394 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 " @@@ -3945,7 -3928,7 +3948,7 @@@ msgstr " "permiten el acceso para clientes que usan un identificador conocido." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:403 + #: apt.conf.5.xml:402 msgid "" "The <literal>Cache-control</literal>, <literal>Timeout</literal>, " "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and " @@@ -3962,7 -3945,7 +3965,7 @@@ msgstr " "<literal>Pipeline-Depth</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:411 + #: apt.conf.5.xml:410 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is the " @@@ -4002,7 -3985,7 +4005,7 @@@ msgstr " "SslForceVersion</literal> es la opción correspondiente para cada servidor." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:432 + #: apt.conf.5.xml:431 msgid "" "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs. " "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</" @@@ -4035,7 -4018,7 +4038,7 @@@ msgstr " "<literal>$(SITE)</literal> y <literal>$(SITE_PORT)</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:452 + #: apt.conf.5.xml:451 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, " @@@ -4052,7 -4035,7 +4055,7 @@@ msgstr " "ejemplos)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:459 + #: apt.conf.5.xml:458 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to an HTTP URL - see the discussion of the http " @@@ -4066,7 -4049,7 +4069,7 @@@ msgstr " "a su poca eficiencia." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:464 + #: apt.conf.5.xml:463 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@@ -4082,13 -4065,13 +4085,13 @@@ msgstr " "compatibles con la RFC 2428." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout> - #: apt.conf.5.xml:478 + #: apt.conf.5.xml:477 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "/cdrom/::Mount \"algo\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:473 + #: apt.conf.5.xml:472 msgid "" "For URIs using the <literal>cdrom</literal> method, the only configurable " "option is the mount point, <literal>cdrom::Mount</literal>, which must be " @@@ -4110,7 -4093,7 +4113,7 @@@ msgstr " "especificar órdenes para desmontar mediante UMount." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:486 + #: apt.conf.5.xml:485 msgid "" "For GPGV URIs the only configurable option is <literal>gpgv::Options</" "literal>, which passes additional parameters to gpgv." @@@ -4119,13 -4102,13 +4122,13 @@@ msgstr " "Options</literal>, que introduce parámetros adicionales a gpgv." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:497 + #: apt.conf.5.xml:496 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "Acquire::CompressionTypes::<replaceable>extensión-del-fichero</replaceable> \"<replaceable>nombre-del-método</replaceable>\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:492 + #: apt.conf.5.xml:491 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@@ -4145,19 -4128,19 +4148,19 @@@ msgstr " "\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:502 + #: apt.conf.5.xml:501 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "Acquire::CompressionTypes::Order:: \"gz\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:505 + #: apt.conf.5.xml:504 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:498 + #: apt.conf.5.xml:497 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 " @@@ -4189,13 -4172,13 +4192,13 @@@ msgstr " "explícita ya que se añadirá de forma automática." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout> - #: apt.conf.5.xml:512 + #: apt.conf.5.xml:511 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:507 + #: apt.conf.5.xml:506 msgid "" "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></" "literal> will be checked at run time. If this option has been set, the " @@@ -4220,7 -4203,7 +4223,7 @@@ msgstr " "omite la lista definida, simplemente prefija la lista con este tipo." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:517 + #: apt.conf.5.xml:516 msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " @@@ -4232,7 -4215,7 +4235,7 @@@ msgstr " "así que habitualmente esto solo sirve con réplicas locales." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:524 + #: apt.conf.5.xml:523 msgid "" "When downloading <literal>gzip</literal> compressed indexes (Packages, " "Sources, or Translations), keep them gzip compressed locally instead of " @@@ -4246,7 -4229,7 +4249,7 @@@ msgstr " "paquetes locales. El valor predeterminado es «false»." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:532 + #: apt.conf.5.xml:531 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the description-" @@@ -4265,13 -4248,13 +4268,13 @@@ msgstr " "idioma (especialmente para los códigos de idioma largos)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting> - #: apt.conf.5.xml:549 + #: apt.conf.5.xml:548 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; }" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:537 + #: apt.conf.5.xml:536 msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: it will be " @@@ -4310,7 -4293,7 +4313,7 @@@ msgstr " "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:550 + #: apt.conf.5.xml:549 msgid "" "Note: To prevent problems resulting from APT being executed in different " "environments (e.g. by different users or by other programs) all Translation " @@@ -4324,22 -4307,22 +4327,22 @@@ msgstr " "implícito)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:559 + #: apt.conf.5.xml:558 msgid "When downloading, force to use only the IPv4 protocol." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:565 + #: apt.conf.5.xml:564 msgid "When downloading, force to use only the IPv6 protocol." msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:572 + #: apt.conf.5.xml:571 msgid "Directories" msgstr "Directorios" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:574 + #: apt.conf.5.xml:573 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@@ -4360,7 -4343,7 +4363,7 @@@ msgstr " "filename> ó <filename>./</filename>." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:581 + #: apt.conf.5.xml:580 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@@ -4382,7 -4365,7 +4385,7 @@@ msgstr " "directorio predeterminado está en <literal>Dir::Cache</literal>" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:590 + #: apt.conf.5.xml:589 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@@ -4398,7 -4381,7 +4401,7 @@@ msgstr " "<envar>APT_CONFIG</envar>)." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:596 + #: apt.conf.5.xml:595 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 " @@@ -4409,7 -4392,7 +4412,7 @@@ msgstr " "Al finalizar este proceso carga el fichero de configuración principal." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:600 + #: apt.conf.5.xml:599 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@@ -4426,7 -4409,7 +4429,7 @@@ msgstr " "literal> especifican la ubicación de sus respectivos programas." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:608 + #: apt.conf.5.xml:607 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@@ -4447,7 -4430,7 +4450,7 @@@ msgstr " "staging/var/lib/dpkg/status</filename>." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:621 + #: apt.conf.5.xml:620 msgid "" "The <literal>Ignore-Files-Silently</literal> list can be used to specify " "which files APT should silently ignore while parsing the files in the " @@@ -4465,12 -4448,12 +4468,12 @@@ msgstr " "de expresiones regulares." #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:630 + #: apt.conf.5.xml:629 msgid "APT in DSelect" msgstr "APT con DSelect" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:632 + #: apt.conf.5.xml:631 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behavior. These are in the <literal>DSelect</literal> " @@@ -4481,7 -4464,7 +4484,7 @@@ msgstr " "encuentran en la sección <literal>DSelect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:637 + #: apt.conf.5.xml:636 msgid "" "Cache Clean mode; this value may be one of <literal>always</literal>, " "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</" @@@ -4503,7 -4486,7 +4506,7 @@@ msgstr " "realiza esta acción antes de descargar paquetes nuevos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:651 + #: apt.conf.5.xml:650 msgid "" "The contents of this variable are passed to &apt-get; as command line " "options when it is run for the install phase." @@@ -4512,7 -4495,7 +4515,7 @@@ msgstr " "la línea de ordenes al ejecutar la fase de instalación." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:656 + #: apt.conf.5.xml:655 msgid "" "The contents of this variable are passed to &apt-get; as command line " "options when it is run for the update phase." @@@ -4521,7 -4504,7 +4524,7 @@@ msgstr " "la línea de ordenes al ejecutar la fase de actualización." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:661 + #: apt.conf.5.xml:660 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." @@@ -4531,12 -4514,12 +4534,12 @@@ msgstr " "preguntará en caso de error." #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:667 + #: apt.conf.5.xml:666 msgid "How APT calls &dpkg;" msgstr "Invocación de APT a dpkg" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:668 + #: apt.conf.5.xml:667 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." @@@ -4545,7 -4528,7 +4548,7 @@@ msgstr " "se encuentran en la sección <literal>DPkg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:673 + #: apt.conf.5.xml:672 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 " @@@ -4556,7 -4539,7 +4559,7 @@@ msgstr " "introduce a &dpkg; como un sólo argumento." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:679 + #: apt.conf.5.xml:678 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 " @@@ -4569,7 -4552,7 +4572,7 @@@ msgstr " "sh</filename>; en caso de fallo, APT cancela la acción." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:686 + #: apt.conf.5.xml:685 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 " @@@ -4585,7 -4568,7 +4588,7 @@@ msgstr " "la entrada estándar." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:692 + #: apt.conf.5.xml:691 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@@ -4601,7 -4584,7 +4604,7 @@@ msgstr " "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:700 + #: apt.conf.5.xml:699 msgid "" "APT chdirs to this directory before invoking &dpkg;, the default is " "<filename>/</filename>." @@@ -4610,7 -4593,7 +4613,7 @@@ msgstr " "predeterminado es <filename>/</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:705 + #: apt.conf.5.xml:704 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages; the " "default is to disable signing and produce all binaries." @@@ -4620,12 -4603,12 +4623,12 @@@ msgstr " "paquetes y a producir todos los binarios." #. type: Content of: <refentry><refsect1><refsect2><title> - #: apt.conf.5.xml:710 + #: apt.conf.5.xml:709 msgid "dpkg trigger usage (and related options)" msgstr "Uso del disparador de dpkg (y de las opciones relacionadas)" #. type: Content of: <refentry><refsect1><refsect2><para> - #: apt.conf.5.xml:711 + #: apt.conf.5.xml:710 msgid "" "APT can call &dpkg; in such a way as to let it make aggressive use of " "triggers over multiple calls of &dpkg;. Without further options &dpkg; will " @@@ -4652,7 -4635,7 +4655,7 @@@ msgstr " "tiempo (o más) durante la configuración de todos los paquetes." #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> - #: apt.conf.5.xml:726 + #: apt.conf.5.xml:725 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@@ -4666,7 -4649,7 +4669,7 @@@ msgstr " "DPkg::TriggersPending \"true\";" #. type: Content of: <refentry><refsect1><refsect2><para> - #: apt.conf.5.xml:720 + #: apt.conf.5.xml:719 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 " @@@ -4690,7 -4673,7 +4693,7 @@@ msgstr " "type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:733 + #: apt.conf.5.xml:732 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 " @@@ -4713,7 -4696,7 +4716,7 @@@ msgstr " "eliminación." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:741 + #: apt.conf.5.xml:740 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". The default value is \"<literal>all</literal>" @@@ -4743,7 -4726,7 +4746,7 @@@ msgstr " "imposibilidad de arrancar el sistema. " #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:756 + #: apt.conf.5.xml:755 msgid "" "If this option is set APT will call <command>dpkg --configure --pending</" "command> to let &dpkg; handle all required configurations and triggers. This " @@@ -4761,7 -4744,7 +4764,7 @@@ msgstr " "desactivar esta opción en todas las ejecuciones menos la última." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:763 + #: apt.conf.5.xml:762 msgid "" "Useful for the <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal>, and " @@@ -4777,7 -4760,7 +4780,7 @@@ msgstr " "los disparadores necesarios para configurar este paquete." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> - #: apt.conf.5.xml:776 + #: apt.conf.5.xml:775 #, no-wrap msgid "" "OrderList::Score {\n" @@@ -4795,7 -4778,7 +4798,7 @@@ msgstr " "};" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:769 + #: apt.conf.5.xml:768 msgid "" "Essential packages (and their dependencies) should be configured immediately " "after unpacking. It is a good idea to do this quite early in the upgrade " @@@ -4820,12 -4803,12 +4823,12 @@@ msgstr " "<placeholder type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:789 + #: apt.conf.5.xml:788 msgid "Periodic and Archives options" msgstr "Las opciones «Periodic» y «Archives»" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:790 + #: apt.conf.5.xml:789 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by the " @@@ -4839,12 -4822,12 +4842,12 @@@ msgstr " "documentación de estas opciones." #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:798 + #: apt.conf.5.xml:797 msgid "Debug options" msgstr "Opciones de depuración" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:800 + #: apt.conf.5.xml:799 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@@ -4861,7 -4844,7 +4864,7 @@@ msgstr " "para un usuario normal, aunque unas cuantas sí son:" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> - #: apt.conf.5.xml:811 + #: apt.conf.5.xml:810 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@@ -4872,7 -4855,7 +4875,7 @@@ msgstr " "purge</literal>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> - #: apt.conf.5.xml:819 + #: apt.conf.5.xml:818 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@@ -4883,7 -4866,7 +4886,7 @@@ msgstr " "<literal>apt-get -s install</literal>) como un usuario normal." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> - #: apt.conf.5.xml:828 + #: apt.conf.5.xml:827 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@@ -4895,7 -4878,7 +4898,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:836 + #: apt.conf.5.xml:835 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CD-ROM IDs." @@@ -4904,14 -4887,14 +4907,14 @@@ msgstr " "statfs en los identificadores de los discos ópticos." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:846 + #: apt.conf.5.xml:845 msgid "A full list of debugging options to apt follows." msgstr "" "A continuación, se muestra la lista completa de las opciones de depuración " "de apt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:855 + #: apt.conf.5.xml:854 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" @@@ -4919,26 -4902,26 +4922,26 @@@ "<literal>cdrom://</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:866 + #: apt.conf.5.xml:865 msgid "Print information related to downloading packages using FTP." msgstr "" "Muestra la información relacionada con la descarga de paquetes mediante FTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:877 + #: apt.conf.5.xml:876 msgid "Print information related to downloading packages using HTTP." msgstr "" "Muestra la información relacionada con la descarga de paquetes mediante HTTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:888 + #: apt.conf.5.xml:887 msgid "Print information related to downloading packages using HTTPS." msgstr "" "Muestra la información relacionada con la descarga de paquetes mediante " "HTTPS." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:899 + #: apt.conf.5.xml:898 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@@ -4947,7 -4930,7 +4950,7 @@@ msgstr " "criptográficas mediante <literal>gpg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:910 + #: apt.conf.5.xml:909 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." @@@ -4956,14 -4939,14 +4959,14 @@@ msgstr " "paquetes almacenadas en CD-ROM." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:920 + #: apt.conf.5.xml:919 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" "Describe el proceso de resolución de dependencias de compilación en &apt-" "get;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:930 + #: apt.conf.5.xml:929 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." @@@ -4972,7 -4955,7 +4975,7 @@@ msgstr " "<literal>apt</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:940 + #: apt.conf.5.xml:939 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 " @@@ -4983,7 -4966,7 +4986,7 @@@ msgstr " "identificador de un CD-ROM." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:951 + #: apt.conf.5.xml:950 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." @@@ -4993,14 -4976,14 +4996,14 @@@ msgstr " "a la vez." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:963 + #: apt.conf.5.xml:962 msgid "Log when items are added to or removed from the global download queue." msgstr "" "Registra los elementos que se añaden o se borran de la cola de descarga " "global." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:973 + #: apt.conf.5.xml:972 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." @@@ -5010,7 -4993,7 +5013,7 @@@ msgstr " "ficheros descargados." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:983 + #: apt.conf.5.xml:982 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." @@@ -5019,7 -5002,7 +5022,7 @@@ msgstr " "lista de índices de paquetes, y los errores relacionados con éstos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:995 + #: apt.conf.5.xml:994 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." @@@ -5029,7 -5012,7 +5032,7 @@@ msgstr " "índices completos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1006 + #: apt.conf.5.xml:1005 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" @@@ -5037,7 -5020,7 +5040,7 @@@ "descargas." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1017 + #: apt.conf.5.xml:1016 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." @@@ -5046,7 -5029,7 +5049,7 @@@ msgstr " "de los paquetes y con la eliminación de los paquetes sin usar." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1027 + #: apt.conf.5.xml:1026 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@@ -5062,7 -5045,7 +5065,7 @@@ msgstr " "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1041 + #: apt.conf.5.xml:1040 msgid "" "Generate debug messages describing which packages are marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@@ -5093,7 -5076,7 +5096,7 @@@ msgstr " "la sección en la que aparece el paquete." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1062 + #: apt.conf.5.xml:1061 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." @@@ -5102,7 -5085,7 +5105,7 @@@ msgstr " "invocó, con los argumentos separados por un espacio." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1073 + #: apt.conf.5.xml:1072 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." @@@ -5111,7 -5094,7 +5114,7 @@@ msgstr " "estado y cualquier error encontrado durante el análisis." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1084 + #: apt.conf.5.xml:1083 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." @@@ -5120,7 -5103,7 +5123,7 @@@ msgstr " "literal> debería entregar los paquetes a &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1096 + #: apt.conf.5.xml:1095 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" @@@ -5128,12 -5111,12 +5131,12 @@@ "&dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1107 + #: apt.conf.5.xml:1106 msgid "Output the priority of each package list on startup." msgstr "Muestra la prioridad de cada lista de paquetes al iniciarse." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1117 + #: apt.conf.5.xml:1116 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." @@@ -5142,7 -5125,7 +5145,7 @@@ msgstr " "lo que ocurre cuando se encuentra un problema de dependencias complejo)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1128 + #: apt.conf.5.xml:1127 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 " @@@ -5153,7 -5136,7 +5156,7 @@@ msgstr " "misma que la descrita en <literal>Debug::pkgDepCache::Marker</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1140 + #: apt.conf.5.xml:1139 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@@ -5162,13 -5145,13 +5165,13 @@@ msgstr " "vendors.list</filename>." #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:1162 apt_preferences.5.xml:545 sources.list.5.xml:211 + #: apt.conf.5.xml:1161 apt_preferences.5.xml:545 sources.list.5.xml:211 #: apt-ftparchive.1.xml:596 msgid "Examples" msgstr "Ejemplos" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:1163 + #: apt.conf.5.xml:1162 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@@ -5178,7 -5161,7 +5181,7 @@@ msgstr " #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:1175 + #: apt.conf.5.xml:1174 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." @@@ -6681,18 -6664,18 +6684,18 @@@ msgstr " #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:92 msgid "" - "<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)" - "</literal> which expands to the Debian architecture (such as <literal>amd64</" - "literal> or <literal>armel</literal>) 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>distribución</literal> puede contener una variable, <literal>$(ARCH)" - "</literal>, que se expandirá a la arquitectura de Debian usada en el sistema " - "(por ejemplo, <literal>amd64</literal> o <literal>armel</literal>). Esto " - "permite que los ficheros <filename>sources.list</filename> sean " + "<literal>distribution</literal> may also contain a variable, <literal>" + "$(ARCH)</literal> which expands to the Debian architecture (such as " + "<literal>amd64</literal> or <literal>armel</literal>) 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>distribución</literal> puede contener una variable, <literal>" + "$(ARCH)</literal>, que se expandirá a la arquitectura de Debian usada en el " + "sistema (por ejemplo, <literal>amd64</literal> o <literal>armel</literal>). " + "Esto permite que los ficheros <filename>sources.list</filename> sean " "independientes de la arquitectura. En general, esta característica sólo es " "de interés si se especifica una ruta completa, de lo contrario <literal>APT</" "literal> generará automáticamente una URI con la arquitectura actual del " @@@ -8196,9 -8179,9 +8199,9 @@@ msgstr "DESCRIPCIÓN #: 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<aptitude>" - "(8) for the command line or B<synaptic>(8) for the X Window System. Some " - "options are only implemented in B<apt-get>(8) though." + "package management there are several frontends available, such as " + "B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window " + "System. Some options are only implemented in B<apt-get>(8) though." msgstr "" "APT es un sistema de gestión de paquetes de software. Dispone de varias " "interfaces para la gestión de paquetes normal del día a día, tales como " @@@ -8768,9 -8751,9 +8771,9 @@@ msgid " "<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</" "tt> has been run before." msgstr "" - "Es necesario actualizar la lista disponible mediante el elemento de menú [A]" - "ctualizar antes de iniciar <prgn>dselect</prgn>. Éste es un superconjunto de " - "<tt>apt-get update</tt> que permite a <prgn>dselect</prgn> disponer de la " + "Es necesario actualizar la lista disponible mediante el elemento de menú " + "[A]ctualizar antes de iniciar <prgn>dselect</prgn>. Éste es un superconjunto " + "de <tt>apt-get update</tt> que permite a <prgn>dselect</prgn> disponer de la " "información obtenida. Debe ejecutar [A]ctualizar aunque haya ejecutado " "<tt>apt-get update</tt> con anterioridad." diff --combined doc/po/fr.po index 5c7f521c9,c2f4b6d83..41358cfa2 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@@ -10,7 -10,7 +10,11 @@@ msgid " msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" ++<<<<<<< HEAD +"POT-Creation-Date: 2013-04-30 10:29+0300\n" ++======= + "POT-Creation-Date: 2013-06-13 13:46+0300\n" ++>>>>>>> upstream/debian/sid "PO-Revision-Date: 2013-04-09 07:56+0200\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@@ -760,9 -760,9 +764,9 @@@ msgid " "installation or upgrading. Each package is a package name, not a fully " "qualified filename (for instance, in a Debian system, <package>apt-utils</" "package> would be the argument provided, not <filename>apt-utils_&apt-" - "product-version;_amd64.deb</filename>). 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 " + "product-version;_amd64.deb</filename>). 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 " @@@ -824,10 -824,10 +828,10 @@@ msgstr " "déjà installés sans mettre à jour les autres paquets du système. À la " "différence de la commande « upgrade » qui installera la dernière version " "disponible de tous les paquets installés au moment de son exécution, " - "« install » n'installera la nouvelle version que pour le(s) paquet(s) indiqué" - "(s). Il suffit de fournir le nom du(des) paquet(s) à mettre à jour et si une " - "nouvelle version est disponible, cette version (et ses dépendances, comme " - "décrit plus haut) sera récupérée et installée." + "« install » n'installera la nouvelle version que pour le(s) paquet(s) " + "indiqué(s). Il suffit de fournir le nom du(des) paquet(s) à mettre à jour et " + "si une nouvelle version est disponible, cette version (et ses dépendances, " + "comme décrit plus haut) sera récupérée et installée." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:137 @@@ -1538,14 -1538,14 +1542,14 @@@ msgstr " #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125 - #: apt.conf.5.xml:1168 apt_preferences.5.xml:698 + #: apt.conf.5.xml:1167 apt_preferences.5.xml:698 msgid "Files" msgstr "Fichiers" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 #: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109 - #: apt.conf.5.xml:1174 apt_preferences.5.xml:705 sources.list.5.xml:252 + #: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 #: apt-ftparchive.1.xml:607 msgid "See Also" @@@ -2257,19 -2257,12 +2261,19 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:130 +#, fuzzy +#| msgid "" +#| "Update the local keyring with the archive keyring and remove from the " +#| "local keyring the archive keys which are no longer valid. The archive " +#| "keyring is shipped in the <literal>archive-keyring</literal> package of " +#| "your distribution, e.g. the <literal>debian-archive-keyring</literal> " +#| "package in Debian." msgid "" "Update the local keyring with the archive keyring and remove from the local " "keyring the archive keys which are no longer valid. The archive keyring is " "shipped in the <literal>archive-keyring</literal> package of your " -"distribution, e.g. the <literal>debian-archive-keyring</literal> package in " -"Debian." +"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in " +"Ubuntu." msgstr "" "Mettre à jour le trousseau de clés local avec le trousseau de clés de " "l'archive et y supprimer les clés qui ne sont plus valables. Le trousseau de " @@@ -2338,33 -2331,24 +2342,33 @@@ msgstr "Base de données locale de fiab #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:183 -msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" +#, fuzzy +#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" +msgid "<filename>/usr/share/keyrings/ubuntu-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:184 -msgid "Keyring of Debian archive trusted keys." +#, fuzzy +#| msgid "Keyring of Debian archive trusted keys." +msgid "Keyring of Ubuntu archive trusted keys." msgstr "Trousseau des clés fiables de l'archive Debian." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:187 +#, fuzzy +#| msgid "" +#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgid "" -"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" +"<filename>/usr/share/keyrings/ubuntu-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:188 -msgid "Keyring of Debian archive removed trusted keys." +#, fuzzy +#| msgid "Keyring of Debian archive removed trusted keys." +msgid "Keyring of Ubuntu archive removed trusted keys." msgstr "Trousseau des clés fiables supprimées de l'archive Debian." #. type: Content of: <refentry><refsect1><para> @@@ -3264,15 -3248,14 +3268,14 @@@ msgstr "DPkg::Pre-Install-Pkgs {\"/usr/ #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:101 msgid "" - "In general the sample configuration file in <filename>&docdir;examples/apt." - "conf</filename> &configureindex; is a good guide for how it should look." + "In general the sample configuration file &configureindex; is a good guide " + "for how it should look." msgstr "" - "Les modèles <filename>&docdir;examples/apt.conf</filename> et " - "&configureindex; montrent à quoi devrait ressembler le fichier de " - "configuration." + "Les modèles &configureindex; montrent à quoi devrait ressembler le fichier " + "de configuration." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:105 + #: apt.conf.5.xml:104 msgid "" "Case is not significant in names of configuration items, so in the previous " "example you could use <literal>dpkg::pre-install-pkgs</literal>." @@@ -3282,7 -3265,7 +3285,7 @@@ msgstr " "<literal>dpkg::pre-install-pkgs</literal>." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:108 + #: apt.conf.5.xml:107 msgid "" "Names for the configuration items are optional if a list is defined as can " "be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If " @@@ -3298,7 -3281,7 +3301,7 @@@ msgstr " "réaffectant une valeur." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:113 + #: apt.conf.5.xml:112 msgid "" "Two special commands are defined: <literal>#include</literal> (which is " "deprecated and not supported by alternative implementations) and " @@@ -3318,7 -3301,7 +3321,7 @@@ msgstr " "également se terminer avec un point-virgule." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:123 + #: apt.conf.5.xml:122 msgid "" "The <literal>#clear</literal> command is the only way to delete a list or a " "complete scope. Reopening a scope (or using the syntax described below with " @@@ -3334,7 -3317,7 +3337,7 @@@ msgstr " "peuvent être remplacés mais seulement effacés." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:131 + #: apt.conf.5.xml:130 msgid "" "All of the APT tools take an -o option which allows an arbitrary " "configuration directive to be specified on the command line. The syntax is a " @@@ -3353,7 -3336,7 +3356,7 @@@ msgstr " "champ d'action (« scope ») ne peut pas être indiquée à la ligne de commande." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:139 + #: apt.conf.5.xml:138 msgid "" "Note that appending items to a list using <literal>::</literal> only works " "for one item per line, and that you should not use it in combination with " @@@ -3385,12 -3368,12 +3388,12 @@@ msgstr " "explicitement." #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:154 + #: apt.conf.5.xml:153 msgid "The APT Group" msgstr "Le groupe APT" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:155 + #: apt.conf.5.xml:154 msgid "" "This group of options controls general APT behavior as well as holding the " "options for all of the tools." @@@ -3399,7 -3382,7 +3402,7 @@@ msgstr " "également des options communes à tous les outils." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:160 + #: apt.conf.5.xml:159 msgid "" "System Architecture; sets the architecture to use when fetching files and " "parsing package lists. The internal default is the architecture apt was " @@@ -3410,7 -3393,7 +3413,7 @@@ msgstr " "valeur interne par défaut est l'architecture pour laquelle APT a été compilé." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:167 + #: apt.conf.5.xml:166 msgid "" "All Architectures the system supports. For instance, CPUs implementing the " "<literal>amd64</literal> (also called <literal>x86-64</literal>) " @@@ -3432,7 -3415,7 +3435,7 @@@ msgstr " "sont enregistrées avec <command>dpkg --add-architecture</command>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:180 + #: apt.conf.5.xml:179 msgid "" "Default release to install packages from if more than one version is " "available. Contains release name, codename or release version. Examples: " @@@ -3446,7 -3429,7 +3449,7 @@@ msgstr " "&apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:186 + #: apt.conf.5.xml:185 msgid "" "Ignore held packages; this global option causes the problem resolver to " "ignore held packages in its decision making." @@@ -3456,7 -3439,7 +3459,7 @@@ msgstr " "décision." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:191 + #: apt.conf.5.xml:190 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 " @@@ -3470,7 -3453,7 +3473,7 @@@ msgstr " "direct pour les réinstaller." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:199 + #: apt.conf.5.xml:198 msgid "" "Defaults to on, which will cause APT to install essential and important " "packages as soon as possible in an install/upgrade operation, in order to " @@@ -3497,7 -3480,7 +3500,7 @@@ msgstr " "dépendances ne sont pas satisfaites." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:211 + #: apt.conf.5.xml:210 msgid "" "The immediate configuration marker is also applied in the potentially " "problematic case of circular dependencies, since a dependency with the " @@@ -3526,7 -3509,7 +3529,7 @@@ msgstr " "le seul qu'elle permet d'éviter." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:224 + #: apt.conf.5.xml:223 msgid "" "Before a big operation like <literal>dist-upgrade</literal> is run with this " "option disabled you should try to explicitly <literal>install</literal> the " @@@ -3544,7 -3527,7 +3547,7 @@@ msgstr " "corriger les processus de mise à jour." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:235 + #: apt.conf.5.xml:234 msgid "" "Never enable this option unless you <emphasis>really</emphasis> know what " "you are doing. It permits APT to temporarily remove an essential package to " @@@ -3566,7 -3549,7 +3569,7 @@@ msgstr " "tous les paquets dont ces paquets dépendent." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:247 + #: apt.conf.5.xml:246 msgid "" "APT uses since version 0.7.26 a resizable memory mapped cache file to store " "the available information. <literal>Cache-Start</literal> acts as a hint of " @@@ -3606,14 -3589,14 +3609,14 @@@ msgstr " "l'augmentation automatique de la taille du cache est désactivée." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:263 + #: apt.conf.5.xml:262 msgid "Defines which packages are considered essential build dependencies." msgstr "" "Cette option définit les paquets qui sont considérés comme faisant partie " "des dépendances essentielles pour la construction de paquets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:267 + #: apt.conf.5.xml:266 msgid "" "The Get subsection controls the &apt-get; tool; please see its documentation " "for more information about the options here." @@@ -3623,7 -3606,7 +3626,7 @@@ msgstr " "question." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:272 + #: apt.conf.5.xml:271 msgid "" "The Cache subsection controls the &apt-cache; tool; please see its " "documentation for more information about the options here." @@@ -3633,7 -3616,7 +3636,7 @@@ msgstr " "options en question." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:277 + #: apt.conf.5.xml:276 msgid "" "The CDROM subsection controls the &apt-cdrom; tool; please see its " "documentation for more information about the options here." @@@ -3643,12 -3626,12 +3646,12 @@@ msgstr " "options en question." #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:283 + #: apt.conf.5.xml:282 msgid "The Acquire Group" msgstr "Le groupe Acquire" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:284 + #: apt.conf.5.xml:283 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages as well as the various \"acquire methods\" responsible for the " @@@ -3659,7 -3642,7 +3662,7 @@@ msgstr " "effectuent ce téléchargement (voir aussi &sources-list;)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:291 + #: apt.conf.5.xml:290 msgid "" "Security related option defaulting to true, as giving a Release file's " "validation an expiration date prevents replay attacks over a long timescale, " @@@ -3680,7 -3663,7 +3683,7 @@@ msgstr " "alors utilisée." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:304 + #: apt.conf.5.xml:303 msgid "" "Maximum time (in seconds) after its creation (as indicated by the " "<literal>Date</literal> header) that the <filename>Release</filename> file " @@@ -3699,7 -3682,7 +3702,7 @@@ msgstr " "l'option." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:316 + #: apt.conf.5.xml:315 msgid "" "Minimum time (in seconds) after its creation (as indicated by the " "<literal>Date</literal> header) that the <filename>Release</filename> file " @@@ -3719,7 -3702,7 +3722,7 @@@ msgstr " "nom de l'option." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:328 + #: apt.conf.5.xml:327 msgid "" "Try to download deltas called <literal>PDiffs</literal> for indexes (like " "<filename>Packages</filename> files) instead of downloading whole ones. True " @@@ -3730,7 -3713,7 +3733,7 @@@ msgstr " "filename>), plutôt que de les télécharger entièrement. Par défaut à « true »." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:331 + #: apt.conf.5.xml:330 msgid "" "Two sub-options to limit the use of PDiffs are also available: " "<literal>FileLimit</literal> can be used to specify a maximum number of " @@@ -3749,7 -3732,7 +3752,7 @@@ msgstr " "fichiers de différences." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:341 + #: apt.conf.5.xml:340 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@@ -3765,7 -3748,7 +3768,7 @@@ msgstr " "initiée." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:349 + #: apt.conf.5.xml:348 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." @@@ -3775,7 -3758,7 +3778,7 @@@ msgstr " "échoué." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:354 + #: apt.conf.5.xml:353 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." @@@ -3785,7 -3768,7 +3788,7 @@@ msgstr " "archives de sources au lieu de les copier. Par défaut à « true »." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:359 + #: apt.conf.5.xml:358 msgid "" "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. " "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</" @@@ -3806,7 -3789,7 +3809,7 @@@ msgstr " "options de mandataire HTTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:367 + #: apt.conf.5.xml:366 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy not to use its cached " @@@ -3826,7 -3809,7 +3829,7 @@@ msgstr " "fichiers .deb très grands." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:377 apt.conf.5.xml:449 + #: apt.conf.5.xml:376 apt.conf.5.xml:448 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method; this value applies to the connection as well as the data timeout." @@@ -3836,7 -3819,7 +3839,7 @@@ msgstr " "connexion qu'aux données." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:380 + #: apt.conf.5.xml:379 msgid "" "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to " "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e." @@@ -3856,7 -3839,7 +3859,7 @@@ msgstr " "qui ne respectent pas la norme HTTP/1.1." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:387 + #: apt.conf.5.xml:386 msgid "" "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will " "follow redirects, which is enabled by default." @@@ -3865,7 -3848,7 +3868,7 @@@ msgstr " "suive les redirections. Ce réglage est activé par défaut." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:390 + #: apt.conf.5.xml:389 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobytes. The default value is 0 " @@@ -3880,7 -3863,7 +3883,7 @@@ msgstr " "implicitement le téléchargement simultané depuis plusieurs serveurs." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:395 + #: apt.conf.5.xml:394 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 " @@@ -3892,7 -3875,7 +3895,7 @@@ msgstr " "n'autorisent l'accès qu'aux client s'identifiant de manière spécifique.." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:403 + #: apt.conf.5.xml:402 msgid "" "The <literal>Cache-control</literal>, <literal>Timeout</literal>, " "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and " @@@ -3909,7 -3892,7 +3912,7 @@@ msgstr " "literal> n'est pas encore gérée." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:411 + #: apt.conf.5.xml:410 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is the " @@@ -3942,7 -3925,7 +3945,7 @@@ msgstr " "<literal>TLSv1</literal> ou <literal>SSLv3</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:432 + #: apt.conf.5.xml:431 msgid "" "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs. " "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</" @@@ -3978,7 -3961,7 +3981,7 @@@ msgstr " "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:452 + #: apt.conf.5.xml:451 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, " @@@ -3995,7 -3978,7 +3998,7 @@@ msgstr " "modèle de fichier de configuration)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:459 + #: apt.conf.5.xml:458 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to an HTTP URL - see the discussion of the http " @@@ -4010,7 -3993,7 +4013,7 @@@ msgstr " "efficacité de cette méthode." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:464 + #: apt.conf.5.xml:463 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@@ -4026,13 -4009,13 +4029,13 @@@ msgstr " "des serveurs FTP ne suivent pas la RFC 2428." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout> - #: apt.conf.5.xml:478 + #: apt.conf.5.xml:477 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "/cdrom/::Mount \"foo\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:473 + #: apt.conf.5.xml:472 msgid "" "For URIs using the <literal>cdrom</literal> method, the only configurable " "option is the mount point, <literal>cdrom::Mount</literal>, which must be " @@@ -4055,7 -4038,7 +4058,7 @@@ msgstr " "<literal>UMount</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:486 + #: apt.conf.5.xml:485 msgid "" "For GPGV URIs the only configurable option is <literal>gpgv::Options</" "literal>, which passes additional parameters to gpgv." @@@ -4064,13 -4047,13 +4067,13 @@@ msgstr " "permet de passer des paramètres à gpgv" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:497 + #: apt.conf.5.xml:496 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "Acquire::CompressionTypes::<replaceable>ExtensionFichier</replaceable> \"<replaceable>NomMethode</replaceable>\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:492 + #: apt.conf.5.xml:491 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@@ -4090,19 -4073,19 +4093,19 @@@ msgstr " "type=\"synopsis\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:502 + #: apt.conf.5.xml:501 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "Acquire::CompressionTypes::Order:: \"gz\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:505 + #: apt.conf.5.xml:504 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:498 + #: apt.conf.5.xml:497 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 " @@@ -4134,13 -4117,13 +4137,13 @@@ msgstr " "<literal>bz2</literal> à liste car il sera ajouté automatiquement." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout> - #: apt.conf.5.xml:512 + #: apt.conf.5.xml:511 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:507 + #: apt.conf.5.xml:506 msgid "" "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></" "literal> will be checked at run time. If this option has been set, the " @@@ -4167,7 -4150,7 +4170,7 @@@ msgstr " "question." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:517 + #: apt.conf.5.xml:516 msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " @@@ -4179,7 -4162,7 +4182,7 @@@ msgstr " "surtout destiné aux miroirs locaux." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:524 + #: apt.conf.5.xml:523 msgid "" "When downloading <literal>gzip</literal> compressed indexes (Packages, " "Sources, or Translations), keep them gzip compressed locally instead of " @@@ -4194,7 -4177,7 +4197,7 @@@ msgstr " "(« False »)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:532 + #: apt.conf.5.xml:531 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the description-" @@@ -4214,13 -4197,13 +4217,13 @@@ msgstr " "langues étant particulièrement rares." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting> - #: apt.conf.5.xml:549 + #: apt.conf.5.xml:548 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "Acquire::Languages { \"environment\"; \"fr\"; \"en\"; \"none\"; \"de\"; };" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:537 + #: apt.conf.5.xml:536 msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: it will be " @@@ -4260,7 -4243,7 +4263,7 @@@ msgstr " "alors « de, fr, en ». <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:550 + #: apt.conf.5.xml:549 msgid "" "Note: To prevent problems resulting from APT being executed in different " "environments (e.g. by different users or by other programs) all Translation " @@@ -4274,22 -4257,22 +4277,22 @@@ msgstr " "(après un « <literal>none</literal> » implicite)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:559 + #: apt.conf.5.xml:558 msgid "When downloading, force to use only the IPv4 protocol." msgstr "Utilisation imposée du protocole IPv4 lors des téléchargements." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:565 + #: apt.conf.5.xml:564 msgid "When downloading, force to use only the IPv6 protocol." msgstr "Utilisation imposée du protocole IPv6 lors des téléchargements." #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:572 + #: apt.conf.5.xml:571 msgid "Directories" msgstr "Les répertoires" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:574 + #: apt.conf.5.xml:573 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@@ -4309,7 -4292,7 +4312,7 @@@ msgstr " "<filename>./</filename>." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:581 + #: apt.conf.5.xml:580 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@@ -4332,7 -4315,7 +4335,7 @@@ msgstr " "Cache</literal>." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:590 + #: apt.conf.5.xml:589 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@@ -4347,7 -4330,7 +4350,7 @@@ msgstr " "fichier de configuration indiqué par la variable <envar>APT_CONFIG</envar>)." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:596 + #: apt.conf.5.xml:595 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 " @@@ -4358,7 -4341,7 +4361,7 @@@ msgstr " "configuration est chargé." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:600 + #: apt.conf.5.xml:599 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@@ -4376,7 -4359,7 +4379,7 @@@ msgstr " "programmes correspondants." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:608 + #: apt.conf.5.xml:607 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@@ -4398,7 -4381,7 +4401,7 @@@ msgstr " "staging/var/lib/dpkg/status</filename>." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:621 + #: apt.conf.5.xml:620 msgid "" "The <literal>Ignore-Files-Silently</literal> list can be used to specify " "which files APT should silently ignore while parsing the files in the " @@@ -4416,12 -4399,12 +4419,12 @@@ msgstr " "est possible d'utiliser la syntaxe des expressions rationnelles." #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:630 + #: apt.conf.5.xml:629 msgid "APT in DSelect" msgstr "APT et DSelect" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:632 + #: apt.conf.5.xml:631 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behavior. These are in the <literal>DSelect</literal> " @@@ -4432,7 -4415,7 +4435,7 @@@ msgstr " "<literal>DSelect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:637 + #: apt.conf.5.xml:636 msgid "" "Cache Clean mode; this value may be one of <literal>always</literal>, " "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</" @@@ -4455,7 -4438,7 +4458,7 @@@ msgstr " "avant de récupérer de nouveaux paquets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:651 + #: apt.conf.5.xml:650 msgid "" "The contents of this variable are passed to &apt-get; as command line " "options when it is run for the install phase." @@@ -4464,7 -4447,7 +4467,7 @@@ msgstr " "&apt-get; lors de la phase d'installation." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:656 + #: apt.conf.5.xml:655 msgid "" "The contents of this variable are passed to &apt-get; as command line " "options when it is run for the update phase." @@@ -4473,7 -4456,7 +4476,7 @@@ msgstr " "&apt-get; lors de la phase de mise à jour." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:661 + #: apt.conf.5.xml:660 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." @@@ -4483,12 -4466,12 +4486,12 @@@ msgstr " "d'erreur que l'on propose à l'utilisateur d'intervenir." #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:667 + #: apt.conf.5.xml:666 msgid "How APT calls &dpkg;" msgstr "Méthode d'appel de &dpkg; par APT" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:668 + #: apt.conf.5.xml:667 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." @@@ -4497,7 -4480,7 +4500,7 @@@ msgstr " "&dpkg; : elles figurent dans la section <literal>DPkg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:673 + #: apt.conf.5.xml:672 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 " @@@ -4508,7 -4491,7 +4511,7 @@@ msgstr " "est passé comme un seul paramètre à &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:679 + #: apt.conf.5.xml:678 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 " @@@ -4521,7 -4504,7 +4524,7 @@@ msgstr " "<filename>/bin/sh</filename> : APT s'arrête dès que l'une d'elles échoue." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:686 + #: apt.conf.5.xml:685 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 " @@@ -4537,7 -4520,7 +4540,7 @@@ msgstr " "qu'il va installer, à raison d'un par ligne." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:692 + #: apt.conf.5.xml:691 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@@ -4553,7 -4536,7 +4556,7 @@@ msgstr " "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:700 + #: apt.conf.5.xml:699 msgid "" "APT chdirs to this directory before invoking &dpkg;, the default is " "<filename>/</filename>." @@@ -4562,7 -4545,7 +4565,7 @@@ msgstr " "le répertoire <filename>/</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:705 + #: apt.conf.5.xml:704 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages; the " "default is to disable signing and produce all binaries." @@@ -4572,14 -4555,14 +4575,14 @@@ msgstr " "créés." #. type: Content of: <refentry><refsect1><refsect2><title> - #: apt.conf.5.xml:710 + #: apt.conf.5.xml:709 msgid "dpkg trigger usage (and related options)" msgstr "" "utilisation des actions différées (« triggers ») de dpkg (et options " "associées)" #. type: Content of: <refentry><refsect1><refsect2><para> - #: apt.conf.5.xml:711 + #: apt.conf.5.xml:710 msgid "" "APT can call &dpkg; in such a way as to let it make aggressive use of " "triggers over multiple calls of &dpkg;. Without further options &dpkg; will " @@@ -4606,7 -4589,7 +4609,7 @@@ msgstr " "pendant la configuration des paquets." #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> - #: apt.conf.5.xml:726 + #: apt.conf.5.xml:725 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@@ -4620,7 -4603,7 +4623,7 @@@ msgstr " "DPkg::TriggersPending \"true\";" #. type: Content of: <refentry><refsect1><refsect2><para> - #: apt.conf.5.xml:720 + #: apt.conf.5.xml:719 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 " @@@ -4644,7 -4627,7 +4647,7 @@@ msgstr " "<placeholder type=\"literallayout\" id=\"0\"/>." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:733 + #: apt.conf.5.xml:732 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 " @@@ -4667,7 -4650,7 +4670,7 @@@ msgstr " "options « unpack » et « remove »." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:741 + #: apt.conf.5.xml:740 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". The default value is \"<literal>all</literal>" @@@ -4697,7 -4680,7 +4700,7 @@@ msgstr " "configuré et donc éventuellement non amorçable." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:756 + #: apt.conf.5.xml:755 msgid "" "If this option is set APT will call <command>dpkg --configure --pending</" "command> to let &dpkg; handle all required configurations and triggers. This " @@@ -4716,7 -4699,7 +4719,7 @@@ msgstr " "peut conserver l'option active." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:763 + #: apt.conf.5.xml:762 msgid "" "Useful for the <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal>, and " @@@ -4734,7 -4717,7 +4737,7 @@@ msgstr " "celles concernant le paquet en cours de traitement." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> - #: apt.conf.5.xml:776 + #: apt.conf.5.xml:775 #, no-wrap msgid "" "OrderList::Score {\n" @@@ -4752,7 -4735,7 +4755,7 @@@ msgstr " "};" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:769 + #: apt.conf.5.xml:768 msgid "" "Essential packages (and their dependencies) should be configured immediately " "after unpacking. It is a good idea to do this quite early in the upgrade " @@@ -4778,12 -4761,12 +4781,12 @@@ msgstr " "id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:789 + #: apt.conf.5.xml:788 msgid "Periodic and Archives options" msgstr "Options « Periodic » et « Archive »" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:790 + #: apt.conf.5.xml:789 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by the " @@@ -4795,12 -4778,12 +4798,12 @@@ msgstr " "script <literal>/etc/cron.daily/apt</literal>, lancé quotidiennement." #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:798 + #: apt.conf.5.xml:797 msgid "Debug options" msgstr "Les options de débogage" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:800 + #: apt.conf.5.xml:799 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@@ -4818,7 -4801,7 +4821,7 @@@ msgstr " "peuvent tout de même être utiles :" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> - #: apt.conf.5.xml:811 + #: apt.conf.5.xml:810 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@@ -4829,7 -4812,7 +4832,7 @@@ msgstr " "upgrade, upgrade, install, remove et purge</literal>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> - #: apt.conf.5.xml:819 + #: apt.conf.5.xml:818 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@@ -4841,7 -4824,7 +4844,7 @@@ msgstr " "superutilisateur." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> - #: apt.conf.5.xml:828 + #: apt.conf.5.xml:827 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@@ -4853,7 -4836,7 +4856,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:836 + #: apt.conf.5.xml:835 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CD-ROM IDs." @@@ -4862,12 -4845,12 +4865,12 @@@ msgstr " "type statfs dans les identifiants de CD." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:846 + #: apt.conf.5.xml:845 msgid "A full list of debugging options to apt follows." msgstr "Liste complète des options de débogage de APT :" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:855 + #: apt.conf.5.xml:854 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" @@@ -4875,24 -4858,24 +4878,24 @@@ "literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:866 + #: apt.conf.5.xml:865 msgid "Print information related to downloading packages using FTP." msgstr "" "Affiche les informations concernant le téléchargement de paquets par FTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:877 + #: apt.conf.5.xml:876 msgid "Print information related to downloading packages using HTTP." msgstr "" "Affiche les informations concernant le téléchargement de paquets par HTTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:888 + #: apt.conf.5.xml:887 msgid "Print information related to downloading packages using HTTPS." msgstr "Print information related to downloading packages using HTTPS." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:899 + #: apt.conf.5.xml:898 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@@ -4901,7 -4884,7 +4904,7 @@@ msgstr " "cryptographiques avec <literal>gpg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:910 + #: apt.conf.5.xml:909 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." @@@ -4910,14 -4893,14 +4913,14 @@@ msgstr " "stockées sur CD." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:920 + #: apt.conf.5.xml:919 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" "Décrit le processus de résolution des dépendances pour la construction de " "paquets source ( « build-dependencies » ) par &apt-get;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:930 + #: apt.conf.5.xml:929 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." @@@ -4926,7 -4909,7 +4929,7 @@@ msgstr " "librairies d'<literal>apt</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:940 + #: apt.conf.5.xml:939 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 " @@@ -4937,7 -4920,7 +4940,7 @@@ msgstr " "utilisés sur le système de fichier du CD." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:951 + #: apt.conf.5.xml:950 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." @@@ -4947,14 -4930,14 +4950,14 @@@ msgstr " "temps." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:963 + #: apt.conf.5.xml:962 msgid "Log when items are added to or removed from the global download queue." msgstr "" "Trace les ajouts et suppressions d'éléments de la queue globale de " "téléchargement." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:973 + #: apt.conf.5.xml:972 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." @@@ -4964,7 -4947,7 +4967,7 @@@ msgstr " "éventuelles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:983 + #: apt.conf.5.xml:982 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." @@@ -4974,7 -4957,7 +4977,7 @@@ msgstr " "éventuelles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:995 + #: apt.conf.5.xml:994 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." @@@ -4984,7 -4967,7 +4987,7 @@@ msgstr " "place des fichiers complets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1006 + #: apt.conf.5.xml:1005 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" @@@ -4992,7 -4975,7 +4995,7 @@@ "effectivement des téléchargements." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1017 + #: apt.conf.5.xml:1016 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." @@@ -5001,7 -4984,7 +5004,7 @@@ msgstr " "automatiquement, et la suppression des paquets inutiles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1027 + #: apt.conf.5.xml:1026 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@@ -5016,7 -4999,7 +5019,7 @@@ msgstr " "de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1041 + #: apt.conf.5.xml:1040 msgid "" "Generate debug messages describing which packages are marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@@ -5052,7 -5035,7 +5055,7 @@@ msgstr " "de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1062 + #: apt.conf.5.xml:1061 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." @@@ -5061,7 -5044,7 +5064,7 @@@ msgstr " "paramètres sont séparés par des espaces." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1073 + #: apt.conf.5.xml:1072 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." @@@ -5071,7 -5054,7 +5074,7 @@@ msgstr " "fichier." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1084 + #: apt.conf.5.xml:1083 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." @@@ -5080,18 -5063,18 +5083,18 @@@ msgstr " "<literal>apt</literal> passe les paquets à &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1096 + #: apt.conf.5.xml:1095 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "Affiche le détail des opérations liées à l'invocation de &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1107 + #: apt.conf.5.xml:1106 msgid "Output the priority of each package list on startup." msgstr "Affiche, au lancement, la priorité de chaque liste de paquets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1117 + #: apt.conf.5.xml:1116 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." @@@ -5100,7 -5083,7 +5103,7 @@@ msgstr " "concerne que les cas où un problème de dépendances complexe se présente)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1128 + #: apt.conf.5.xml:1127 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 " @@@ -5111,7 -5094,7 +5114,7 @@@ msgstr " "est décrite dans <literal>Debug::pkgDepCache::Marker</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1140 + #: apt.conf.5.xml:1139 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@@ -5120,13 -5103,13 +5123,13 @@@ msgstr " "list</filename>." #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:1162 apt_preferences.5.xml:545 sources.list.5.xml:211 + #: apt.conf.5.xml:1161 apt_preferences.5.xml:545 sources.list.5.xml:211 #: apt-ftparchive.1.xml:596 msgid "Examples" msgstr "Exemples" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:1163 + #: apt.conf.5.xml:1162 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@@ -5136,7 -5119,7 +5139,7 @@@ msgstr " #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:1175 + #: apt.conf.5.xml:1174 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." @@@ -6629,13 -6612,13 +6632,13 @@@ msgstr " #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:92 msgid "" - "<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)" - "</literal> which expands to the Debian architecture (such as <literal>amd64</" - "literal> or <literal>armel</literal>) 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." + "<literal>distribution</literal> may also contain a variable, <literal>" + "$(ARCH)</literal> which expands to the Debian architecture (such as " + "<literal>amd64</literal> or <literal>armel</literal>) 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> peut aussi contenir une variable <literal>" "$(ARCH)</literal>, qui sera remplacée par l'architecture Debian (comme " @@@ -8139,9 -8122,9 +8142,9 @@@ msgstr "DESCRIPTION #: 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<aptitude>" - "(8) for the command line or B<synaptic>(8) for the X Window System. Some " - "options are only implemented in B<apt-get>(8) though." + "package management there are several frontends available, such as " + "B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window " + "System. Some options are only implemented in B<apt-get>(8) though." msgstr "" "APT est un système de gestion de paquets logiciels. Pour la gestion au " "quotidien des paquets, il existe plusieurs frontaux comme B<aptitude>(9) en " @@@ -8755,11 -8738,11 +8758,11 @@@ msgid " "[R]emove commands have no meaning, the [I]nstall command performs both of " "them together." msgstr "" - "Une fois cela effectué, vous pouvez poursuivre et utiliser l'option « [S]" - "électionner » pour choisir les paquets à installer puis « [I]nstaller » pour " - "les installer. Lorsque la méthode APT est utilisée, les options « [C]" - "onfigurer » et « [R]etirer » ne sont pas utilisées, car « [I]nstaller » fait " - "l'ensemble des opérations." + "Une fois cela effectué, vous pouvez poursuivre et utiliser l'option " + "« [S]électionner » pour choisir les paquets à installer puis « [I]nstaller » " + "pour les installer. Lorsque la méthode APT est utilisée, les options " + "« [C]onfigurer » et « [R]etirer » ne sont pas utilisées, car « [I]nstaller » " + "fait l'ensemble des opérations." #. type: <p></p> #: guide.sgml:258 diff --combined doc/po/it.po index 59a54917e,df144e2b7..f6754c1fb --- a/doc/po/it.po +++ b/doc/po/it.po @@@ -11,7 -11,7 +11,11 @@@ msgid " msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" ++<<<<<<< HEAD +"POT-Creation-Date: 2013-04-30 10:29+0300\n" ++======= + "POT-Creation-Date: 2013-06-13 13:46+0300\n" ++>>>>>>> upstream/debian/sid "PO-Revision-Date: 2012-12-23 18:04+0200\n" "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n" "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n" @@@ -812,9 -812,9 +816,9 @@@ msgid " "installation or upgrading. Each package is a package name, not a fully " "qualified filename (for instance, in a Debian system, <package>apt-utils</" "package> would be the argument provided, not <filename>apt-utils_&apt-" - "product-version;_amd64.deb</filename>). 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 " + "product-version;_amd64.deb</filename>). 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 " @@@ -1582,14 -1582,14 +1586,14 @@@ msgstr " #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125 - #: apt.conf.5.xml:1168 apt_preferences.5.xml:698 + #: apt.conf.5.xml:1167 apt_preferences.5.xml:698 msgid "Files" msgstr "File" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 #: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109 - #: apt.conf.5.xml:1174 apt_preferences.5.xml:705 sources.list.5.xml:252 + #: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 #: apt-ftparchive.1.xml:607 msgid "See Also" @@@ -2296,19 -2296,12 +2300,19 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:130 +#, fuzzy +#| msgid "" +#| "Update the local keyring with the archive keyring and remove from the " +#| "local keyring the archive keys which are no longer valid. The archive " +#| "keyring is shipped in the <literal>archive-keyring</literal> package of " +#| "your distribution, e.g. the <literal>debian-archive-keyring</literal> " +#| "package in Debian." msgid "" "Update the local keyring with the archive keyring and remove from the local " "keyring the archive keys which are no longer valid. The archive keyring is " "shipped in the <literal>archive-keyring</literal> package of your " -"distribution, e.g. the <literal>debian-archive-keyring</literal> package in " -"Debian." +"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in " +"Ubuntu." msgstr "" "Aggiorna il portachiavi locale con il portachiavi dell'archivio e rimuove " "dal portachiavi locale le chiavi di archivio che non sono più valide. Il " @@@ -2377,33 -2370,24 +2381,33 @@@ msgstr "Database locale di fiducia dell #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:183 -msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" +#, fuzzy +#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" +msgid "<filename>/usr/share/keyrings/ubuntu-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:184 -msgid "Keyring of Debian archive trusted keys." +#, fuzzy +#| msgid "Keyring of Debian archive trusted keys." +msgid "Keyring of Ubuntu archive trusted keys." msgstr "Portachiavi delle chiavi fidate degli archivi Debian." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:187 +#, fuzzy +#| msgid "" +#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgid "" -"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" +"<filename>/usr/share/keyrings/ubuntu-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:188 -msgid "Keyring of Debian archive removed trusted keys." +#, fuzzy +#| msgid "Keyring of Debian archive removed trusted keys." +msgid "Keyring of Ubuntu archive removed trusted keys." msgstr "Portachiavi delle chiavi fidate rimosse degli archivi Debian." #. type: Content of: <refentry><refsect1><para> @@@ -3299,19 -3283,17 +3303,17 @@@ msgstr " msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" - # apt.conf è un file e &configureindex è un altro: configure-index.gz #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:101 msgid "" - "In general the sample configuration file in <filename>&docdir;examples/apt." - "conf</filename> &configureindex; is a good guide for how it should look." + "In general the sample configuration file &configureindex; is a good guide " + "for how it should look." msgstr "" - "In generale i file di configurazione d'esempio in <filename>&docdir;examples/" - "apt.conf</filename> e &configureindex; sono una buona guida su come debba " - "essere un file di configurazione." + "In generale i file di configurazione d'esempio &configureindex; sono una " + "buona guida su come debba essere un file di configurazione." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:105 + #: apt.conf.5.xml:104 msgid "" "Case is not significant in names of configuration items, so in the previous " "example you could use <literal>dpkg::pre-install-pkgs</literal>." @@@ -3321,7 -3303,7 +3323,7 @@@ msgstr " "<literal>dpkg::pre-install-pkgs</literal>." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:108 + #: apt.conf.5.xml:107 msgid "" "Names for the configuration items are optional if a list is defined as can " "be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If " @@@ -3336,7 -3318,7 +3338,7 @@@ msgstr " "sovrascrivere l'opzione come per ogni altra, assegnandole un nuovo valore." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:113 + #: apt.conf.5.xml:112 msgid "" "Two special commands are defined: <literal>#include</literal> (which is " "deprecated and not supported by alternative implementations) and " @@@ -3356,7 -3338,7 +3358,7 @@@ msgstr " "queste righe devono terminare con un punto e virgola.)" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:123 + #: apt.conf.5.xml:122 msgid "" "The <literal>#clear</literal> command is the only way to delete a list or a " "complete scope. Reopening a scope (or using the syntax described below with " @@@ -3372,7 -3354,7 +3374,7 @@@ msgstr " "ambiti non possono essere sovrascritti, solo cancellati." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:131 + #: apt.conf.5.xml:130 msgid "" "All of the APT tools take an -o option which allows an arbitrary " "configuration directive to be specified on the command line. The syntax is a " @@@ -3392,7 -3374,7 +3394,7 @@@ msgstr " "di comando.)" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:139 + #: apt.conf.5.xml:138 msgid "" "Note that appending items to a list using <literal>::</literal> only works " "for one item per line, and that you should not use it in combination with " @@@ -3422,12 -3404,12 +3424,12 @@@ msgstr " "ora, quando APT ancora non si lamenta esplicitamente." #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:154 + #: apt.conf.5.xml:153 msgid "The APT Group" msgstr "Il gruppo APT" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:155 + #: apt.conf.5.xml:154 msgid "" "This group of options controls general APT behavior as well as holding the " "options for all of the tools." @@@ -3436,7 -3418,7 +3438,7 @@@ msgstr " "contenere le opzioni per tutti gli strumenti." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:160 + #: apt.conf.5.xml:159 msgid "" "System Architecture; sets the architecture to use when fetching files and " "parsing package lists. The internal default is the architecture apt was " @@@ -3447,7 -3429,7 +3449,7 @@@ msgstr " "predefinito interno è l'architettura per la quale apt è stato compilato." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:167 + #: apt.conf.5.xml:166 msgid "" "All Architectures the system supports. For instance, CPUs implementing the " "<literal>amd64</literal> (also called <literal>x86-64</literal>) " @@@ -3469,7 -3451,7 +3471,7 @@@ msgstr " "quando sono registrate con <command>dpkg --add-architecture</command>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:180 + #: apt.conf.5.xml:179 msgid "" "Default release to install packages from if more than one version is " "available. Contains release name, codename or release version. Examples: " @@@ -3483,7 -3465,7 +3485,7 @@@ msgstr " "preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:186 + #: apt.conf.5.xml:185 msgid "" "Ignore held packages; this global option causes the problem resolver to " "ignore held packages in its decision making." @@@ -3492,7 -3474,7 +3494,7 @@@ msgstr " "di problemi ignori i pacchetti bloccati nel suo processo decisionale." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:191 + #: apt.conf.5.xml:190 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 " @@@ -3506,7 -3488,7 +3508,7 @@@ msgstr " "reinstallarli." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:199 + #: apt.conf.5.xml:198 msgid "" "Defaults to on, which will cause APT to install essential and important " "packages as soon as possible in an install/upgrade operation, in order to " @@@ -3533,7 -3515,7 +3535,7 @@@ msgstr " "che dipende da A, dato che la dipendenza da A non è più soddisfatta." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:211 + #: apt.conf.5.xml:210 msgid "" "The immediate configuration marker is also applied in the potentially " "problematic case of circular dependencies, since a dependency with the " @@@ -3563,7 -3545,7 +3565,7 @@@ msgstr " "l'unico problema che può aiutare a prevenire." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:224 + #: apt.conf.5.xml:223 msgid "" "Before a big operation like <literal>dist-upgrade</literal> is run with this " "option disabled you should try to explicitly <literal>install</literal> the " @@@ -3581,7 -3563,7 +3583,7 @@@ msgstr " "il processo di aggiornamento." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:235 + #: apt.conf.5.xml:234 msgid "" "Never enable this option unless you <emphasis>really</emphasis> know what " "you are doing. It permits APT to temporarily remove an essential package to " @@@ -3602,7 -3584,7 +3604,7 @@@ msgstr " "<command>dash</command> o qualsiasi altro da cui dipendono tali pacchetti." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:247 + #: apt.conf.5.xml:246 msgid "" "APT uses since version 0.7.26 a resizable memory mapped cache file to store " "the available information. <literal>Cache-Start</literal> acts as a hint of " @@@ -3640,14 -3622,14 +3642,14 @@@ msgstr " "della cache è disabilitata." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:263 + #: apt.conf.5.xml:262 msgid "Defines which packages are considered essential build dependencies." msgstr "" "Definisce quali pacchetti sono considerati dipendenze di compilazione " "essenziali." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:267 + #: apt.conf.5.xml:266 msgid "" "The Get subsection controls the &apt-get; tool; please see its documentation " "for more information about the options here." @@@ -3656,7 -3638,7 +3658,7 @@@ msgstr " "documentazione per maggiori informazioni su queste opzioni." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:272 + #: apt.conf.5.xml:271 msgid "" "The Cache subsection controls the &apt-cache; tool; please see its " "documentation for more information about the options here." @@@ -3665,7 -3647,7 +3667,7 @@@ msgstr " "documentazione per maggiori informazioni su queste opzioni." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:277 + #: apt.conf.5.xml:276 msgid "" "The CDROM subsection controls the &apt-cdrom; tool; please see its " "documentation for more information about the options here." @@@ -3674,12 -3656,12 +3676,12 @@@ msgstr " "documentazione per maggiori informazioni su queste opzioni." #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:283 + #: apt.conf.5.xml:282 msgid "The Acquire Group" msgstr "Il gruppo Acquire" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:284 + #: apt.conf.5.xml:283 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages as well as the various \"acquire methods\" responsible for the " @@@ -3690,7 -3672,7 +3692,7 @@@ msgstr " "scaricamento stesso (vedere anche &sources-list;)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:291 + #: apt.conf.5.xml:290 msgid "" "Security related option defaulting to true, as giving a Release file's " "validation an expiration date prevents replay attacks over a long timescale, " @@@ -3712,7 -3694,7 +3714,7 @@@ msgstr " "ValidTime</literal> seguente." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:304 + #: apt.conf.5.xml:303 msgid "" "Maximum time (in seconds) after its creation (as indicated by the " "<literal>Date</literal> header) that the <filename>Release</filename> file " @@@ -3732,7 -3714,7 +3734,7 @@@ msgstr " "dell'archivio in fondo al nome dell'opzione." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:316 + #: apt.conf.5.xml:315 msgid "" "Minimum time (in seconds) after its creation (as indicated by the " "<literal>Date</literal> header) that the <filename>Release</filename> file " @@@ -3752,7 -3734,7 +3754,7 @@@ msgstr " "archivio aggiungendo l'etichetta dell'archivio in fondo al nome dell'opzione." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:328 + #: apt.conf.5.xml:327 msgid "" "Try to download deltas called <literal>PDiffs</literal> for indexes (like " "<filename>Packages</filename> files) instead of downloading whole ones. True " @@@ -3763,7 -3745,7 +3765,7 @@@ msgstr " "interamente i nuovi. Attiva in modo predefinito." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:331 + #: apt.conf.5.xml:330 msgid "" "Two sub-options to limit the use of PDiffs are also available: " "<literal>FileLimit</literal> can be used to specify a maximum number of " @@@ -3781,7 -3763,7 +3783,7 @@@ msgstr " "completo invece delle patch." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:341 + #: apt.conf.5.xml:340 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@@ -3796,7 -3778,7 +3798,7 @@@ msgstr " "literal> significa che viene aperta una connessione per ogni tipo di URI." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:349 + #: apt.conf.5.xml:348 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." @@@ -3806,7 -3788,7 +3808,7 @@@ msgstr " "ha avuto successo." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:354 + #: apt.conf.5.xml:353 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." @@@ -3817,7 -3799,7 +3819,7 @@@ msgstr " "vero." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:359 + #: apt.conf.5.xml:358 msgid "" "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. " "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</" @@@ -3836,7 -3818,7 +3838,7 @@@ msgstr " "la variabile d'ambiente <envar>http_proxy</envar>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:367 + #: apt.conf.5.xml:366 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy not to use its cached " @@@ -3856,7 -3838,7 +3858,7 @@@ msgstr " "file .deb." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:377 apt.conf.5.xml:449 + #: apt.conf.5.xml:376 apt.conf.5.xml:448 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method; this value applies to the connection as well as the data timeout." @@@ -3866,7 -3848,7 +3868,7 @@@ msgstr " "quello per i dati." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:380 + #: apt.conf.5.xml:379 msgid "" "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to " "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e." @@@ -3886,7 -3868,7 +3888,7 @@@ msgstr " "con la specifica HTTP/1.1." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:387 + #: apt.conf.5.xml:386 msgid "" "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will " "follow redirects, which is enabled by default." @@@ -3895,7 -3877,7 +3897,7 @@@ msgstr " "meno le ridirezioni che sono abilitate in modo predefinito." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:390 + #: apt.conf.5.xml:389 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobytes. The default value is 0 " @@@ -3910,7 -3892,7 +3912,7 @@@ msgstr " "scaricamento da più server contemporaneamente)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:395 + #: apt.conf.5.xml:394 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 " @@@ -3922,7 -3904,7 +3924,7 @@@ msgstr " "conosciuto." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:403 + #: apt.conf.5.xml:402 msgid "" "The <literal>Cache-control</literal>, <literal>Timeout</literal>, " "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and " @@@ -3939,7 -3921,7 +3941,7 @@@ msgstr " "<literal>Pipeline-Depth</literal> non è ancora supportata." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:411 + #: apt.conf.5.xml:410 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is the " @@@ -3980,7 -3962,7 +3982,7 @@@ msgstr " "literal> è la corrispondente opzione specifica per ciascun host." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:432 + #: apt.conf.5.xml:431 msgid "" "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs. " "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</" @@@ -4014,7 -3996,7 +4016,7 @@@ msgstr " "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:452 + #: apt.conf.5.xml:451 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, " @@@ -4030,7 -4012,7 +4032,7 @@@ msgstr " "uno specifico host (vedere il file di configurazione d'esempio)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:459 + #: apt.conf.5.xml:458 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to an HTTP URL - see the discussion of the http " @@@ -4044,7 -4026,7 +4046,7 @@@ msgstr " "a causa della sua bassa efficienza." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:464 + #: apt.conf.5.xml:463 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@@ -4060,13 -4042,13 +4062,13 @@@ msgstr " "parte dei server FTP non supporta la RFC 2428." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout> - #: apt.conf.5.xml:478 + #: apt.conf.5.xml:477 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "/cdrom/::Mount \"pippo\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:473 + #: apt.conf.5.xml:472 msgid "" "For URIs using the <literal>cdrom</literal> method, the only configurable " "option is the mount point, <literal>cdrom::Mount</literal>, which must be " @@@ -4088,7 -4070,7 +4090,7 @@@ msgstr " "comandi per lo smontaggio possono essere specificati usando UMount." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:486 + #: apt.conf.5.xml:485 msgid "" "For GPGV URIs the only configurable option is <literal>gpgv::Options</" "literal>, which passes additional parameters to gpgv." @@@ -4097,13 -4079,13 +4099,13 @@@ msgstr " "literal>, che passa parametri aggiuntivi a gpgv." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:497 + #: apt.conf.5.xml:496 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "Acquire::CompressionTypes::<replaceable>EstensioneFile</replaceable> \"<replaceable>NomeMetodo</replaceable>\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:492 + #: apt.conf.5.xml:491 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@@ -4122,19 -4104,19 +4124,19 @@@ msgstr " "metodo usato. La sintassi è: <placeholder type=\"synopsis\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:502 + #: apt.conf.5.xml:501 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "Acquire::CompressionTypes::Order:: \"gz\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:505 + #: apt.conf.5.xml:504 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:498 + #: apt.conf.5.xml:497 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 " @@@ -4165,13 -4147,13 +4167,13 @@@ msgstr " "all'elenco, dato che verrà aggiunto automaticamente." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout> - #: apt.conf.5.xml:512 + #: apt.conf.5.xml:511 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:507 + #: apt.conf.5.xml:506 msgid "" "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></" "literal> will be checked at run time. If this option has been set, the " @@@ -4197,7 -4179,7 +4199,7 @@@ msgstr " "definito; aggiunge solamente il tipo indicato all'inizio dell'elenco." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:517 + #: apt.conf.5.xml:516 msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " @@@ -4209,7 -4191,7 +4211,7 @@@ msgstr " "soprattutto per i mirror locali." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:524 + #: apt.conf.5.xml:523 msgid "" "When downloading <literal>gzip</literal> compressed indexes (Packages, " "Sources, or Translations), keep them gzip compressed locally instead of " @@@ -4223,7 -4205,7 +4225,7 @@@ msgstr " "modo predefinito è disabilitato." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:532 + #: apt.conf.5.xml:531 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the description-" @@@ -4242,13 -4224,13 +4244,13 @@@ msgstr " "codici di lingua lunghi sono particolarmente rari." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting> - #: apt.conf.5.xml:549 + #: apt.conf.5.xml:548 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "Acquire::Languages { \"environment\"; \"it\"; \"en\"; \"none\"; \"fr\"; };" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:537 + #: apt.conf.5.xml:536 msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: it will be " @@@ -4287,7 -4269,7 +4289,7 @@@ msgstr " "<placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:550 + #: apt.conf.5.xml:549 msgid "" "Note: To prevent problems resulting from APT being executed in different " "environments (e.g. by different users or by other programs) all Translation " @@@ -4301,22 -4283,22 +4303,22 @@@ msgstr " "implicito)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:559 + #: apt.conf.5.xml:558 msgid "When downloading, force to use only the IPv4 protocol." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:565 + #: apt.conf.5.xml:564 msgid "When downloading, force to use only the IPv6 protocol." msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:572 + #: apt.conf.5.xml:571 msgid "Directories" msgstr "Directory" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:574 + #: apt.conf.5.xml:573 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@@ -4336,7 -4318,7 +4338,7 @@@ msgstr " "<filename>/</filename> o <filename>./</filename>." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:581 + #: apt.conf.5.xml:580 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@@ -4358,7 -4340,7 +4360,7 @@@ msgstr " "la directory predefinita è contenuta in <literal>Dir::Cache</literal>" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:590 + #: apt.conf.5.xml:589 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@@ -4373,7 -4355,7 +4375,7 @@@ msgstr " "configurazione specificato da <envar>APT_CONFIG</envar>)." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:596 + #: apt.conf.5.xml:595 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 " @@@ -4384,7 -4366,7 +4386,7 @@@ msgstr " "termine viene caricato il file di configurazione principale." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:600 + #: apt.conf.5.xml:599 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@@ -4401,7 -4383,7 +4403,7 @@@ msgstr " "specificano la posizione dei rispettivi programmi." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:608 + #: apt.conf.5.xml:607 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@@ -4422,7 -4404,7 +4424,7 @@@ msgstr " "staging/var/lib/dpkg/status</filename>." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:621 + #: apt.conf.5.xml:620 msgid "" "The <literal>Ignore-Files-Silently</literal> list can be used to specify " "which files APT should silently ignore while parsing the files in the " @@@ -4440,12 -4422,12 +4442,12 @@@ msgstr " "questi modelli possono usare una sintassi con espressioni regolari." #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:630 + #: apt.conf.5.xml:629 msgid "APT in DSelect" msgstr "APT in DSelect" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:632 + #: apt.conf.5.xml:631 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behavior. These are in the <literal>DSelect</literal> " @@@ -4456,7 -4438,7 +4458,7 @@@ msgstr " "sezione <literal>DSelect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:637 + #: apt.conf.5.xml:636 msgid "" "Cache Clean mode; this value may be one of <literal>always</literal>, " "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</" @@@ -4478,7 -4460,7 +4480,7 @@@ msgstr " "scaricare i nuovi pacchetti." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:651 + #: apt.conf.5.xml:650 msgid "" "The contents of this variable are passed to &apt-get; as command line " "options when it is run for the install phase." @@@ -4488,7 -4470,7 +4490,7 @@@ msgstr " "installazione." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:656 + #: apt.conf.5.xml:655 msgid "" "The contents of this variable are passed to &apt-get; as command line " "options when it is run for the update phase." @@@ -4498,7 -4480,7 +4500,7 @@@ msgstr " "aggiornamento." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:661 + #: apt.conf.5.xml:660 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." @@@ -4508,12 -4490,12 +4510,12 @@@ msgstr " "solo in caso di errore." #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:667 + #: apt.conf.5.xml:666 msgid "How APT calls &dpkg;" msgstr "Come APT invoca &dpkg;" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:668 + #: apt.conf.5.xml:667 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." @@@ -4522,7 -4504,7 +4524,7 @@@ msgstr " "&dpkg;; sono nella sezione <literal>DPkg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:673 + #: apt.conf.5.xml:672 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 " @@@ -4533,7 -4515,7 +4535,7 @@@ msgstr " "passata a &dpkg; come un singolo argomento." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:679 + #: apt.conf.5.xml:678 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 " @@@ -4546,7 -4528,7 +4548,7 @@@ msgstr " "bin/sh</filename>; se qualcuno dei comandi fallisce APT terminerà annullando." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:686 + #: apt.conf.5.xml:685 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 " @@@ -4562,7 -4544,7 +4564,7 @@@ msgstr " "uno per riga, sullo standard input." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:692 + #: apt.conf.5.xml:691 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@@ -4578,7 -4560,7 +4580,7 @@@ msgstr " "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:700 + #: apt.conf.5.xml:699 msgid "" "APT chdirs to this directory before invoking &dpkg;, the default is " "<filename>/</filename>." @@@ -4587,7 -4569,7 +4589,7 @@@ msgstr " "valore predefinito è <filename>/</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:705 + #: apt.conf.5.xml:704 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages; the " "default is to disable signing and produce all binaries." @@@ -4597,12 -4579,12 +4599,12 @@@ msgstr " "binari." #. type: Content of: <refentry><refsect1><refsect2><title> - #: apt.conf.5.xml:710 + #: apt.conf.5.xml:709 msgid "dpkg trigger usage (and related options)" msgstr "Uso dei trigger di dpkg (e relative opzioni)" #. type: Content of: <refentry><refsect1><refsect2><para> - #: apt.conf.5.xml:711 + #: apt.conf.5.xml:710 msgid "" "APT can call &dpkg; in such a way as to let it make aggressive use of " "triggers over multiple calls of &dpkg;. Without further options &dpkg; will " @@@ -4630,7 -4612,7 +4632,7 @@@ msgstr " "pacchetti." #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> - #: apt.conf.5.xml:726 + #: apt.conf.5.xml:725 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@@ -4644,7 -4626,7 +4646,7 @@@ msgstr " "DPkg::TriggersPending \"true\";" #. type: Content of: <refentry><refsect1><refsect2><para> - #: apt.conf.5.xml:720 + #: apt.conf.5.xml:719 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 " @@@ -4668,7 -4650,7 +4670,7 @@@ msgstr " "\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:733 + #: apt.conf.5.xml:732 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 " @@@ -4690,7 -4672,7 +4692,7 @@@ msgstr " "questa opzione anche alle chiamate per lo spacchettamento e la rimozione." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:741 + #: apt.conf.5.xml:740 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". The default value is \"<literal>all</literal>" @@@ -4720,7 -4702,7 +4722,7 @@@ msgstr " "potrebbe finire in uno stato non configurato e potenzialmente non avviabile." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:756 + #: apt.conf.5.xml:755 msgid "" "If this option is set APT will call <command>dpkg --configure --pending</" "command> to let &dpkg; handle all required configurations and triggers. This " @@@ -4738,7 -4720,7 +4740,7 @@@ msgstr " "si può disattivare questa opzione in tutte le esecuzioni tranne l'ultima." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:763 + #: apt.conf.5.xml:762 msgid "" "Useful for the <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal>, and " @@@ -4754,7 -4736,7 +4756,7 @@@ msgstr " "necessari per configurare il pacchetto in questione." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> - #: apt.conf.5.xml:776 + #: apt.conf.5.xml:775 #, no-wrap msgid "" "OrderList::Score {\n" @@@ -4772,7 -4754,7 +4774,7 @@@ msgstr " "};" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:769 + #: apt.conf.5.xml:768 msgid "" "Essential packages (and their dependencies) should be configured immediately " "after unpacking. It is a good idea to do this quite early in the upgrade " @@@ -4797,12 -4779,12 +4799,12 @@@ msgstr " "con i loro valori predefiniti. <placeholder type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:789 + #: apt.conf.5.xml:788 msgid "Periodic and Archives options" msgstr "Opzioni Periodic e Archives" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:790 + #: apt.conf.5.xml:789 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by the " @@@ -4816,12 -4798,12 +4818,12 @@@ msgstr " "all'inizio dello script." #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:798 + #: apt.conf.5.xml:797 msgid "Debug options" msgstr "Opzioni di debug" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:800 + #: apt.conf.5.xml:799 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@@ -4839,7 -4821,7 +4841,7 @@@ msgstr " "esserlo:" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> - #: apt.conf.5.xml:811 + #: apt.conf.5.xml:810 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@@ -4850,7 -4832,7 +4852,7 @@@ msgstr " "literal>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> - #: apt.conf.5.xml:819 + #: apt.conf.5.xml:818 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@@ -4861,7 -4843,7 +4863,7 @@@ msgstr " "install</literal>) come utente non root." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> - #: apt.conf.5.xml:828 + #: apt.conf.5.xml:827 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@@ -4873,7 -4855,7 +4875,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:836 + #: apt.conf.5.xml:835 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CD-ROM IDs." @@@ -4882,37 -4864,37 +4884,37 @@@ msgstr " "negli ID dei CD-ROM." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:846 + #: apt.conf.5.xml:845 msgid "A full list of debugging options to apt follows." msgstr "Segue un elenco completo delle opzioni di debug per apt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:855 + #: apt.conf.5.xml:854 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" "Stampa informazioni relative all'accesso a fonti <literal>cdrom://</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:866 + #: apt.conf.5.xml:865 msgid "Print information related to downloading packages using FTP." msgstr "" "Stampa informazioni relative allo scaricamento dei pacchetti usando FTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:877 + #: apt.conf.5.xml:876 msgid "Print information related to downloading packages using HTTP." msgstr "" "Stampa informazioni relative allo scaricamento dei pacchetti usando HTTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:888 + #: apt.conf.5.xml:887 msgid "Print information related to downloading packages using HTTPS." msgstr "" "Stampa informazioni relative allo scaricamento dei pacchetti usando HTTPS." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:899 + #: apt.conf.5.xml:898 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@@ -4921,7 -4903,7 +4923,7 @@@ msgstr " "usando <literal>gpg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:910 + #: apt.conf.5.xml:909 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." @@@ -4930,14 -4912,14 +4932,14 @@@ msgstr " "pacchetti memorizzati su CD-ROM." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:920 + #: apt.conf.5.xml:919 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" "Descrive il processo di risoluzione delle dipendenze di compilazione in &apt-" "get;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:930 + #: apt.conf.5.xml:929 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." @@@ -4946,7 -4928,7 +4948,7 @@@ msgstr " "<literal>apt</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:940 + #: apt.conf.5.xml:939 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 " @@@ -4957,7 -4939,7 +4959,7 @@@ msgstr " "system del CD-ROM." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:951 + #: apt.conf.5.xml:950 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." @@@ -4967,14 -4949,14 +4969,14 @@@ msgstr " "contemporaneamente." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:963 + #: apt.conf.5.xml:962 msgid "Log when items are added to or removed from the global download queue." msgstr "" "Registra nel log quando vengono aggiunte o rimosse voci dalla coda globale " "degli scaricamenti." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:973 + #: apt.conf.5.xml:972 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." @@@ -4983,7 -4965,7 +4985,7 @@@ msgstr " "codici di controllo e delle firme di cifratura dei file scaricati." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:983 + #: apt.conf.5.xml:982 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." @@@ -4993,7 -4975,7 +4995,7 @@@ msgstr " "diff." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:995 + #: apt.conf.5.xml:994 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." @@@ -5003,7 -4985,7 +5005,7 @@@ msgstr " "invece degli indici completi." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1006 + #: apt.conf.5.xml:1005 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" @@@ -5011,7 -4993,7 +5013,7 @@@ "realmente gli scaricamenti." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1017 + #: apt.conf.5.xml:1016 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." @@@ -5020,7 -5002,7 +5022,7 @@@ msgstr " "installato dei pacchetti e alla rimozione dei pacchetti non utilizzati." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1027 + #: apt.conf.5.xml:1026 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@@ -5036,7 -5018,7 +5038,7 @@@ msgstr " "pkgProblemResolver</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1041 + #: apt.conf.5.xml:1040 msgid "" "Generate debug messages describing which packages are marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@@ -5068,7 -5050,7 +5070,7 @@@ msgstr " "sezione in cui compare il pacchetto." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1062 + #: apt.conf.5.xml:1061 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." @@@ -5077,7 -5059,7 +5079,7 @@@ msgstr " "gli argomenti separati da un singolo carattere di spazio." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1073 + #: apt.conf.5.xml:1072 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." @@@ -5086,7 -5068,7 +5088,7 @@@ msgstr " "di stato ed ogni errore incontrato durante la sua analisi." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1084 + #: apt.conf.5.xml:1083 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." @@@ -5095,7 -5077,7 +5097,7 @@@ msgstr " "literal> deve passare i pacchetti a &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1096 + #: apt.conf.5.xml:1095 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" @@@ -5103,12 -5085,12 +5105,12 @@@ "nell'invocazione di &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1107 + #: apt.conf.5.xml:1106 msgid "Output the priority of each package list on startup." msgstr "Produce in output la priorità di ogni elenco di pacchetti all'avvio." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1117 + #: apt.conf.5.xml:1116 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." @@@ -5118,7 -5100,7 +5120,7 @@@ msgstr " "dipendenze)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1128 + #: apt.conf.5.xml:1127 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 " @@@ -5129,7 -5111,7 +5131,7 @@@ msgstr " "la stessa descritta in <literal>Debug::pkgDepCache::Marker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1140 + #: apt.conf.5.xml:1139 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@@ -5138,13 -5120,13 +5140,13 @@@ msgstr " "filename>." #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:1162 apt_preferences.5.xml:545 sources.list.5.xml:211 + #: apt.conf.5.xml:1161 apt_preferences.5.xml:545 sources.list.5.xml:211 #: apt-ftparchive.1.xml:596 msgid "Examples" msgstr "Esempi" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:1163 + #: apt.conf.5.xml:1162 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@@ -5154,7 -5136,7 +5156,7 @@@ msgstr " #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:1175 + #: apt.conf.5.xml:1174 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." @@@ -6665,13 -6647,13 +6667,13 @@@ msgstr " #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:92 msgid "" - "<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)" - "</literal> which expands to the Debian architecture (such as <literal>amd64</" - "literal> or <literal>armel</literal>) 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." + "<literal>distribution</literal> may also contain a variable, <literal>" + "$(ARCH)</literal> which expands to the Debian architecture (such as " + "<literal>amd64</literal> or <literal>armel</literal>) 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>distribuzione</literal> può anche contenere una variabile <literal>" "$(ARCH)</literal> che viene espansa nell'architettura Debian (come " @@@ -8166,9 -8148,9 +8168,9 @@@ msgstr "DESCRIZIONE #: 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<aptitude>" - "(8) for the command line or B<synaptic>(8) for the X Window System. Some " - "options are only implemented in B<apt-get>(8) though." + "package management there are several frontends available, such as " + "B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window " + "System. Some options are only implemented in B<apt-get>(8) though." msgstr "" "APT è un sistema di gestione per i pacchetti software. Per la normale " "gestione quotidiana dei pacchetti sono disponibili diverse interfacce, quali " @@@ -8222,8 -8204,8 +8224,8 @@@ msgid " "B<reportbug>(1) command." msgstr "" "Vedere E<lt>http://bugs.debian.org/aptE<gt>. Per segnalare un bug in B<apt>, " - "vedere I</usr/share/doc/debian/bug-reporting.txt> o il comando B<reportbug>" - "(1)." + "vedere I</usr/share/doc/debian/bug-reporting.txt> o il comando " + "B<reportbug>(1)." #. type: SH #: apt.8:51 diff --combined doc/po/ja.po index cb2ae7f48,6b767f195..866cf0e43 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@@ -8,7 -8,7 +8,11 @@@ msgid " msgstr "" "Project-Id-Version: apt 0.7.25.3\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" ++<<<<<<< HEAD +"POT-Creation-Date: 2013-04-30 10:29+0300\n" ++======= + "POT-Creation-Date: 2013-06-13 13:46+0300\n" ++>>>>>>> upstream/debian/sid "PO-Revision-Date: 2012-08-08 07:58+0900\n" "Last-Translator: KURASAWA Nozomu <nabetaro@debian.or.jp>\n" "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n" @@@ -800,9 -800,9 +804,9 @@@ msgid " "installation or upgrading. Each package is a package name, not a fully " "qualified filename (for instance, in a Debian system, <package>apt-utils</" "package> would be the argument provided, not <filename>apt-utils_&apt-" - "product-version;_amd64.deb</filename>). 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 " + "product-version;_amd64.deb</filename>). 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 " @@@ -1530,14 -1530,14 +1534,14 @@@ msgstr " #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125 - #: apt.conf.5.xml:1168 apt_preferences.5.xml:698 + #: apt.conf.5.xml:1167 apt_preferences.5.xml:698 msgid "Files" msgstr "ファイル" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 #: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109 - #: apt.conf.5.xml:1174 apt_preferences.5.xml:705 sources.list.5.xml:252 + #: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 #: apt-ftparchive.1.xml:607 msgid "See Also" @@@ -2215,19 -2215,12 +2219,19 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:130 +#, fuzzy +#| msgid "" +#| "Update the local keyring with the archive keyring and remove from the " +#| "local keyring the archive keys which are no longer valid. The archive " +#| "keyring is shipped in the <literal>archive-keyring</literal> package of " +#| "your distribution, e.g. the <literal>debian-archive-keyring</literal> " +#| "package in Debian." msgid "" "Update the local keyring with the archive keyring and remove from the local " "keyring the archive keys which are no longer valid. The archive keyring is " "shipped in the <literal>archive-keyring</literal> package of your " -"distribution, e.g. the <literal>debian-archive-keyring</literal> package in " -"Debian." +"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in " +"Ubuntu." msgstr "" "ローカルキーリングをアーカイブキーリングで更新し、もう有効でなくなったアーカ" "イブキーをローカルキーリングから削除します。アーカイブキーリングは、使用中の" @@@ -2294,33 -2287,24 +2298,33 @@@ msgstr "アーカイブキーのローã #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:183 -msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" +#, fuzzy +#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" +msgid "<filename>/usr/share/keyrings/ubuntu-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:184 -msgid "Keyring of Debian archive trusted keys." +#, fuzzy +#| msgid "Keyring of Debian archive trusted keys." +msgid "Keyring of Ubuntu archive trusted keys." msgstr "Debian アーカイブ信頼キーのキーリングです。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:187 +#, fuzzy +#| msgid "" +#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgid "" -"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" +"<filename>/usr/share/keyrings/ubuntu-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:188 -msgid "Keyring of Debian archive removed trusted keys." +#, fuzzy +#| msgid "Keyring of Debian archive removed trusted keys." +msgid "Keyring of Ubuntu archive removed trusted keys." msgstr "削除された Debian アーカイブ信頼キーのキーリングです。" #. type: Content of: <refentry><refsect1><para> @@@ -3182,14 -3166,14 +3186,14 @@@ msgstr "DPkg::Pre-Install-Pkgs {\"/usr/ #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:101 msgid "" - "In general the sample configuration file in <filename>&docdir;examples/apt." - "conf</filename> &configureindex; is a good guide for how it should look." + "In general the sample configuration file &configureindex; is a good guide " + "for how it should look." msgstr "" - "<filename>&docdir;examples/apt.conf</filename> &configureindex; は一般的な設" - "定ファイルのサンプルです。どのように設定するか参考になるでしょう。" + "&configureindex; は一般的な設定ファイルのサンプルです。どのように設定するか参" + "考になるでしょう。" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:105 + #: apt.conf.5.xml:104 msgid "" "Case is not significant in names of configuration items, so in the previous " "example you could use <literal>dpkg::pre-install-pkgs</literal>." @@@ -3198,7 -3182,7 +3202,7 @@@ msgstr " "<literal>dpkg::pre-install-pkgs</literal> とすることもできます。" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:108 + #: apt.conf.5.xml:107 msgid "" "Names for the configuration items are optional if a list is defined as can " "be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If " @@@ -3213,7 -3197,7 +3217,7 @@@ msgstr " "できます。" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:113 + #: apt.conf.5.xml:112 msgid "" "Two special commands are defined: <literal>#include</literal> (which is " "deprecated and not supported by alternative implementations) and " @@@ -3232,7 -3216,7 +3236,7 @@@ msgstr " "があることに注意してください)。" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:123 + #: apt.conf.5.xml:122 msgid "" "The <literal>#clear</literal> command is the only way to delete a list or a " "complete scope. Reopening a scope (or using the syntax described below with " @@@ -3247,7 -3231,7 +3251,7 @@@ msgstr " "せん。クリアされるだけです。" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:131 + #: apt.conf.5.xml:130 msgid "" "All of the APT tools take an -o option which allows an arbitrary " "configuration directive to be specified on the command line. The syntax is a " @@@ -3265,7 -3249,7 +3269,7 @@@ msgstr " "ん)。" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:139 + #: apt.conf.5.xml:138 msgid "" "Note that appending items to a list using <literal>::</literal> only works " "for one item per line, and that you should not use it in combination with " @@@ -3293,12 -3277,12 +3297,12 @@@ msgstr " "かない限りは、自分でそのような構文を修正してください。" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:154 + #: apt.conf.5.xml:153 msgid "The APT Group" msgstr "APT グループ" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:155 + #: apt.conf.5.xml:154 msgid "" "This group of options controls general APT behavior as well as holding the " "options for all of the tools." @@@ -3307,7 -3291,7 +3311,7 @@@ msgstr " "御します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:160 + #: apt.conf.5.xml:159 msgid "" "System Architecture; sets the architecture to use when fetching files and " "parsing package lists. The internal default is the architecture apt was " @@@ -3318,7 -3302,7 +3322,7 @@@ msgstr " "ルしたアーキテクチャです。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:167 + #: apt.conf.5.xml:166 msgid "" "All Architectures the system supports. For instance, CPUs implementing the " "<literal>amd64</literal> (also called <literal>x86-64</literal>) " @@@ -3339,7 -3323,7 +3343,7 @@@ msgstr " "加します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:180 + #: apt.conf.5.xml:179 msgid "" "Default release to install packages from if more than one version is " "available. Contains release name, codename or release version. Examples: " @@@ -3352,7 -3336,7 +3356,7 @@@ msgstr " "'4.0', '5.0*' となります。&apt-preferences; も参照してください。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:186 + #: apt.conf.5.xml:185 msgid "" "Ignore held packages; this global option causes the problem resolver to " "ignore held packages in its decision making." @@@ -3361,7 -3345,7 +3365,7 @@@ msgstr " "パッケージを無視します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:191 + #: apt.conf.5.xml:190 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 " @@@ -3375,7 -3359,7 +3379,7 @@@ msgstr " "注意してください。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:199 + #: apt.conf.5.xml:198 msgid "" "Defaults to on, which will cause APT to install essential and important " "packages as soon as possible in an install/upgrade operation, in order to " @@@ -3399,7 -3383,7 +3403,7 @@@ msgstr " "なり、A への依存関係は、もう満たせません。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:211 + #: apt.conf.5.xml:210 msgid "" "The immediate configuration marker is also applied in the potentially " "problematic case of circular dependencies, since a dependency with the " @@@ -3424,7 -3408,7 +3428,7 @@@ msgstr " "述のシナリオを解決する方法の、1つにしかすぎないのです。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:224 + #: apt.conf.5.xml:223 msgid "" "Before a big operation like <literal>dist-upgrade</literal> is run with this " "option disabled you should try to explicitly <literal>install</literal> the " @@@ -3440,7 -3424,7 +3444,7 @@@ msgstr " "も報告していただきたいです。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:235 + #: apt.conf.5.xml:234 msgid "" "Never enable this option unless you <emphasis>really</emphasis> know what " "you are doing. It permits APT to temporarily remove an essential package to " @@@ -3461,7 -3445,7 +3465,7 @@@ msgstr " "それらが依存しているパッケージ以外の不可欠パッケージで動作します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:247 + #: apt.conf.5.xml:246 msgid "" "APT uses since version 0.7.26 a resizable memory mapped cache file to store " "the available information. <literal>Cache-Start</literal> acts as a hint of " @@@ -3495,12 -3479,12 +3499,12 @@@ msgstr " "の自動増加を無効にします。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:263 + #: apt.conf.5.xml:262 msgid "Defines which packages are considered essential build dependencies." msgstr "構築依存関係で不可欠なパッケージを定義します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:267 + #: apt.conf.5.xml:266 msgid "" "The Get subsection controls the &apt-get; tool; please see its documentation " "for more information about the options here." @@@ -3509,7 -3493,7 +3513,7 @@@ msgstr " "&apt-get; の文書を参照してください。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:272 + #: apt.conf.5.xml:271 msgid "" "The Cache subsection controls the &apt-cache; tool; please see its " "documentation for more information about the options here." @@@ -3518,7 -3502,7 +3522,7 @@@ msgstr " "は &apt-cache; の文書を参照してください。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:277 + #: apt.conf.5.xml:276 msgid "" "The CDROM subsection controls the &apt-cdrom; tool; please see its " "documentation for more information about the options here." @@@ -3527,12 -3511,12 +3531,12 @@@ msgstr " "は &apt-cdrom; の文書を参照してください。" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:283 + #: apt.conf.5.xml:282 msgid "The Acquire Group" msgstr "Acquire グループ" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:284 + #: apt.conf.5.xml:283 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages as well as the various \"acquire methods\" responsible for the " @@@ -3543,7 -3527,7 +3547,7 @@@ msgstr " "(&sources-list; も参照)。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:291 + #: apt.conf.5.xml:290 msgid "" "Security related option defaulting to true, as giving a Release file's " "validation an expiration date prevents replay attacks over a long timescale, " @@@ -3563,7 -3547,7 +3567,7 @@@ msgstr " "下の <literal>Max-ValidTime</literal> オプションを使用できます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:304 + #: apt.conf.5.xml:303 msgid "" "Maximum time (in seconds) after its creation (as indicated by the " "<literal>Date</literal> header) that the <filename>Release</filename> file " @@@ -3581,7 -3565,7 +3585,7 @@@ msgstr " "固有の設定を作成できます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:316 + #: apt.conf.5.xml:315 msgid "" "Minimum time (in seconds) after its creation (as indicated by the " "<literal>Date</literal> header) that the <filename>Release</filename> file " @@@ -3599,7 -3583,7 +3603,7 @@@ msgstr " "定を作成できます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:328 + #: apt.conf.5.xml:327 msgid "" "Try to download deltas called <literal>PDiffs</literal> for indexes (like " "<filename>Packages</filename> files) instead of downloading whole ones. True " @@@ -3610,7 -3594,7 +3614,7 @@@ msgstr " "す。デフォルトでは True です。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:331 + #: apt.conf.5.xml:330 msgid "" "Two sub-options to limit the use of PDiffs are also available: " "<literal>FileLimit</literal> can be used to specify a maximum number of " @@@ -3626,7 -3610,7 +3630,7 @@@ msgstr " "も、パッチをダウンロードする代わりに、完全なファイルをダウンロードします。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:341 + #: apt.conf.5.xml:340 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@@ -3640,7 -3624,7 +3644,7 @@@ msgstr " "<literal>access</literal> は、URI タイプごとに 1 接続を開きます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:349 + #: apt.conf.5.xml:348 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." @@@ -3649,7 -3633,7 +3653,7 @@@ msgstr " "えられた回数だけリトライを行います。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:354 + #: apt.conf.5.xml:353 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." @@@ -3659,7 -3643,7 +3663,7 @@@ msgstr " "す。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:359 + #: apt.conf.5.xml:358 msgid "" "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. " "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</" @@@ -3677,7 -3661,7 +3681,7 @@@ msgstr " "ないと、環境変数 <envar>http_proxy</envar> を使用します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:367 + #: apt.conf.5.xml:366 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy not to use its cached " @@@ -3696,7 -3680,7 +3700,7 @@@ msgstr " "が汚れるのを防げます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:377 apt.conf.5.xml:449 + #: apt.conf.5.xml:376 apt.conf.5.xml:448 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method; this value applies to the connection as well as the data timeout." @@@ -3706,7 -3690,7 +3710,7 @@@ msgstr " "す。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:380 + #: apt.conf.5.xml:379 msgid "" "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to " "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e." @@@ -3724,7 -3708,7 +3728,7 @@@ msgstr " "フォルト値は 0 (= 無効) です。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:387 + #: apt.conf.5.xml:386 msgid "" "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will " "follow redirects, which is enabled by default." @@@ -3733,7 -3717,7 +3737,7 @@@ msgstr " "かどうかを制御します。デフォルトでは有効です。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:390 + #: apt.conf.5.xml:389 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobytes. The default value is 0 " @@@ -3747,7 -3731,7 +3751,7 @@@ msgstr " "ロードしなくなることに注意してください)。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:395 + #: apt.conf.5.xml:394 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 " @@@ -3758,7 -3742,7 +3762,7 @@@ msgstr " "ロードするための、異なる User-Agent を設定できます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:403 + #: apt.conf.5.xml:402 msgid "" "The <literal>Cache-control</literal>, <literal>Timeout</literal>, " "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and " @@@ -3775,7 -3759,7 +3779,7 @@@ msgstr " "していません。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:411 + #: apt.conf.5.xml:410 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is the " @@@ -3813,7 -3797,7 +3817,7 @@@ msgstr " "ごとのオプションです。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:432 + #: apt.conf.5.xml:431 msgid "" "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs. " "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</" @@@ -3839,13 -3823,13 +3843,13 @@@ msgstr " "るには、設定ファイルに <literal>ftp::ProxyLogin</literal> スクリプトを設定す" "る必要があります。このエントリには、接続する際にプロキシサーバに送信するコマ" "ンドを設定します。どのようにするのかは &configureindex; の例を参照してくださ" - "い。URI を構成するコンポーネントに対応する置換変数は、<literal>$(PROXY_USER)" - "</literal>, <literal>$(PROXY_PASS)</literal>, <literal>$(SITE_USER)</" - "literal>, <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</literal>, " - "<literal>$(SITE_PORT)</literal> です。" + "い。URI を構成するコンポーネントに対応する置換変数は、<literal>" + "$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, <literal>" + "$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</" + "literal>, <literal>$(SITE_PORT)</literal> です。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:452 + #: apt.conf.5.xml:451 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, " @@@ -3860,7 -3844,7 +3864,7 @@@ msgstr " "定例はサンプル設定ファイルを参照してください)。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:459 + #: apt.conf.5.xml:458 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to an HTTP URL - see the discussion of the http " @@@ -3873,7 -3857,7 +3877,7 @@@ msgstr " "FTP over HTTP を使用するのは推奨しません。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:464 + #: apt.conf.5.xml:463 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@@ -3889,13 -3873,13 +3893,13 @@@ msgstr " "いことに注意してください。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout> - #: apt.conf.5.xml:478 + #: apt.conf.5.xml:477 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "/cdrom/::Mount \"foo\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:473 + #: apt.conf.5.xml:472 msgid "" "For URIs using the <literal>cdrom</literal> method, the only configurable " "option is the mount point, <literal>cdrom::Mount</literal>, which must be " @@@ -3916,7 -3900,7 +3920,7 @@@ msgstr " "マンドは UMount で指定することができます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:486 + #: apt.conf.5.xml:485 msgid "" "For GPGV URIs the only configurable option is <literal>gpgv::Options</" "literal>, which passes additional parameters to gpgv." @@@ -3925,13 -3909,13 +3929,13 @@@ msgstr " "る、<literal>gpgv::Options</literal> です。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:497 + #: apt.conf.5.xml:496 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:492 + #: apt.conf.5.xml:491 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@@ -3949,19 -3933,19 +3953,19 @@@ msgstr " "す。構文は以下のようになります。<placeholder type=\"synopsis\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:502 + #: apt.conf.5.xml:501 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "Acquire::CompressionTypes::Order:: \"gz\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:505 + #: apt.conf.5.xml:504 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:498 + #: apt.conf.5.xml:497 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 " @@@ -3990,13 -3974,13 +3994,13 @@@ msgstr " "<literal>bz2</literal> は自動的に追加されるため、明示する必要はありません。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout> - #: apt.conf.5.xml:512 + #: apt.conf.5.xml:511 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:507 + #: apt.conf.5.xml:506 msgid "" "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></" "literal> will be checked at run time. If this option has been set, the " @@@ -4020,7 -4004,7 +4024,7 @@@ msgstr " "のみ定義されます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:517 + #: apt.conf.5.xml:516 msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " @@@ -4031,7 -4015,7 +4035,7 @@@ msgstr " "んどローカルミラーでのみ有効になることに注意してください。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:524 + #: apt.conf.5.xml:523 msgid "" "When downloading <literal>gzip</literal> compressed indexes (Packages, " "Sources, or Translations), keep them gzip compressed locally instead of " @@@ -4044,7 -4028,7 +4048,7 @@@ msgstr " "する際に、CPU の能力を余計に消費します。デフォルトでは false です。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:532 + #: apt.conf.5.xml:531 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the description-" @@@ -4062,13 -4046,13 +4066,13 @@@ msgstr " "意してください。長い言語コードは特に見かけません。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting> - #: apt.conf.5.xml:549 + #: apt.conf.5.xml:548 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:537 + #: apt.conf.5.xml:536 msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: it will be " @@@ -4105,7 -4089,7 +4109,7 @@@ msgstr " "ことに注意してください。<placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:550 + #: apt.conf.5.xml:549 msgid "" "Note: To prevent problems resulting from APT being executed in different " "environments (e.g. by different users or by other programs) all Translation " @@@ -4118,22 -4102,22 +4122,22 @@@ msgstr " "後) に追加します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:559 + #: apt.conf.5.xml:558 msgid "When downloading, force to use only the IPv4 protocol." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:565 + #: apt.conf.5.xml:564 msgid "When downloading, force to use only the IPv6 protocol." msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:572 + #: apt.conf.5.xml:571 msgid "Directories" msgstr "ディレクトリ" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:574 + #: apt.conf.5.xml:573 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@@ -4152,7 -4136,7 +4156,7 @@@ msgstr " "サブアイテムすべてに、前に付加するデフォルトディレクトリを含んでいます。" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:581 + #: apt.conf.5.xml:580 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@@ -4173,7 -4157,7 +4177,7 @@@ msgstr " "様、<literal>Dir::Cache</literal> はデフォルトディレクトリを含んでいます。" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:590 + #: apt.conf.5.xml:589 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@@ -4187,7 -4171,7 +4191,7 @@@ msgstr " "ファイルを指定された場合のみ、この設定の効果があります)" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:596 + #: apt.conf.5.xml:595 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 " @@@ -4198,7 -4182,7 +4202,7 @@@ msgstr " "します。" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:600 + #: apt.conf.5.xml:599 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@@ -4215,7 -4199,7 +4219,7 @@@ msgstr " "プログラムの場所を指定します。" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:608 + #: apt.conf.5.xml:607 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@@ -4235,7 -4219,7 +4239,7 @@@ msgstr " "<filename>/tmp/staging/var/lib/dpkg/status</filename> から探します。" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:621 + #: apt.conf.5.xml:620 msgid "" "The <literal>Ignore-Files-Silently</literal> list can be used to specify " "which files APT should silently ignore while parsing the files in the " @@@ -4251,12 -4235,12 +4255,12 @@@ msgstr " "フォルト値を見ればわかる通り、このパターンには正規表現を使用できます。" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:630 + #: apt.conf.5.xml:629 msgid "APT in DSelect" msgstr "DSelect での APT" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:632 + #: apt.conf.5.xml:631 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behavior. These are in the <literal>DSelect</literal> " @@@ -4267,7 -4251,7 +4271,7 @@@ msgstr " "ます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:637 + #: apt.conf.5.xml:636 msgid "" "Cache Clean mode; this value may be one of <literal>always</literal>, " "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</" @@@ -4288,7 -4272,7 +4292,7 @@@ msgstr " "パッケージをダウンロードする直前に行います。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:651 + #: apt.conf.5.xml:650 msgid "" "The contents of this variable are passed to &apt-get; as command line " "options when it is run for the install phase." @@@ -4297,7 -4281,7 +4301,7 @@@ msgstr " "されます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:656 + #: apt.conf.5.xml:655 msgid "" "The contents of this variable are passed to &apt-get; as command line " "options when it is run for the update phase." @@@ -4306,7 -4290,7 +4310,7 @@@ msgstr " "されます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:661 + #: apt.conf.5.xml:660 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." @@@ -4315,12 -4299,12 +4319,12 @@@ msgstr " "します。デフォルトはエラーが発生した場合のみです。" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:667 + #: apt.conf.5.xml:666 msgid "How APT calls &dpkg;" msgstr "APT が &dpkg; を呼ぶ方法" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:668 + #: apt.conf.5.xml:667 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." @@@ -4329,7 -4313,7 +4333,7 @@@ msgstr " "<literal>DPkg</literal> セクションにあります。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:673 + #: apt.conf.5.xml:672 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 " @@@ -4339,7 -4323,7 +4343,7 @@@ msgstr " "なければなりません。また、各リストは単一の引数として &dpkg; に渡されます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:679 + #: apt.conf.5.xml:678 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 " @@@ -4351,7 -4335,7 +4355,7 @@@ msgstr " "bin/sh</filename> を通して呼び出され、何か問題があれば APT が異常終了します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:686 + #: apt.conf.5.xml:685 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 " @@@ -4366,7 -4350,7 +4370,7 @@@ msgstr " "マンドの標準入力に送ります。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:692 + #: apt.conf.5.xml:691 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@@ -4381,7 -4365,7 +4385,7 @@@ msgstr " "Install-Pkgs</literal> で与えられるコマンドです。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:700 + #: apt.conf.5.xml:699 msgid "" "APT chdirs to this directory before invoking &dpkg;, the default is " "<filename>/</filename>." @@@ -4390,7 -4374,7 +4394,7 @@@ msgstr " "<filename>/</filename> です。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:705 + #: apt.conf.5.xml:704 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages; the " "default is to disable signing and produce all binaries." @@@ -4399,12 -4383,12 +4403,12 @@@ msgstr " "ます。デフォルトでは署名を無効にし、全バイナリを生成します。" #. type: Content of: <refentry><refsect1><refsect2><title> - #: apt.conf.5.xml:710 + #: apt.conf.5.xml:709 msgid "dpkg trigger usage (and related options)" msgstr "dpkg トリガの使い方 (および関連オプション)" #. type: Content of: <refentry><refsect1><refsect2><para> - #: apt.conf.5.xml:711 + #: apt.conf.5.xml:710 msgid "" "APT can call &dpkg; in such a way as to let it make aggressive use of " "triggers over multiple calls of &dpkg;. Without further options &dpkg; will " @@@ -4428,7 -4412,7 +4432,7 @@@ msgstr " "(もしくはそれ以上) の時間 100% のままとなり、進捗レポートを壊してしまいます。" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> - #: apt.conf.5.xml:726 + #: apt.conf.5.xml:725 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@@ -4442,7 -4426,7 +4446,7 @@@ msgstr " "DPkg::TriggersPending \"true\";" #. type: Content of: <refentry><refsect1><refsect2><para> - #: apt.conf.5.xml:720 + #: apt.conf.5.xml:719 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 " @@@ -4465,7 -4449,7 +4469,7 @@@ msgstr " "\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:733 + #: apt.conf.5.xml:732 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 " @@@ -4485,7 -4469,7 +4489,7 @@@ msgstr " "在 APT は、このフラグを、展開呼び出しや削除呼び出しにも追加します。" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:741 + #: apt.conf.5.xml:740 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". The default value is \"<literal>all</literal>" @@@ -4512,7 -4496,7 +4516,7 @@@ msgstr " "能性があるからです。" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:756 + #: apt.conf.5.xml:755 msgid "" "If this option is set APT will call <command>dpkg --configure --pending</" "command> to let &dpkg; handle all required configurations and triggers. This " @@@ -4529,7 -4513,7 +4533,7 @@@ msgstr " "では、最後以外のすべての実行で、無効にできます。" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:763 + #: apt.conf.5.xml:762 msgid "" "Useful for the <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal>, and " @@@ -4544,7 -4528,7 +4548,7 @@@ msgstr " "ことに注意してください。" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> - #: apt.conf.5.xml:776 + #: apt.conf.5.xml:775 #, no-wrap msgid "" "OrderList::Score {\n" @@@ -4562,7 -4546,7 +4566,7 @@@ msgstr " "};" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:769 + #: apt.conf.5.xml:768 msgid "" "Essential packages (and their dependencies) should be configured immediately " "after unpacking. It is a good idea to do this quite early in the upgrade " @@@ -4585,12 -4569,12 +4589,12 @@@ msgstr " "\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:789 + #: apt.conf.5.xml:788 msgid "Periodic and Archives options" msgstr "Periodic オプションと Archives オプション" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:790 + #: apt.conf.5.xml:789 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by the " @@@ -4603,12 -4587,12 +4607,12 @@@ msgstr " "トは、このスクリプトの先頭を参照してください。" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:798 + #: apt.conf.5.xml:797 msgid "Debug options" msgstr "デバッグオプション" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:800 + #: apt.conf.5.xml:799 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@@ -4624,7 -4608,7 +4628,7 @@@ msgstr " "のオプションは興味がないでしょうが、以下のものは興味を引くかもしれません。" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> - #: apt.conf.5.xml:811 + #: apt.conf.5.xml:810 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@@ -4635,7 -4619,7 +4639,7 @@@ msgstr " "にします。" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> - #: apt.conf.5.xml:819 + #: apt.conf.5.xml:818 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@@ -4646,7 -4630,7 +4650,7 @@@ msgstr " "literal>) を行う場合に使用します。" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> - #: apt.conf.5.xml:828 + #: apt.conf.5.xml:827 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@@ -4658,7 -4642,7 +4662,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:836 + #: apt.conf.5.xml:835 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CD-ROM IDs." @@@ -4667,34 -4651,34 +4671,34 @@@ msgstr " "ないようにします。" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:846 + #: apt.conf.5.xml:845 msgid "A full list of debugging options to apt follows." msgstr "以下は apt に対するデバッグオプションのすべてです。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:855 + #: apt.conf.5.xml:854 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" "<literal>cdrom://</literal> ソースへのアクセスに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:866 + #: apt.conf.5.xml:865 msgid "Print information related to downloading packages using FTP." msgstr "FTP を用いたパッケージのダウンロードに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:877 + #: apt.conf.5.xml:876 msgid "Print information related to downloading packages using HTTP." msgstr "HTTP を用いたパッケージのダウンロードに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:888 + #: apt.conf.5.xml:887 msgid "Print information related to downloading packages using HTTPS." msgstr "HTTPS を用いたパッケージのダウンロードに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:899 + #: apt.conf.5.xml:898 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@@ -4702,7 -4686,7 +4706,7 @@@ msgstr " "<literal>gpg</literal> を用いた暗号署名の検証に関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:910 + #: apt.conf.5.xml:909 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." @@@ -4711,12 -4695,12 +4715,12 @@@ msgstr " "します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:920 + #: apt.conf.5.xml:919 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "&apt-get; での構築依存関係解決のプロセスを説明します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:930 + #: apt.conf.5.xml:929 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." @@@ -4724,7 -4708,7 +4728,7 @@@ msgstr " "<literal>apt</literal> ライブラリが生成した、暗号化ハッシュを出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:940 + #: apt.conf.5.xml:939 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 " @@@ -4734,7 -4718,7 +4738,7 @@@ msgstr " "システムにある使用済・未使用ブロックの数からの情報を含めないようにします。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:951 + #: apt.conf.5.xml:950 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." @@@ -4743,13 -4727,13 +4747,13 @@@ msgstr " "<quote><literal>apt-get update</literal></quote> を実行できるようになります。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:963 + #: apt.conf.5.xml:962 msgid "Log when items are added to or removed from the global download queue." msgstr "" "グローバルダウンロードキューに対する項目の追加・削除の際にログを出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:973 + #: apt.conf.5.xml:972 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." @@@ -4758,7 -4742,7 +4762,7 @@@ msgstr " "ジやエラーを出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:983 + #: apt.conf.5.xml:982 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." @@@ -4767,7 -4751,7 +4771,7 @@@ msgstr " "します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:995 + #: apt.conf.5.xml:994 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." @@@ -4776,14 -4760,14 +4780,14 @@@ msgstr " "リストへのパッチ適用に関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1006 + #: apt.conf.5.xml:1005 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" "実際のダウンロードを行う際の、サブプロセスとのやりとりをログに出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1017 + #: apt.conf.5.xml:1016 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." @@@ -4792,7 -4776,7 +4796,7 @@@ msgstr " "に出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1027 + #: apt.conf.5.xml:1026 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@@ -4807,7 -4791,7 +4811,7 @@@ msgstr " "路に対応しています。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1041 + #: apt.conf.5.xml:1040 msgid "" "Generate debug messages describing which packages are marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@@ -4836,7 -4820,7 +4840,7 @@@ msgstr " "ます。<literal>section</literal> はパッケージが現れるセクション名です。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1062 + #: apt.conf.5.xml:1061 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." @@@ -4845,7 -4829,7 +4849,7 @@@ msgstr " "切られます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1073 + #: apt.conf.5.xml:1072 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." @@@ -4854,7 -4838,7 +4858,7 @@@ msgstr " "を解析中に発生したエラーを出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1084 + #: apt.conf.5.xml:1083 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." @@@ -4863,18 -4847,18 +4867,18 @@@ msgstr " "のトレースを生成します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1096 + #: apt.conf.5.xml:1095 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "&dpkg; を呼び出す際に、実行手順を追跡した状態メッセージを出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1107 + #: apt.conf.5.xml:1106 msgid "Output the priority of each package list on startup." msgstr "起動時の各パッケージの優先度を表示します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1117 + #: apt.conf.5.xml:1116 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." @@@ -4883,7 -4867,7 +4887,7 @@@ msgstr " "した場合にのみ、適用されます)。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1128 + #: apt.conf.5.xml:1127 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 " @@@ -4894,7 -4878,7 +4898,7 @@@ msgstr " "説明したものと同じです。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1140 + #: apt.conf.5.xml:1139 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@@ -4903,13 -4887,13 +4907,13 @@@ msgstr " "します。" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:1162 apt_preferences.5.xml:545 sources.list.5.xml:211 + #: apt.conf.5.xml:1161 apt_preferences.5.xml:545 sources.list.5.xml:211 #: apt-ftparchive.1.xml:596 msgid "Examples" msgstr "サンプル" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:1163 + #: apt.conf.5.xml:1162 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@@ -4919,7 -4903,7 +4923,7 @@@ msgstr " #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:1175 + #: apt.conf.5.xml:1174 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." @@@ -6376,13 -6360,13 +6380,13 @@@ msgstr " #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:92 msgid "" - "<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)" - "</literal> which expands to the Debian architecture (such as <literal>amd64</" - "literal> or <literal>armel</literal>) 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." + "<literal>distribution</literal> may also contain a variable, <literal>" + "$(ARCH)</literal> which expands to the Debian architecture (such as " + "<literal>amd64</literal> or <literal>armel</literal>) 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> は、<literal>$(ARCH)</literal> 変数を含む場合" "があります。<literal>$(ARCH)</literal> 変数は、システムで使用している Debian " @@@ -7832,14 -7816,14 +7836,14 @@@ msgstr "説明 #: 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<aptitude>" - "(8) for the command line or B<synaptic>(8) for the X Window System. Some " - "options are only implemented in B<apt-get>(8) though." + "package management there are several frontends available, such as " + "B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window " + "System. Some options are only implemented in B<apt-get>(8) though." msgstr "" "APT はソフトウェアパッケージの管理システムです。日々のパッケージ管理のため" - "に、コマンドライン用の B<aptitude>(8) や、X Window System 用の B<synaptic>" - "(8) といった、いくつかのフロントエンドが用意されています。いくつかのオプショ" - "ンは B<apt-get>(8) にしか実装されていません。" + "に、コマンドライン用の B<aptitude>(8) や、X Window System 用の " + "B<synaptic>(8) といった、いくつかのフロントエンドが用意されています。いくつか" + "のオプションは B<apt-get>(8) にしか実装されていません。" #. type: SH #: apt.8:31 diff --combined doc/po/pl.po index 4388534f8,2b33324b6..ee4461f39 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@@ -11,7 -11,7 +11,11 @@@ msgid " msgstr "" "Project-Id-Version: apt 0.9.7.3\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" ++<<<<<<< HEAD +"POT-Creation-Date: 2013-04-30 10:29+0300\n" ++======= + "POT-Creation-Date: 2013-06-13 13:46+0300\n" ++>>>>>>> upstream/debian/sid "PO-Revision-Date: 2012-07-28 21:59+0200\n" "Last-Translator: Robert Luberda <robert@debian.org>\n" "Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n" @@@ -811,9 -811,9 +815,9 @@@ msgid " "installation or upgrading. Each package is a package name, not a fully " "qualified filename (for instance, in a Debian system, <package>apt-utils</" "package> would be the argument provided, not <filename>apt-utils_&apt-" - "product-version;_amd64.deb</filename>). 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 " + "product-version;_amd64.deb</filename>). 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 " @@@ -1613,14 -1613,14 +1617,14 @@@ msgstr " #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125 - #: apt.conf.5.xml:1168 apt_preferences.5.xml:698 + #: apt.conf.5.xml:1167 apt_preferences.5.xml:698 msgid "Files" msgstr "Pliki" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 #: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109 - #: apt.conf.5.xml:1174 apt_preferences.5.xml:705 sources.list.5.xml:252 + #: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 #: apt-ftparchive.1.xml:607 msgid "See Also" @@@ -2362,19 -2362,12 +2366,19 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:130 +#, fuzzy +#| msgid "" +#| "Update the local keyring with the archive keyring and remove from the " +#| "local keyring the archive keys which are no longer valid. The archive " +#| "keyring is shipped in the <literal>archive-keyring</literal> package of " +#| "your distribution, e.g. the <literal>debian-archive-keyring</literal> " +#| "package in Debian." msgid "" "Update the local keyring with the archive keyring and remove from the local " "keyring the archive keys which are no longer valid. The archive keyring is " "shipped in the <literal>archive-keyring</literal> package of your " -"distribution, e.g. the <literal>debian-archive-keyring</literal> package in " -"Debian." +"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in " +"Ubuntu." msgstr "" "Aktualizuje lokalną składnicę kluczy używając składnicy kluczy archiwum i " "usuwa z lokalnej składnicy niepoprawne klucze archiwum. Składnica kluczy " @@@ -2443,33 -2436,24 +2447,33 @@@ msgstr "Lokalna składnica zaufanych kl #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:183 -msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" +#, fuzzy +#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" +msgid "<filename>/usr/share/keyrings/ubuntu-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:184 -msgid "Keyring of Debian archive trusted keys." +#, fuzzy +#| msgid "Keyring of Debian archive trusted keys." +msgid "Keyring of Ubuntu archive trusted keys." msgstr "Składnica zaufanych kluczy archiwum Debiana." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:187 +#, fuzzy +#| msgid "" +#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgid "" -"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" +"<filename>/usr/share/keyrings/ubuntu-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:188 -msgid "Keyring of Debian archive removed trusted keys." +#, fuzzy +#| msgid "Keyring of Debian archive removed trusted keys." +msgid "Keyring of Ubuntu archive removed trusted keys." msgstr "Składnica usuniętych zaufanych kluczy archiwum Debiana." #. type: Content of: <refentry><refsect1><para> @@@ -3362,19 -3346,19 +3366,19 @@@ msgstr "DPkg::Pre-Install-Pkgs {\"/usr/ #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:101 msgid "" - "In general the sample configuration file in <filename>&docdir;examples/apt." - "conf</filename> &configureindex; is a good guide for how it should look." + "In general the sample configuration file &configureindex; is a good guide " + "for how it should look." msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:105 + #: apt.conf.5.xml:104 msgid "" "Case is not significant in names of configuration items, so in the previous " "example you could use <literal>dpkg::pre-install-pkgs</literal>." msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:108 + #: apt.conf.5.xml:107 msgid "" "Names for the configuration items are optional if a list is defined as can " "be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If " @@@ -3384,7 -3368,7 +3388,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:113 + #: apt.conf.5.xml:112 msgid "" "Two special commands are defined: <literal>#include</literal> (which is " "deprecated and not supported by alternative implementations) and " @@@ -3396,7 -3380,7 +3400,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:123 + #: apt.conf.5.xml:122 msgid "" "The <literal>#clear</literal> command is the only way to delete a list or a " "complete scope. Reopening a scope (or using the syntax described below with " @@@ -3406,7 -3390,7 +3410,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:131 + #: apt.conf.5.xml:130 msgid "" "All of the APT tools take an -o option which allows an arbitrary " "configuration directive to be specified on the command line. The syntax is a " @@@ -3418,7 -3402,7 +3422,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:139 + #: apt.conf.5.xml:138 msgid "" "Note that appending items to a list using <literal>::</literal> only works " "for one item per line, and that you should not use it in combination with " @@@ -3435,19 -3419,19 +3439,19 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:154 + #: apt.conf.5.xml:153 msgid "The APT Group" msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:155 + #: apt.conf.5.xml:154 msgid "" "This group of options controls general APT behavior as well as holding the " "options for all of the tools." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:160 + #: apt.conf.5.xml:159 msgid "" "System Architecture; sets the architecture to use when fetching files and " "parsing package lists. The internal default is the architecture apt was " @@@ -3455,7 -3439,7 +3459,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:167 + #: apt.conf.5.xml:166 msgid "" "All Architectures the system supports. For instance, CPUs implementing the " "<literal>amd64</literal> (also called <literal>x86-64</literal>) " @@@ -3468,7 -3452,7 +3472,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:180 + #: apt.conf.5.xml:179 msgid "" "Default release to install packages from if more than one version is " "available. Contains release name, codename or release version. Examples: " @@@ -3477,14 -3461,14 +3481,14 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:186 + #: apt.conf.5.xml:185 msgid "" "Ignore held packages; this global option causes the problem resolver to " "ignore held packages in its decision making." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:191 + #: apt.conf.5.xml:190 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 " @@@ -3493,7 -3477,7 +3497,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:199 + #: apt.conf.5.xml:198 msgid "" "Defaults to on, which will cause APT to install essential and important " "packages as soon as possible in an install/upgrade operation, in order to " @@@ -3508,7 -3492,7 +3512,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:211 + #: apt.conf.5.xml:210 msgid "" "The immediate configuration marker is also applied in the potentially " "problematic case of circular dependencies, since a dependency with the " @@@ -3525,7 -3509,7 +3529,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:224 + #: apt.conf.5.xml:223 msgid "" "Before a big operation like <literal>dist-upgrade</literal> is run with this " "option disabled you should try to explicitly <literal>install</literal> the " @@@ -3536,7 -3520,7 +3540,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:235 + #: apt.conf.5.xml:234 msgid "" "Never enable this option unless you <emphasis>really</emphasis> know what " "you are doing. It permits APT to temporarily remove an essential package to " @@@ -3549,7 -3533,7 +3553,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:247 + #: apt.conf.5.xml:246 msgid "" "APT uses since version 0.7.26 a resizable memory mapped cache file to store " "the available information. <literal>Cache-Start</literal> acts as a hint of " @@@ -3569,38 -3553,38 +3573,38 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:263 + #: apt.conf.5.xml:262 msgid "Defines which packages are considered essential build dependencies." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:267 + #: apt.conf.5.xml:266 msgid "" "The Get subsection controls the &apt-get; tool; please see its documentation " "for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:272 + #: apt.conf.5.xml:271 msgid "" "The Cache subsection controls the &apt-cache; tool; please see its " "documentation for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:277 + #: apt.conf.5.xml:276 msgid "" "The CDROM subsection controls the &apt-cdrom; tool; please see its " "documentation for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:283 + #: apt.conf.5.xml:282 msgid "The Acquire Group" msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:284 + #: apt.conf.5.xml:283 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages as well as the various \"acquire methods\" responsible for the " @@@ -3608,7 -3592,7 +3612,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:291 + #: apt.conf.5.xml:290 msgid "" "Security related option defaulting to true, as giving a Release file's " "validation an expiration date prevents replay attacks over a long timescale, " @@@ -3621,7 -3605,7 +3625,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:304 + #: apt.conf.5.xml:303 msgid "" "Maximum time (in seconds) after its creation (as indicated by the " "<literal>Date</literal> header) that the <filename>Release</filename> file " @@@ -3633,7 -3617,7 +3637,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:316 + #: apt.conf.5.xml:315 msgid "" "Minimum time (in seconds) after its creation (as indicated by the " "<literal>Date</literal> header) that the <filename>Release</filename> file " @@@ -3645,7 -3629,7 +3649,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:328 + #: apt.conf.5.xml:327 msgid "" "Try to download deltas called <literal>PDiffs</literal> for indexes (like " "<filename>Packages</filename> files) instead of downloading whole ones. True " @@@ -3653,7 -3637,7 +3657,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:331 + #: apt.conf.5.xml:330 msgid "" "Two sub-options to limit the use of PDiffs are also available: " "<literal>FileLimit</literal> can be used to specify a maximum number of " @@@ -3664,7 -3648,7 +3668,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:341 + #: apt.conf.5.xml:340 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@@ -3674,21 -3658,21 +3678,21 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:349 + #: apt.conf.5.xml:348 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:354 + #: apt.conf.5.xml:353 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 "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:359 + #: apt.conf.5.xml:358 msgid "" "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. " "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</" @@@ -3700,7 -3684,7 +3704,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:367 + #: apt.conf.5.xml:366 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy not to use its cached " @@@ -3712,14 -3696,14 +3716,14 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:377 apt.conf.5.xml:449 + #: apt.conf.5.xml:376 apt.conf.5.xml:448 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method; this value applies to the connection as well as the data timeout." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:380 + #: apt.conf.5.xml:379 msgid "" "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to " "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e." @@@ -3731,14 -3715,14 +3735,14 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:387 + #: apt.conf.5.xml:386 msgid "" "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will " "follow redirects, which is enabled by default." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:390 + #: apt.conf.5.xml:389 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobytes. The default value is 0 " @@@ -3748,7 -3732,7 +3752,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:395 + #: apt.conf.5.xml:394 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 " @@@ -3756,7 -3740,7 +3760,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:403 + #: apt.conf.5.xml:402 msgid "" "The <literal>Cache-control</literal>, <literal>Timeout</literal>, " "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and " @@@ -3767,7 -3751,7 +3771,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:411 + #: apt.conf.5.xml:410 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is the " @@@ -3789,7 -3773,7 +3793,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:432 + #: apt.conf.5.xml:431 msgid "" "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs. " "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</" @@@ -3808,7 -3792,7 +3812,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:452 + #: apt.conf.5.xml:451 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, " @@@ -3818,7 -3802,7 +3822,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:459 + #: apt.conf.5.xml:458 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to an HTTP URL - see the discussion of the http " @@@ -3827,7 -3811,7 +3831,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:464 + #: apt.conf.5.xml:463 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@@ -3837,13 -3821,13 +3841,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout> - #: apt.conf.5.xml:478 + #: apt.conf.5.xml:477 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:473 + #: apt.conf.5.xml:472 msgid "" "For URIs using the <literal>cdrom</literal> method, the only configurable " "option is the mount point, <literal>cdrom::Mount</literal>, which must be " @@@ -3856,20 -3840,20 +3860,20 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:486 + #: apt.conf.5.xml:485 msgid "" "For GPGV URIs the only configurable option is <literal>gpgv::Options</" "literal>, which passes additional parameters to gpgv." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:497 + #: apt.conf.5.xml:496 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:492 + #: apt.conf.5.xml:491 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@@ -3881,19 -3865,19 +3885,19 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:502 + #: apt.conf.5.xml:501 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "Acquire::CompressionTypes::Order:: \"gz\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:505 + #: apt.conf.5.xml:504 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:498 + #: apt.conf.5.xml:497 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 " @@@ -3911,13 -3895,13 +3915,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout> - #: apt.conf.5.xml:512 + #: apt.conf.5.xml:511 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:507 + #: apt.conf.5.xml:506 msgid "" "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></" "literal> will be checked at run time. If this option has been set, the " @@@ -3932,7 -3916,7 +3936,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:517 + #: apt.conf.5.xml:516 msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " @@@ -3940,7 -3924,7 +3944,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:524 + #: apt.conf.5.xml:523 msgid "" "When downloading <literal>gzip</literal> compressed indexes (Packages, " "Sources, or Translations), keep them gzip compressed locally instead of " @@@ -3949,7 -3933,7 +3953,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:532 + #: apt.conf.5.xml:531 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the description-" @@@ -3961,13 -3945,13 +3965,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting> - #: apt.conf.5.xml:549 + #: apt.conf.5.xml:548 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:537 + #: apt.conf.5.xml:536 msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: it will be " @@@ -3989,7 -3973,7 +3993,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:550 + #: apt.conf.5.xml:549 msgid "" "Note: To prevent problems resulting from APT being executed in different " "environments (e.g. by different users or by other programs) all Translation " @@@ -3998,22 -3982,22 +4002,22 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:559 + #: apt.conf.5.xml:558 msgid "When downloading, force to use only the IPv4 protocol." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:565 + #: apt.conf.5.xml:564 msgid "When downloading, force to use only the IPv6 protocol." msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:572 + #: apt.conf.5.xml:571 msgid "Directories" msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:574 + #: apt.conf.5.xml:573 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@@ -4025,7 -4009,7 +4029,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:581 + #: apt.conf.5.xml:580 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@@ -4038,7 -4022,7 +4042,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:590 + #: apt.conf.5.xml:589 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@@ -4048,7 -4032,7 +4052,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:596 + #: apt.conf.5.xml:595 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 " @@@ -4056,7 -4040,7 +4060,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:600 + #: apt.conf.5.xml:599 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@@ -4067,7 -4051,7 +4071,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:608 + #: apt.conf.5.xml:607 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@@ -4080,7 -4064,7 +4084,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:621 + #: apt.conf.5.xml:620 msgid "" "The <literal>Ignore-Files-Silently</literal> list can be used to specify " "which files APT should silently ignore while parsing the files in the " @@@ -4091,12 -4075,12 +4095,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:630 + #: apt.conf.5.xml:629 msgid "APT in DSelect" msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:632 + #: apt.conf.5.xml:631 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behavior. These are in the <literal>DSelect</literal> " @@@ -4104,7 -4088,7 +4108,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:637 + #: apt.conf.5.xml:636 msgid "" "Cache Clean mode; this value may be one of <literal>always</literal>, " "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</" @@@ -4117,40 -4101,40 +4121,40 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:651 + #: apt.conf.5.xml:650 msgid "" "The contents of this variable are passed to &apt-get; as command line " "options when it is run for the install phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:656 + #: apt.conf.5.xml:655 msgid "" "The contents of this variable are passed to &apt-get; as command line " "options when it is run for the update phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:661 + #: apt.conf.5.xml:660 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:667 + #: apt.conf.5.xml:666 msgid "How APT calls &dpkg;" msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:668 + #: apt.conf.5.xml:667 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:673 + #: apt.conf.5.xml:672 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 " @@@ -4158,7 -4142,7 +4162,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:679 + #: apt.conf.5.xml:678 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 " @@@ -4167,7 -4151,7 +4171,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:686 + #: apt.conf.5.xml:685 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 " @@@ -4177,7 -4161,7 +4181,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:692 + #: apt.conf.5.xml:691 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@@ -4187,26 -4171,26 +4191,26 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:700 + #: apt.conf.5.xml:699 msgid "" "APT chdirs to this directory before invoking &dpkg;, the default is " "<filename>/</filename>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:705 + #: apt.conf.5.xml:704 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:710 + #: apt.conf.5.xml:709 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> - #: apt.conf.5.xml:711 + #: apt.conf.5.xml:710 msgid "" "APT can call &dpkg; in such a way as to let it make aggressive use of " "triggers over multiple calls of &dpkg;. Without further options &dpkg; will " @@@ -4221,7 -4205,7 +4225,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> - #: apt.conf.5.xml:726 + #: apt.conf.5.xml:725 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@@ -4235,7 -4219,7 +4239,7 @@@ msgstr " "DPkg::TriggersPending \"true\";" #. type: Content of: <refentry><refsect1><refsect2><para> - #: apt.conf.5.xml:720 + #: apt.conf.5.xml:719 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 " @@@ -4249,7 -4233,7 +4253,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:733 + #: apt.conf.5.xml:732 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 " @@@ -4262,7 -4246,7 +4266,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:741 + #: apt.conf.5.xml:740 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". The default value is \"<literal>all</literal>" @@@ -4279,7 -4263,7 +4283,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:756 + #: apt.conf.5.xml:755 msgid "" "If this option is set APT will call <command>dpkg --configure --pending</" "command> to let &dpkg; handle all required configurations and triggers. This " @@@ -4290,7 -4274,7 +4294,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:763 + #: apt.conf.5.xml:762 msgid "" "Useful for the <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal>, and " @@@ -4300,7 -4284,7 +4304,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> - #: apt.conf.5.xml:776 + #: apt.conf.5.xml:775 #, no-wrap msgid "" "OrderList::Score {\n" @@@ -4318,7 -4302,7 +4322,7 @@@ msgstr " "};" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:769 + #: apt.conf.5.xml:768 msgid "" "Essential packages (and their dependencies) should be configured immediately " "after unpacking. It is a good idea to do this quite early in the upgrade " @@@ -4332,12 -4316,12 +4336,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:789 + #: apt.conf.5.xml:788 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:790 + #: apt.conf.5.xml:789 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by the " @@@ -4346,13 -4330,13 +4350,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:798 + #: apt.conf.5.xml:797 #, fuzzy msgid "Debug options" msgstr "opcje" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:800 + #: apt.conf.5.xml:799 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@@ -4363,7 -4347,7 +4367,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> - #: apt.conf.5.xml:811 + #: apt.conf.5.xml:810 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@@ -4371,7 -4355,7 +4375,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> - #: apt.conf.5.xml:819 + #: apt.conf.5.xml:818 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@@ -4379,7 -4363,7 +4383,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> - #: apt.conf.5.xml:828 + #: apt.conf.5.xml:827 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@@ -4389,7 -4373,7 +4393,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:836 + #: apt.conf.5.xml:835 #, fuzzy msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " @@@ -4399,59 -4383,59 +4403,59 @@@ msgstr " "in CDROM IDs." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:846 + #: apt.conf.5.xml:845 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:855 + #: apt.conf.5.xml:854 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:866 + #: apt.conf.5.xml:865 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:877 + #: apt.conf.5.xml:876 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:888 + #: apt.conf.5.xml:887 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:899 + #: apt.conf.5.xml:898 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:910 + #: apt.conf.5.xml:909 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:920 + #: apt.conf.5.xml:919 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:930 + #: apt.conf.5.xml:929 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:940 + #: apt.conf.5.xml:939 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 " @@@ -4459,53 -4443,53 +4463,53 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:951 + #: apt.conf.5.xml:950 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><listitem><para> - #: apt.conf.5.xml:963 + #: apt.conf.5.xml:962 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:973 + #: apt.conf.5.xml:972 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:983 + #: apt.conf.5.xml:982 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><listitem><para> - #: apt.conf.5.xml:995 + #: apt.conf.5.xml:994 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><listitem><para> - #: apt.conf.5.xml:1006 + #: apt.conf.5.xml:1005 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1017 + #: apt.conf.5.xml:1016 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><listitem><para> - #: apt.conf.5.xml:1027 + #: apt.conf.5.xml:1026 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@@ -4515,7 -4499,7 +4519,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1041 + #: apt.conf.5.xml:1040 msgid "" "Generate debug messages describing which packages are marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@@ -4533,46 -4517,46 +4537,46 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1062 + #: apt.conf.5.xml:1061 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><listitem><para> - #: apt.conf.5.xml:1073 + #: apt.conf.5.xml:1072 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><listitem><para> - #: apt.conf.5.xml:1084 + #: apt.conf.5.xml:1083 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><listitem><para> - #: apt.conf.5.xml:1096 + #: apt.conf.5.xml:1095 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1107 + #: apt.conf.5.xml:1106 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1117 + #: apt.conf.5.xml:1116 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><listitem><para> - #: apt.conf.5.xml:1128 + #: apt.conf.5.xml:1127 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 " @@@ -4580,20 -4564,20 +4584,20 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1140 + #: apt.conf.5.xml:1139 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:1162 apt_preferences.5.xml:545 sources.list.5.xml:211 + #: apt.conf.5.xml:1161 apt_preferences.5.xml:545 sources.list.5.xml:211 #: apt-ftparchive.1.xml:596 msgid "Examples" msgstr "Przykłady" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:1163 + #: apt.conf.5.xml:1162 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@@ -4601,7 -4585,7 +4605,7 @@@ msgstr " #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:1175 + #: apt.conf.5.xml:1174 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." @@@ -6099,13 -6083,13 +6103,13 @@@ msgstr " #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:92 msgid "" - "<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)" - "</literal> which expands to the Debian architecture (such as <literal>amd64</" - "literal> or <literal>armel</literal>) 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." + "<literal>distribution</literal> may also contain a variable, <literal>" + "$(ARCH)</literal> which expands to the Debian architecture (such as " + "<literal>amd64</literal> or <literal>armel</literal>) 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>Dystrybucja</literal> może zawierać także zmienną <literal>$(ARCH)</" "literal>, która zostanie rozwinięta do architektury Debiana (takiej jak " @@@ -7414,9 -7398,9 +7418,9 @@@ msgstr "OPIS #: 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<aptitude>" - "(8) for the command line or B<synaptic>(8) for the X Window System. Some " - "options are only implemented in B<apt-get>(8) though." + "package management there are several frontends available, such as " + "B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window " + "System. Some options are only implemented in B<apt-get>(8) though." msgstr "" "APT jest systemem zarządzania pakietami oprogramowania. Jest kilka nakładek " "przydatnych do codziennego zarządzania pakietami, takich jak B<aptitude>(8), " @@@ -7702,8 -7686,8 +7706,8 @@@ msgstr " "Pierwszą rzeczą <footnote><p> Aby używać serwera proxy, należy najpierw " "ustawić zmienną środowiskową http_proxy, proszę przeczytać sources.list(5)</" "p></footnote>, którą należy zrobić przed użyciem <prgn>apt-get</prgn> jest " - "pobranie listy pakietów (ze <em>źródeł</em> wymienionych w pliku sources.list" - "(5)), tak żeby APT wiedział, jakie pakiety są dostępne. Robi się to za " + "pobranie listy pakietów (ze <em>źródeł</em> wymienionych w pliku sources." + "list(5)), tak żeby APT wiedział, jakie pakiety są dostępne. Robi się to za " "pomocą polecenia <tt>apt-get update</tt>. Na przykład:" #. type: <example></example> diff --combined doc/po/pt.po index 314b5771b,726b184d0..79d90d65b --- a/doc/po/pt.po +++ b/doc/po/pt.po @@@ -7,7 -7,7 +7,11 @@@ msgid " msgstr "" "Project-Id-Version: apt 0.9.7.1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" ++<<<<<<< HEAD +"POT-Creation-Date: 2013-04-30 10:29+0300\n" ++======= + "POT-Creation-Date: 2013-06-13 13:46+0300\n" ++>>>>>>> upstream/debian/sid "PO-Revision-Date: 2012-09-03 01:53+0100\n" "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n" "Language-Team: Portuguese <l10n@debianpt.org>\n" @@@ -809,9 -809,9 +813,9 @@@ msgid " "installation or upgrading. Each package is a package name, not a fully " "qualified filename (for instance, in a Debian system, <package>apt-utils</" "package> would be the argument provided, not <filename>apt-utils_&apt-" - "product-version;_amd64.deb</filename>). 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 " + "product-version;_amd64.deb</filename>). 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 " @@@ -1566,14 -1566,14 +1570,14 @@@ msgstr " #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125 - #: apt.conf.5.xml:1168 apt_preferences.5.xml:698 + #: apt.conf.5.xml:1167 apt_preferences.5.xml:698 msgid "Files" msgstr "Ficheiros" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 #: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109 - #: apt.conf.5.xml:1174 apt_preferences.5.xml:705 sources.list.5.xml:252 + #: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 #: apt-ftparchive.1.xml:607 msgid "See Also" @@@ -2276,19 -2276,12 +2280,19 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:130 +#, fuzzy +#| msgid "" +#| "Update the local keyring with the archive keyring and remove from the " +#| "local keyring the archive keys which are no longer valid. The archive " +#| "keyring is shipped in the <literal>archive-keyring</literal> package of " +#| "your distribution, e.g. the <literal>debian-archive-keyring</literal> " +#| "package in Debian." msgid "" "Update the local keyring with the archive keyring and remove from the local " "keyring the archive keys which are no longer valid. The archive keyring is " "shipped in the <literal>archive-keyring</literal> package of your " -"distribution, e.g. the <literal>debian-archive-keyring</literal> package in " -"Debian." +"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in " +"Ubuntu." msgstr "" "Actualiza o chaveiro local com o chaveiro do arquivo e remove do chaveiro " "local as chaves de arquivo que já não são válidas. O chaveiro do arquivo é " @@@ -2356,33 -2349,24 +2360,33 @@@ msgstr "Base de dados local de confianà #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:183 -msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" +#, fuzzy +#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" +msgid "<filename>/usr/share/keyrings/ubuntu-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:184 -msgid "Keyring of Debian archive trusted keys." +#, fuzzy +#| msgid "Keyring of Debian archive trusted keys." +msgid "Keyring of Ubuntu 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:187 +#, fuzzy +#| msgid "" +#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgid "" -"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" +"<filename>/usr/share/keyrings/ubuntu-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:188 -msgid "Keyring of Debian archive removed trusted keys." +#, fuzzy +#| msgid "Keyring of Debian archive removed trusted keys." +msgid "Keyring of Ubuntu archive removed trusted keys." msgstr "Chaveiro das chaves de confiança removidas dos arquivos Debian." #. type: Content of: <refentry><refsect1><para> @@@ -3275,14 -3259,14 +3279,14 @@@ msgstr "DPkg::Pre-Install-Pkgs {\"/usr/ #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:101 msgid "" - "In general the sample configuration file in <filename>&docdir;examples/apt." - "conf</filename> &configureindex; is a good guide for how it should look." + "In general the sample configuration file &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." + "Em geral o exemplo de ficheiro de configuração &configureindex; é um bom " + "guia de como deve ficar." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:105 + #: apt.conf.5.xml:104 msgid "" "Case is not significant in names of configuration items, so in the previous " "example you could use <literal>dpkg::pre-install-pkgs</literal>." @@@ -3292,7 -3276,7 +3296,7 @@@ msgstr " "pre-install-pkgs</literal>." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:108 + #: apt.conf.5.xml:107 msgid "" "Names for the configuration items are optional if a list is defined as can " "be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If " @@@ -3308,7 -3292,7 +3312,7 @@@ msgstr " "opção." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:113 + #: apt.conf.5.xml:112 msgid "" "Two special commands are defined: <literal>#include</literal> (which is " "deprecated and not supported by alternative implementations) and " @@@ -3328,7 -3312,7 +3332,7 @@@ msgstr " "acabar com um 'ponto e vírgula' (;) .)" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:123 + #: apt.conf.5.xml:122 msgid "" "The <literal>#clear</literal> command is the only way to delete a list or a " "complete scope. Reopening a scope (or using the syntax described below with " @@@ -3344,7 -3328,7 +3348,7 @@@ msgstr " "sobrepostos, apenas limpos." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:131 + #: apt.conf.5.xml:130 msgid "" "All of the APT tools take an -o option which allows an arbitrary " "configuration directive to be specified on the command line. The syntax is a " @@@ -3363,7 -3347,7 +3367,7 @@@ msgstr " "ser usada na linha de comandos.)" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:139 + #: apt.conf.5.xml:138 msgid "" "Note that appending items to a list using <literal>::</literal> only works " "for one item per line, and that you should not use it in combination with " @@@ -3393,12 -3377,12 +3397,12 @@@ msgstr " "explicitamente delas." #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:154 + #: apt.conf.5.xml:153 msgid "The APT Group" msgstr "O Grupo APT" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:155 + #: apt.conf.5.xml:154 msgid "" "This group of options controls general APT behavior as well as holding the " "options for all of the tools." @@@ -3407,7 -3391,7 +3411,7 @@@ msgstr " "as opções para todas as ferramentas." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:160 + #: apt.conf.5.xml:159 msgid "" "System Architecture; sets the architecture to use when fetching files and " "parsing package lists. The internal default is the architecture apt was " @@@ -3418,7 -3402,7 +3422,7 @@@ msgstr " "qual o APT foi compilado." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:167 + #: apt.conf.5.xml:166 msgid "" "All Architectures the system supports. For instance, CPUs implementing the " "<literal>amd64</literal> (also called <literal>x86-64</literal>) " @@@ -3440,7 -3424,7 +3444,7 @@@ msgstr " "<command>dpkg --add-architecture</command>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:180 + #: apt.conf.5.xml:179 msgid "" "Default release to install packages from if more than one version is " "available. Contains release name, codename or release version. Examples: " @@@ -3453,7 -3437,7 +3457,7 @@@ msgstr " "'&testing-codename;', '4.0', '5.0*'. Veja também &apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:186 + #: apt.conf.5.xml:185 msgid "" "Ignore held packages; this global option causes the problem resolver to " "ignore held packages in its decision making." @@@ -3462,7 -3446,7 +3466,7 @@@ msgstr " "os pacotes segurados sejam ignorados na sua decisão de marcação." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:191 + #: apt.conf.5.xml:190 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 " @@@ -3476,7 -3460,7 +3480,7 @@@ msgstr " "directo de os reinstalar." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:199 + #: apt.conf.5.xml:198 msgid "" "Defaults to on, which will cause APT to install essential and important " "packages as soon as possible in an install/upgrade operation, in order to " @@@ -3503,7 -3487,7 +3507,7 @@@ msgstr " "de A não está mais satisfeita." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:211 + #: apt.conf.5.xml:210 msgid "" "The immediate configuration marker is also applied in the potentially " "problematic case of circular dependencies, since a dependency with the " @@@ -3532,7 -3516,7 +3536,7 @@@ msgstr " "que pode ajudar a prevenir." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:224 + #: apt.conf.5.xml:223 msgid "" "Before a big operation like <literal>dist-upgrade</literal> is run with this " "option disabled you should try to explicitly <literal>install</literal> the " @@@ -3549,7 -3533,7 +3553,7 @@@ msgstr " "eles possa trabalhar em melhorar ou corrigir o processo de actualização." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:235 + #: apt.conf.5.xml:234 msgid "" "Never enable this option unless you <emphasis>really</emphasis> know what " "you are doing. It permits APT to temporarily remove an essential package to " @@@ -3570,7 -3554,7 +3574,7 @@@ msgstr " "command> ou nada de que esses pacotes dependam." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:247 + #: apt.conf.5.xml:246 msgid "" "APT uses since version 0.7.26 a resizable memory mapped cache file to store " "the available information. <literal>Cache-Start</literal> acts as a hint of " @@@ -3607,13 -3591,13 +3611,13 @@@ msgstr " "da cache é desactivado." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:263 + #: apt.conf.5.xml:262 msgid "Defines which packages are considered essential build dependencies." msgstr "" "Define quais pacotes são considerados dependências essenciais de compilação." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:267 + #: apt.conf.5.xml:266 msgid "" "The Get subsection controls the &apt-get; tool; please see its documentation " "for more information about the options here." @@@ -3622,7 -3606,7 +3626,7 @@@ msgstr " "documentação para mais informação acerca das opções daqui." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:272 + #: apt.conf.5.xml:271 msgid "" "The Cache subsection controls the &apt-cache; tool; please see its " "documentation for more information about the options here." @@@ -3631,7 -3615,7 +3635,7 @@@ msgstr " "documentação para mais informação acerca das opções daqui." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:277 + #: apt.conf.5.xml:276 msgid "" "The CDROM subsection controls the &apt-cdrom; tool; please see its " "documentation for more information about the options here." @@@ -3640,12 -3624,12 +3644,12 @@@ msgstr " "documentação para mais informação acerca das opções de aqui." #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:283 + #: apt.conf.5.xml:282 msgid "The Acquire Group" msgstr "O Grupo Acquire" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:284 + #: apt.conf.5.xml:283 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages as well as the various \"acquire methods\" responsible for the " @@@ -3656,7 -3640,7 +3660,7 @@@ msgstr " "descarga (veja também &sources-list;)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:291 + #: apt.conf.5.xml:290 msgid "" "Security related option defaulting to true, as giving a Release file's " "validation an expiration date prevents replay attacks over a long timescale, " @@@ -3678,7 -3662,7 +3682,7 @@@ msgstr " "seguinte." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:304 + #: apt.conf.5.xml:303 msgid "" "Maximum time (in seconds) after its creation (as indicated by the " "<literal>Date</literal> header) that the <filename>Release</filename> file " @@@ -3698,7 -3682,7 +3702,7 @@@ msgstr " "nome da opção." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:316 + #: apt.conf.5.xml:315 msgid "" "Minimum time (in seconds) after its creation (as indicated by the " "<literal>Date</literal> header) that the <filename>Release</filename> file " @@@ -3718,7 -3702,7 +3722,7 @@@ msgstr " "arquivo ao nome da opção." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:328 + #: apt.conf.5.xml:327 msgid "" "Try to download deltas called <literal>PDiffs</literal> for indexes (like " "<filename>Packages</filename> files) instead of downloading whole ones. True " @@@ -3729,7 -3713,7 +3733,7 @@@ msgstr " "por inteiro. Verdadeiro por predefinição." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:331 + #: apt.conf.5.xml:330 msgid "" "Two sub-options to limit the use of PDiffs are also available: " "<literal>FileLimit</literal> can be used to specify a maximum number of " @@@ -3747,7 -3731,7 +3751,7 @@@ msgstr " "completo em vez das patches." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:341 + #: apt.conf.5.xml:340 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@@ -3762,7 -3746,7 +3766,7 @@@ msgstr " "aberta uma ligação por tipo de URI." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:349 + #: apt.conf.5.xml:348 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." @@@ -3771,7 -3755,7 +3775,7 @@@ msgstr " "tentar, no número fornecido de vezes, obter ficheiros falhados." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:354 + #: apt.conf.5.xml:353 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." @@@ -3781,7 -3765,7 +3785,7 @@@ msgstr " "A predefinição é verdadeiro." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:359 + #: apt.conf.5.xml:358 msgid "" "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. " "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</" @@@ -3792,15 -3776,15 +3796,15 @@@ "be used." msgstr "" "<literal>http::Proxy</literal> define o proxy http predefinido a usar para " - "URIs de HTTP. Está no formato standard de <literal>http://[[user][:pass]@]" - "host[:port]/</literal>. Também podem 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>." + "URIs de HTTP. Está no formato standard de <literal>http://[[user][:" + "pass]@]host[:port]/</literal>. Também podem 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><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:367 + #: apt.conf.5.xml:366 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy not to use its cached " @@@ -3820,7 -3804,7 +3824,7 @@@ msgstr " "(grandes) ficheiros .deb." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:377 apt.conf.5.xml:449 + #: apt.conf.5.xml:376 apt.conf.5.xml:448 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method; this value applies to the connection as well as the data timeout." @@@ -3830,7 -3814,7 +3834,7 @@@ msgstr " "dados." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:380 + #: apt.conf.5.xml:379 msgid "" "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to " "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e." @@@ -3849,7 -3833,7 +3853,7 @@@ msgstr " "web e proxies que escolheram não respeitar a especificação HTTP/1.1." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:387 + #: apt.conf.5.xml:386 msgid "" "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will " "follow redirects, which is enabled by default." @@@ -3858,7 -3842,7 +3862,7 @@@ msgstr " "os redireccionamentos, o que está activo por predefinição." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:390 + #: apt.conf.5.xml:389 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobytes. The default value is 0 " @@@ -3873,7 -3857,7 +3877,7 @@@ msgstr " "de múltiplos servidores ao mesmo tempo.)" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:395 + #: apt.conf.5.xml:394 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 " @@@ -3885,7 -3869,7 +3889,7 @@@ msgstr " "identificador conhecido." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:403 + #: apt.conf.5.xml:402 msgid "" "The <literal>Cache-control</literal>, <literal>Timeout</literal>, " "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and " @@@ -3902,7 -3886,7 +3906,7 @@@ msgstr " "literal> ainda não é suportada." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:411 + #: apt.conf.5.xml:410 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is the " @@@ -3941,7 -3925,7 +3945,7 @@@ msgstr " "host>::SslForceVersion</literal> é a opção 'por máquina' correspondente." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:432 + #: apt.conf.5.xml:431 msgid "" "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs. " "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</" @@@ -3970,11 -3954,12 +3974,12 @@@ msgstr " "servidor proxy ao que se ligar. Por favor veja &configureindex; para um " "exemplo de como fazer isto. As variáveis de substituição que representam o " "componente URI correspondente 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>." + "$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal> <literal>" + "$(SITE_PASS)</literal> <literal>$(SITE)</literal> e <literal>$(SITE_PORT)</" + "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:452 + #: apt.conf.5.xml:451 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, " @@@ -3990,7 -3975,7 +3995,7 @@@ msgstr " "específica (veja a amostra de ficheiro de configuração para exemplos)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:459 + #: apt.conf.5.xml:458 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to an HTTP URL - see the discussion of the http " @@@ -4004,7 -3989,7 +4009,7 @@@ msgstr " "eficiência." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:464 + #: apt.conf.5.xml:463 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@@ -4019,13 -4004,13 +4024,13 @@@ msgstr " "ligações IPv4. Note que a maioria dos servidores FTP não suporta RFC2428." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout> - #: apt.conf.5.xml:478 + #: apt.conf.5.xml:477 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "/cdrom/::Mount \"foo\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:473 + #: apt.conf.5.xml:472 msgid "" "For URIs using the <literal>cdrom</literal> method, the only configurable " "option is the mount point, <literal>cdrom::Mount</literal>, which must be " @@@ -4046,7 -4031,7 +4051,7 @@@ msgstr " "barra final. Comandos para desmontar podem ser especificados usando o UMount." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:486 + #: apt.conf.5.xml:485 msgid "" "For GPGV URIs the only configurable option is <literal>gpgv::Options</" "literal>, which passes additional parameters to gpgv." @@@ -4055,13 -4040,13 +4060,13 @@@ msgstr " "literal>, a qual passa parâmetros adicionais ao gpgv." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:497 + #: apt.conf.5.xml:496 #, 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><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:492 + #: apt.conf.5.xml:491 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@@ -4080,19 -4065,19 +4085,19 @@@ msgstr " "alterado. A sintaxe para isto é: <placeholder type=\"synopsis\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:502 + #: apt.conf.5.xml:501 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "Acquire::CompressionTypes::Order:: \"gz\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:505 + #: apt.conf.5.xml:504 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:498 + #: apt.conf.5.xml:497 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 " @@@ -4124,13 -4109,13 +4129,13 @@@ msgstr " "automaticamente." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout> - #: apt.conf.5.xml:512 + #: apt.conf.5.xml:511 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:507 + #: apt.conf.5.xml:506 msgid "" "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></" "literal> will be checked at run time. If this option has been set, the " @@@ -4156,7 -4141,7 +4161,7 @@@ msgstr " "prefixar a lista com este tipo." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:517 + #: apt.conf.5.xml:516 msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " @@@ -4168,7 -4153,7 +4173,7 @@@ msgstr " "maioritariamente apenas para mirrors locais." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:524 + #: apt.conf.5.xml:523 msgid "" "When downloading <literal>gzip</literal> compressed indexes (Packages, " "Sources, or Translations), keep them gzip compressed locally instead of " @@@ -4181,7 -4166,7 +4186,7 @@@ msgstr " "CPU quando constrói as caches de pacotes locais. Falso por predefinição." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:532 + #: apt.conf.5.xml:531 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the description-" @@@ -4201,13 -4186,13 +4206,13 @@@ msgstr " "especialmenteraros." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting> - #: apt.conf.5.xml:549 + #: apt.conf.5.xml:548 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:537 + #: apt.conf.5.xml:536 msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: it will be " @@@ -4246,7 -4231,7 +4251,7 @@@ msgstr " "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:550 + #: apt.conf.5.xml:549 msgid "" "Note: To prevent problems resulting from APT being executed in different " "environments (e.g. by different users or by other programs) all Translation " @@@ -4260,22 -4245,22 +4265,22 @@@ msgstr " "literal>\" implícito)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:559 + #: apt.conf.5.xml:558 msgid "When downloading, force to use only the IPv4 protocol." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:565 + #: apt.conf.5.xml:564 msgid "When downloading, force to use only the IPv6 protocol." msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:572 + #: apt.conf.5.xml:571 msgid "Directories" msgstr "Directórios" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:574 + #: apt.conf.5.xml:573 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@@ -4294,7 -4279,7 +4299,7 @@@ msgstr " "items que não começam com <filename>/</filename> ou <filename>./</filename>." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:581 + #: apt.conf.5.xml:580 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@@ -4316,7 -4301,7 +4321,7 @@@ msgstr " "literal>" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:590 + #: apt.conf.5.xml:589 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@@ -4331,7 -4316,7 +4336,7 @@@ msgstr " "ficheiro de configuração especificado por <envar>APT_CONFIG</envar>)." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:596 + #: apt.conf.5.xml:595 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 " @@@ -4342,7 -4327,7 +4347,7 @@@ msgstr " "estar feito então é carregado o ficheiro de configuração principal." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:600 + #: apt.conf.5.xml:599 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@@ -4360,7 -4345,7 +4365,7 @@@ msgstr " "respectivos programas." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:608 + #: apt.conf.5.xml:607 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@@ -4381,7 -4366,7 +4386,7 @@@ msgstr " "procurado em <filename>/tmp/staging/var/lib/dpkg/status</filename>." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:621 + #: apt.conf.5.xml:620 msgid "" "The <literal>Ignore-Files-Silently</literal> list can be used to specify " "which files APT should silently ignore while parsing the files in the " @@@ -4399,12 -4384,12 +4404,12 @@@ msgstr " "expressão regular." #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:630 + #: apt.conf.5.xml:629 msgid "APT in DSelect" msgstr "APT em DSelect" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:632 + #: apt.conf.5.xml:631 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behavior. These are in the <literal>DSelect</literal> " @@@ -4415,7 -4400,7 +4420,7 @@@ msgstr " "<literal>DSelect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:637 + #: apt.conf.5.xml:636 msgid "" "Cache Clean mode; this value may be one of <literal>always</literal>, " "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</" @@@ -4437,7 -4422,7 +4442,7 @@@ msgstr " "pacotes." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:651 + #: apt.conf.5.xml:650 msgid "" "The contents of this variable are passed to &apt-get; as command line " "options when it is run for the install phase." @@@ -4446,7 -4431,7 +4451,7 @@@ msgstr " "comandos quando é corrido para a fase de instalação." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:656 + #: apt.conf.5.xml:655 msgid "" "The contents of this variable are passed to &apt-get; as command line " "options when it is run for the update phase." @@@ -4455,7 -4440,7 +4460,7 @@@ msgstr " "comandos quando é executado para a fase de actualização." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:661 + #: apt.conf.5.xml:660 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." @@@ -4464,12 -4449,12 +4469,12 @@@ msgstr " "continuar. A predefinição é avisar apenas em caso de erro." #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:667 + #: apt.conf.5.xml:666 msgid "How APT calls &dpkg;" msgstr "Como o APT chama o &dpkg;" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:668 + #: apt.conf.5.xml:667 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." @@@ -4478,7 -4463,7 +4483,7 @@@ msgstr " "&dpkg;. Estas estão na secção <literal>DPkg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:673 + #: apt.conf.5.xml:672 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 " @@@ -4489,7 -4474,7 +4494,7 @@@ msgstr " "um argumento único ao &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:679 + #: apt.conf.5.xml:678 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 " @@@ -4502,7 -4487,7 +4507,7 @@@ msgstr " "bin/sh</filename>, caso algum deles falhe, o APT irá abortar." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:686 + #: apt.conf.5.xml:685 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 " @@@ -4518,7 -4503,7 +4523,7 @@@ msgstr " "instalar, um por cada linha na entrada standard." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:692 + #: apt.conf.5.xml:691 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@@ -4533,7 -4518,7 +4538,7 @@@ msgstr " "dado ao <literal>Pre-Install-Pkgs</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:700 + #: apt.conf.5.xml:699 msgid "" "APT chdirs to this directory before invoking &dpkg;, the default is " "<filename>/</filename>." @@@ -4542,7 -4527,7 +4547,7 @@@ msgstr " "predefinição é <filename>/</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:705 + #: apt.conf.5.xml:704 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages; the " "default is to disable signing and produce all binaries." @@@ -4551,12 -4536,12 +4556,12 @@@ msgstr " "predefinição é desactivar a assinatura e produzir todos os binários." #. type: Content of: <refentry><refsect1><refsect2><title> - #: apt.conf.5.xml:710 + #: apt.conf.5.xml:709 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:711 + #: apt.conf.5.xml:710 msgid "" "APT can call &dpkg; in such a way as to let it make aggressive use of " "triggers over multiple calls of &dpkg;. Without further options &dpkg; will " @@@ -4582,7 -4567,7 +4587,7 @@@ msgstr " "100% enquanto na realidade está a configurar todos os pacotes." #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> - #: apt.conf.5.xml:726 + #: apt.conf.5.xml:725 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@@ -4596,7 -4581,7 +4601,7 @@@ msgstr " "DPkg::TriggersPending \"true\";" #. type: Content of: <refentry><refsect1><refsect2><para> - #: apt.conf.5.xml:720 + #: apt.conf.5.xml:719 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 " @@@ -4620,7 -4605,7 +4625,7 @@@ msgstr " "\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:733 + #: apt.conf.5.xml:732 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 " @@@ -4642,7 -4627,7 +4647,7 @@@ msgstr " "chamadas unpack e remove." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:741 + #: apt.conf.5.xml:740 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". The default value is \"<literal>all</literal>" @@@ -4672,7 -4657,7 +4677,7 @@@ msgstr " "arrancar." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:756 + #: apt.conf.5.xml:755 msgid "" "If this option is set APT will call <command>dpkg --configure --pending</" "command> to let &dpkg; handle all required configurations and triggers. This " @@@ -4690,7 -4675,7 +4695,7 @@@ msgstr " "esta opção em todas excepto na última execução." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:763 + #: apt.conf.5.xml:762 msgid "" "Useful for the <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal>, and " @@@ -4706,7 -4691,7 +4711,7 @@@ msgstr " "configurar este pacote." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> - #: apt.conf.5.xml:776 + #: apt.conf.5.xml:775 #, no-wrap msgid "" "OrderList::Score {\n" @@@ -4724,7 -4709,7 +4729,7 @@@ msgstr " "};" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:769 + #: apt.conf.5.xml:768 msgid "" "Essential packages (and their dependencies) should be configured immediately " "after unpacking. It is a good idea to do this quite early in the upgrade " @@@ -4748,12 -4733,12 +4753,12 @@@ msgstr " "predefinidos. <placeholder type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:789 + #: apt.conf.5.xml:788 msgid "Periodic and Archives options" msgstr "Opções Periodic e Archives" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:790 + #: apt.conf.5.xml:789 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by the " @@@ -4766,12 -4751,12 +4771,12 @@@ msgstr " "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:798 + #: apt.conf.5.xml:797 msgid "Debug options" msgstr "Opções de depuração" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:800 + #: apt.conf.5.xml:799 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@@ -4788,7 -4773,7 +4793,7 @@@ msgstr " "interesse para o utilizador normal, mas algumas podem ter:" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> - #: apt.conf.5.xml:811 + #: apt.conf.5.xml:810 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@@ -4799,7 -4784,7 +4804,7 @@@ msgstr " "remove, purge</literal>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> - #: apt.conf.5.xml:819 + #: apt.conf.5.xml:818 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@@ -4810,7 -4795,7 +4815,7 @@@ msgstr " "<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:828 + #: apt.conf.5.xml:827 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@@ -4822,7 -4807,7 +4827,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:836 + #: apt.conf.5.xml:835 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CD-ROM IDs." @@@ -4831,12 -4816,12 +4836,12 @@@ msgstr " "IDs de CD-ROM." #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:846 + #: apt.conf.5.xml:845 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><listitem><para> - #: apt.conf.5.xml:855 + #: apt.conf.5.xml:854 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" @@@ -4844,25 -4829,25 +4849,25 @@@ "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:866 + #: apt.conf.5.xml:865 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><listitem><para> - #: apt.conf.5.xml:877 + #: apt.conf.5.xml:876 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><listitem><para> - #: apt.conf.5.xml:888 + #: apt.conf.5.xml:887 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><listitem><para> - #: apt.conf.5.xml:899 + #: apt.conf.5.xml:898 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@@ -4871,7 -4856,7 +4876,7 @@@ msgstr " "criptográficas usando <literal>gpg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:910 + #: apt.conf.5.xml:909 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." @@@ -4880,13 -4865,13 +4885,13 @@@ msgstr " "armazenados em CD-ROMs." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:920 + #: apt.conf.5.xml:919 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><listitem><para> - #: apt.conf.5.xml:930 + #: apt.conf.5.xml:929 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." @@@ -4895,7 -4880,7 +4900,7 @@@ msgstr " "<literal>apt</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:940 + #: apt.conf.5.xml:939 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 " @@@ -4906,7 -4891,7 +4911,7 @@@ msgstr " "para um CD-ROM." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:951 + #: apt.conf.5.xml:950 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." @@@ -4916,14 -4901,14 +4921,14 @@@ msgstr " "literal></quote> ao mesmo tempo." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:963 + #: apt.conf.5.xml:962 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><listitem><para> - #: apt.conf.5.xml:973 + #: apt.conf.5.xml:972 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." @@@ -4932,7 -4917,7 +4937,7 @@@ msgstr " "checksums e assinaturas criptográficas dos ficheiros descarregados." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:983 + #: apt.conf.5.xml:982 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." @@@ -4942,7 -4927,7 +4947,7 @@@ msgstr " "pacote." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:995 + #: apt.conf.5.xml:994 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." @@@ -4951,7 -4936,7 +4956,7 @@@ msgstr " "do apt quando se descarrega diffs de índice em vez de índices completos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1006 + #: apt.conf.5.xml:1005 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" @@@ -4959,7 -4944,7 +4964,7 @@@ "downloads." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1017 + #: apt.conf.5.xml:1016 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." @@@ -4968,7 -4953,7 +4973,7 @@@ msgstr " "de pacotes e com a remoção de pacotes não utilizados." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1027 + #: apt.conf.5.xml:1026 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@@ -4983,7 -4968,7 +4988,7 @@@ msgstr " "literal>; veja <literal>Debug::pkgProblemResolver</literal> para isso." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1041 + #: apt.conf.5.xml:1040 msgid "" "Generate debug messages describing which packages are marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@@ -5014,7 -4999,7 +5019,7 @@@ msgstr " "pacote aparece." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1062 + #: apt.conf.5.xml:1061 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." @@@ -5024,7 -5009,7 +5029,7 @@@ msgstr " "único." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1073 + #: apt.conf.5.xml:1072 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." @@@ -5033,7 -5018,7 +5038,7 @@@ msgstr " "estado e quaisquer erros encontrados enquanto os analisa." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1084 + #: apt.conf.5.xml:1083 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." @@@ -5042,7 -5027,7 +5047,7 @@@ msgstr " "literal> deve passar os pacotes ao &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1096 + #: apt.conf.5.xml:1095 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" @@@ -5050,12 -5035,12 +5055,12 @@@ "&dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1107 + #: apt.conf.5.xml:1106 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><listitem><para> - #: apt.conf.5.xml:1117 + #: apt.conf.5.xml:1116 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." @@@ -5064,7 -5049,7 +5069,7 @@@ msgstr " "acontece quando é encontrado um problema de dependências complexo)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1128 + #: apt.conf.5.xml:1127 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 " @@@ -5075,7 -5060,7 +5080,7 @@@ msgstr " "mesma que é descrita em <literal>Debug::pkgDepCache::Marker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1140 + #: apt.conf.5.xml:1139 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@@ -5084,13 -5069,13 +5089,13 @@@ msgstr " "vendors.list</filename>." #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:1162 apt_preferences.5.xml:545 sources.list.5.xml:211 + #: apt.conf.5.xml:1161 apt_preferences.5.xml:545 sources.list.5.xml:211 #: apt-ftparchive.1.xml:596 msgid "Examples" msgstr "Exemplos" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:1163 + #: apt.conf.5.xml:1162 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@@ -5100,7 -5085,7 +5105,7 @@@ msgstr " #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:1175 + #: apt.conf.5.xml:1174 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." @@@ -6599,13 -6584,13 +6604,13 @@@ msgstr " #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:92 msgid "" - "<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)" - "</literal> which expands to the Debian architecture (such as <literal>amd64</" - "literal> or <literal>armel</literal>) 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." + "<literal>distribution</literal> may also contain a variable, <literal>" + "$(ARCH)</literal> which expands to the Debian architecture (such as " + "<literal>amd64</literal> or <literal>armel</literal>) 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 (tal como " @@@ -8102,9 -8087,9 +8107,9 @@@ msgstr "DESCRIÇÃO #: 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<aptitude>" - "(8) for the command line or B<synaptic>(8) for the X Window System. Some " - "options are only implemented in B<apt-get>(8) though." + "package management there are several frontends available, such as " + "B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window " + "System. Some options are only implemented in B<apt-get>(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 " @@@ -8383,11 -8368,11 +8388,11 @@@ msgid " "instance," msgstr "" "O primeira <footnote><p>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)" - "</p></footnote> coisa que deve ser feita antes de usar <prgn>apt-get</prgn> " - "é obter as listas de pacotes a partir das <em>Sources</em> para que ele " - "saiba que pacotes estão disponíveis. Isto é feito com <tt>apt-get update</" - "tt>. Por exemplo," + "que definir a variável de ambiente http_proxy primeiro, veja sources." + "list(5)</p></footnote> coisa que deve ser feita antes de usar <prgn>apt-get</" + "prgn> é obter as listas de pacotes a partir das <em>Sources</em> para que " + "ele saiba que pacotes estão disponíveis. Isto é feito com <tt>apt-get " + "update</tt>. Por exemplo," #. type: <example></example> #: guide.sgml:116 diff --combined doc/po/pt_BR.po index d2f597a6a,00619cd22..a415d9528 --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@@ -10,7 -10,7 +10,11 @@@ msgid " msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" ++<<<<<<< HEAD +"POT-Creation-Date: 2013-04-30 10:29+0300\n" ++======= + "POT-Creation-Date: 2013-06-13 13:46+0300\n" ++>>>>>>> upstream/debian/sid "PO-Revision-Date: 2004-09-20 17:02+0000\n" "Last-Translator: André Luís Lopes <andrelop@debian.org>\n" "Language-Team: <debian-l10n-portuguese@lists.debian.org>\n" @@@ -586,9 -586,9 +590,9 @@@ msgid " "installation or upgrading. Each package is a package name, not a fully " "qualified filename (for instance, in a Debian system, <package>apt-utils</" "package> would be the argument provided, not <filename>apt-utils_&apt-" - "product-version;_amd64.deb</filename>). 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 " + "product-version;_amd64.deb</filename>). 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 " @@@ -1091,14 -1091,14 +1095,14 @@@ msgstr " #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125 - #: apt.conf.5.xml:1168 apt_preferences.5.xml:698 + #: apt.conf.5.xml:1167 apt_preferences.5.xml:698 msgid "Files" msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 #: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109 - #: apt.conf.5.xml:1174 apt_preferences.5.xml:705 sources.list.5.xml:252 + #: apt.conf.5.xml:1173 apt_preferences.5.xml:705 sources.list.5.xml:252 #: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 #: apt-ftparchive.1.xml:607 #, fuzzy @@@ -1618,8 -1618,8 +1622,8 @@@ msgid " "Update the local keyring with the archive keyring and remove from the local " "keyring the archive keys which are no longer valid. The archive keyring is " "shipped in the <literal>archive-keyring</literal> package of your " -"distribution, e.g. the <literal>debian-archive-keyring</literal> package in " -"Debian." +"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in " +"Ubuntu." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@@ -1669,23 -1669,23 +1673,23 @@@ msgstr " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:183 -msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" +msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:184 -msgid "Keyring of Debian archive trusted keys." +msgid "Keyring of Ubuntu archive trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:187 msgid "" -"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" +"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:188 -msgid "Keyring of Debian archive removed trusted keys." +msgid "Keyring of Ubuntu archive removed trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><para> @@@ -2340,19 -2340,19 +2344,19 @@@ msgstr " #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:101 msgid "" - "In general the sample configuration file in <filename>&docdir;examples/apt." - "conf</filename> &configureindex; is a good guide for how it should look." + "In general the sample configuration file &configureindex; is a good guide " + "for how it should look." msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:105 + #: apt.conf.5.xml:104 msgid "" "Case is not significant in names of configuration items, so in the previous " "example you could use <literal>dpkg::pre-install-pkgs</literal>." msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:108 + #: apt.conf.5.xml:107 msgid "" "Names for the configuration items are optional if a list is defined as can " "be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If " @@@ -2362,7 -2362,7 +2366,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:113 + #: apt.conf.5.xml:112 msgid "" "Two special commands are defined: <literal>#include</literal> (which is " "deprecated and not supported by alternative implementations) and " @@@ -2374,7 -2374,7 +2378,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:123 + #: apt.conf.5.xml:122 msgid "" "The <literal>#clear</literal> command is the only way to delete a list or a " "complete scope. Reopening a scope (or using the syntax described below with " @@@ -2384,7 -2384,7 +2388,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:131 + #: apt.conf.5.xml:130 msgid "" "All of the APT tools take an -o option which allows an arbitrary " "configuration directive to be specified on the command line. The syntax is a " @@@ -2396,7 -2396,7 +2400,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:139 + #: apt.conf.5.xml:138 msgid "" "Note that appending items to a list using <literal>::</literal> only works " "for one item per line, and that you should not use it in combination with " @@@ -2413,19 -2413,19 +2417,19 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:154 + #: apt.conf.5.xml:153 msgid "The APT Group" msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:155 + #: apt.conf.5.xml:154 msgid "" "This group of options controls general APT behavior as well as holding the " "options for all of the tools." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:160 + #: apt.conf.5.xml:159 msgid "" "System Architecture; sets the architecture to use when fetching files and " "parsing package lists. The internal default is the architecture apt was " @@@ -2433,7 -2433,7 +2437,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:167 + #: apt.conf.5.xml:166 msgid "" "All Architectures the system supports. For instance, CPUs implementing the " "<literal>amd64</literal> (also called <literal>x86-64</literal>) " @@@ -2446,7 -2446,7 +2450,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:180 + #: apt.conf.5.xml:179 msgid "" "Default release to install packages from if more than one version is " "available. Contains release name, codename or release version. Examples: " @@@ -2455,14 -2455,14 +2459,14 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:186 + #: apt.conf.5.xml:185 msgid "" "Ignore held packages; this global option causes the problem resolver to " "ignore held packages in its decision making." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:191 + #: apt.conf.5.xml:190 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 " @@@ -2471,7 -2471,7 +2475,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:199 + #: apt.conf.5.xml:198 msgid "" "Defaults to on, which will cause APT to install essential and important " "packages as soon as possible in an install/upgrade operation, in order to " @@@ -2486,7 -2486,7 +2490,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:211 + #: apt.conf.5.xml:210 msgid "" "The immediate configuration marker is also applied in the potentially " "problematic case of circular dependencies, since a dependency with the " @@@ -2503,7 -2503,7 +2507,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:224 + #: apt.conf.5.xml:223 msgid "" "Before a big operation like <literal>dist-upgrade</literal> is run with this " "option disabled you should try to explicitly <literal>install</literal> the " @@@ -2514,7 -2514,7 +2518,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:235 + #: apt.conf.5.xml:234 msgid "" "Never enable this option unless you <emphasis>really</emphasis> know what " "you are doing. It permits APT to temporarily remove an essential package to " @@@ -2527,7 -2527,7 +2531,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:247 + #: apt.conf.5.xml:246 msgid "" "APT uses since version 0.7.26 a resizable memory mapped cache file to store " "the available information. <literal>Cache-Start</literal> acts as a hint of " @@@ -2547,38 -2547,38 +2551,38 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:263 + #: apt.conf.5.xml:262 msgid "Defines which packages are considered essential build dependencies." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:267 + #: apt.conf.5.xml:266 msgid "" "The Get subsection controls the &apt-get; tool; please see its documentation " "for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:272 + #: apt.conf.5.xml:271 msgid "" "The Cache subsection controls the &apt-cache; tool; please see its " "documentation for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:277 + #: apt.conf.5.xml:276 msgid "" "The CDROM subsection controls the &apt-cdrom; tool; please see its " "documentation for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:283 + #: apt.conf.5.xml:282 msgid "The Acquire Group" msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:284 + #: apt.conf.5.xml:283 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages as well as the various \"acquire methods\" responsible for the " @@@ -2586,7 -2586,7 +2590,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:291 + #: apt.conf.5.xml:290 msgid "" "Security related option defaulting to true, as giving a Release file's " "validation an expiration date prevents replay attacks over a long timescale, " @@@ -2599,7 -2599,7 +2603,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:304 + #: apt.conf.5.xml:303 msgid "" "Maximum time (in seconds) after its creation (as indicated by the " "<literal>Date</literal> header) that the <filename>Release</filename> file " @@@ -2611,7 -2611,7 +2615,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:316 + #: apt.conf.5.xml:315 msgid "" "Minimum time (in seconds) after its creation (as indicated by the " "<literal>Date</literal> header) that the <filename>Release</filename> file " @@@ -2623,7 -2623,7 +2627,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:328 + #: apt.conf.5.xml:327 msgid "" "Try to download deltas called <literal>PDiffs</literal> for indexes (like " "<filename>Packages</filename> files) instead of downloading whole ones. True " @@@ -2631,7 -2631,7 +2635,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:331 + #: apt.conf.5.xml:330 msgid "" "Two sub-options to limit the use of PDiffs are also available: " "<literal>FileLimit</literal> can be used to specify a maximum number of " @@@ -2642,7 -2642,7 +2646,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:341 + #: apt.conf.5.xml:340 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@@ -2652,21 -2652,21 +2656,21 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:349 + #: apt.conf.5.xml:348 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:354 + #: apt.conf.5.xml:353 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 "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:359 + #: apt.conf.5.xml:358 msgid "" "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. " "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</" @@@ -2678,7 -2678,7 +2682,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:367 + #: apt.conf.5.xml:366 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy not to use its cached " @@@ -2690,14 -2690,14 +2694,14 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:377 apt.conf.5.xml:449 + #: apt.conf.5.xml:376 apt.conf.5.xml:448 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method; this value applies to the connection as well as the data timeout." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:380 + #: apt.conf.5.xml:379 msgid "" "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to " "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e." @@@ -2709,14 -2709,14 +2713,14 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:387 + #: apt.conf.5.xml:386 msgid "" "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will " "follow redirects, which is enabled by default." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:390 + #: apt.conf.5.xml:389 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobytes. The default value is 0 " @@@ -2726,7 -2726,7 +2730,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:395 + #: apt.conf.5.xml:394 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 " @@@ -2734,7 -2734,7 +2738,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:403 + #: apt.conf.5.xml:402 msgid "" "The <literal>Cache-control</literal>, <literal>Timeout</literal>, " "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and " @@@ -2745,7 -2745,7 +2749,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:411 + #: apt.conf.5.xml:410 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is the " @@@ -2767,7 -2767,7 +2771,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:432 + #: apt.conf.5.xml:431 msgid "" "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs. " "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</" @@@ -2786,7 -2786,7 +2790,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:452 + #: apt.conf.5.xml:451 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, " @@@ -2796,7 -2796,7 +2800,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:459 + #: apt.conf.5.xml:458 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to an HTTP URL - see the discussion of the http " @@@ -2805,7 -2805,7 +2809,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:464 + #: apt.conf.5.xml:463 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@@ -2815,13 -2815,13 +2819,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout> - #: apt.conf.5.xml:478 + #: apt.conf.5.xml:477 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:473 + #: apt.conf.5.xml:472 msgid "" "For URIs using the <literal>cdrom</literal> method, the only configurable " "option is the mount point, <literal>cdrom::Mount</literal>, which must be " @@@ -2834,20 -2834,20 +2838,20 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:486 + #: apt.conf.5.xml:485 msgid "" "For GPGV URIs the only configurable option is <literal>gpgv::Options</" "literal>, which passes additional parameters to gpgv." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:497 + #: apt.conf.5.xml:496 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:492 + #: apt.conf.5.xml:491 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@@ -2859,19 -2859,19 +2863,19 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:502 + #: apt.conf.5.xml:501 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis> - #: apt.conf.5.xml:505 + #: apt.conf.5.xml:504 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:498 + #: apt.conf.5.xml:497 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 " @@@ -2889,13 -2889,13 +2893,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout> - #: apt.conf.5.xml:512 + #: apt.conf.5.xml:511 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:507 + #: apt.conf.5.xml:506 msgid "" "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></" "literal> will be checked at run time. If this option has been set, the " @@@ -2910,7 -2910,7 +2914,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:517 + #: apt.conf.5.xml:516 msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " @@@ -2918,7 -2918,7 +2922,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:524 + #: apt.conf.5.xml:523 msgid "" "When downloading <literal>gzip</literal> compressed indexes (Packages, " "Sources, or Translations), keep them gzip compressed locally instead of " @@@ -2927,7 -2927,7 +2931,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:532 + #: apt.conf.5.xml:531 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the description-" @@@ -2939,13 -2939,13 +2943,13 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting> - #: apt.conf.5.xml:549 + #: apt.conf.5.xml:548 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:537 + #: apt.conf.5.xml:536 msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: it will be " @@@ -2967,7 -2967,7 +2971,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:550 + #: apt.conf.5.xml:549 msgid "" "Note: To prevent problems resulting from APT being executed in different " "environments (e.g. by different users or by other programs) all Translation " @@@ -2976,22 -2976,22 +2980,22 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:559 + #: apt.conf.5.xml:558 msgid "When downloading, force to use only the IPv4 protocol." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:565 + #: apt.conf.5.xml:564 msgid "When downloading, force to use only the IPv6 protocol." msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:572 + #: apt.conf.5.xml:571 msgid "Directories" msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:574 + #: apt.conf.5.xml:573 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@@ -3003,7 -3003,7 +3007,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:581 + #: apt.conf.5.xml:580 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@@ -3016,7 -3016,7 +3020,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:590 + #: apt.conf.5.xml:589 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@@ -3026,7 -3026,7 +3030,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:596 + #: apt.conf.5.xml:595 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 " @@@ -3034,7 -3034,7 +3038,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:600 + #: apt.conf.5.xml:599 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@@ -3045,7 -3045,7 +3049,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:608 + #: apt.conf.5.xml:607 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@@ -3058,7 -3058,7 +3062,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:621 + #: apt.conf.5.xml:620 msgid "" "The <literal>Ignore-Files-Silently</literal> list can be used to specify " "which files APT should silently ignore while parsing the files in the " @@@ -3069,12 -3069,12 +3073,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:630 + #: apt.conf.5.xml:629 msgid "APT in DSelect" msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:632 + #: apt.conf.5.xml:631 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behavior. These are in the <literal>DSelect</literal> " @@@ -3082,7 -3082,7 +3086,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:637 + #: apt.conf.5.xml:636 msgid "" "Cache Clean mode; this value may be one of <literal>always</literal>, " "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</" @@@ -3095,40 -3095,40 +3099,40 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:651 + #: apt.conf.5.xml:650 msgid "" "The contents of this variable are passed to &apt-get; as command line " "options when it is run for the install phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:656 + #: apt.conf.5.xml:655 msgid "" "The contents of this variable are passed to &apt-get; as command line " "options when it is run for the update phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:661 + #: apt.conf.5.xml:660 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:667 + #: apt.conf.5.xml:666 msgid "How APT calls &dpkg;" msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:668 + #: apt.conf.5.xml:667 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:673 + #: apt.conf.5.xml:672 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 " @@@ -3136,7 -3136,7 +3140,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:679 + #: apt.conf.5.xml:678 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 " @@@ -3145,7 -3145,7 +3149,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:686 + #: apt.conf.5.xml:685 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 " @@@ -3155,7 -3155,7 +3159,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:692 + #: apt.conf.5.xml:691 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@@ -3165,26 -3165,26 +3169,26 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:700 + #: apt.conf.5.xml:699 msgid "" "APT chdirs to this directory before invoking &dpkg;, the default is " "<filename>/</filename>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:705 + #: apt.conf.5.xml:704 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:710 + #: apt.conf.5.xml:709 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> - #: apt.conf.5.xml:711 + #: apt.conf.5.xml:710 msgid "" "APT can call &dpkg; in such a way as to let it make aggressive use of " "triggers over multiple calls of &dpkg;. Without further options &dpkg; will " @@@ -3199,7 -3199,7 +3203,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> - #: apt.conf.5.xml:726 + #: apt.conf.5.xml:725 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@@ -3209,7 -3209,7 +3213,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> - #: apt.conf.5.xml:720 + #: apt.conf.5.xml:719 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 " @@@ -3223,7 -3223,7 +3227,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:733 + #: apt.conf.5.xml:732 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 " @@@ -3236,7 -3236,7 +3240,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:741 + #: apt.conf.5.xml:740 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". The default value is \"<literal>all</literal>" @@@ -3253,7 -3253,7 +3257,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:756 + #: apt.conf.5.xml:755 msgid "" "If this option is set APT will call <command>dpkg --configure --pending</" "command> to let &dpkg; handle all required configurations and triggers. This " @@@ -3264,7 -3264,7 +3268,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:763 + #: apt.conf.5.xml:762 msgid "" "Useful for the <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal>, and " @@@ -3274,7 -3274,7 +3278,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> - #: apt.conf.5.xml:776 + #: apt.conf.5.xml:775 #, no-wrap msgid "" "OrderList::Score {\n" @@@ -3286,7 -3286,7 +3290,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:769 + #: apt.conf.5.xml:768 msgid "" "Essential packages (and their dependencies) should be configured immediately " "after unpacking. It is a good idea to do this quite early in the upgrade " @@@ -3300,12 -3300,12 +3304,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:789 + #: apt.conf.5.xml:788 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:790 + #: apt.conf.5.xml:789 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by the " @@@ -3314,12 -3314,12 +3318,12 @@@ msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:798 + #: apt.conf.5.xml:797 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:800 + #: apt.conf.5.xml:799 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@@ -3330,7 -3330,7 +3334,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> - #: apt.conf.5.xml:811 + #: apt.conf.5.xml:810 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@@ -3338,7 -3338,7 +3342,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> - #: apt.conf.5.xml:819 + #: apt.conf.5.xml:818 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@@ -3346,7 -3346,7 +3350,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> - #: apt.conf.5.xml:828 + #: apt.conf.5.xml:827 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@@ -3356,66 -3356,66 +3360,66 @@@ 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:836 + #: apt.conf.5.xml:835 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CD-ROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:846 + #: apt.conf.5.xml:845 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:855 + #: apt.conf.5.xml:854 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:866 + #: apt.conf.5.xml:865 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:877 + #: apt.conf.5.xml:876 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:888 + #: apt.conf.5.xml:887 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:899 + #: apt.conf.5.xml:898 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:910 + #: apt.conf.5.xml:909 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:920 + #: apt.conf.5.xml:919 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:930 + #: apt.conf.5.xml:929 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:940 + #: apt.conf.5.xml:939 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 " @@@ -3423,53 -3423,53 +3427,53 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:951 + #: apt.conf.5.xml:950 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><listitem><para> - #: apt.conf.5.xml:963 + #: apt.conf.5.xml:962 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:973 + #: apt.conf.5.xml:972 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:983 + #: apt.conf.5.xml:982 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><listitem><para> - #: apt.conf.5.xml:995 + #: apt.conf.5.xml:994 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><listitem><para> - #: apt.conf.5.xml:1006 + #: apt.conf.5.xml:1005 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1017 + #: apt.conf.5.xml:1016 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><listitem><para> - #: apt.conf.5.xml:1027 + #: apt.conf.5.xml:1026 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@@ -3479,7 -3479,7 +3483,7 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1041 + #: apt.conf.5.xml:1040 msgid "" "Generate debug messages describing which packages are marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@@ -3497,46 -3497,46 +3501,46 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1062 + #: apt.conf.5.xml:1061 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><listitem><para> - #: apt.conf.5.xml:1073 + #: apt.conf.5.xml:1072 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><listitem><para> - #: apt.conf.5.xml:1084 + #: apt.conf.5.xml:1083 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><listitem><para> - #: apt.conf.5.xml:1096 + #: apt.conf.5.xml:1095 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1107 + #: apt.conf.5.xml:1106 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1117 + #: apt.conf.5.xml:1116 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><listitem><para> - #: apt.conf.5.xml:1128 + #: apt.conf.5.xml:1127 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 " @@@ -3544,21 -3544,21 +3548,21 @@@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> - #: apt.conf.5.xml:1140 + #: apt.conf.5.xml:1139 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." msgstr "" #. type: Content of: <refentry><refsect1><title> - #: apt.conf.5.xml:1162 apt_preferences.5.xml:545 sources.list.5.xml:211 + #: apt.conf.5.xml:1161 apt_preferences.5.xml:545 sources.list.5.xml:211 #: apt-ftparchive.1.xml:596 #, fuzzy msgid "Examples" msgstr "Exemplos" #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:1163 + #: apt.conf.5.xml:1162 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@@ -3566,7 -3566,7 +3570,7 @@@ msgstr " #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> - #: apt.conf.5.xml:1175 + #: apt.conf.5.xml:1174 #, fuzzy msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" @@@ -4839,8 -4839,8 +4843,8 @@@ msgid " "id=\"0\"/>" msgstr "" "Com um arquivo &sources-list; adequado e o arquivo de preferências do APT " - "acima, quaisquer dos comandos a seguir farão com que o APT atualize para a" - "(s) última(s) versão(ões) <literal>testing</literal>." + "acima, quaisquer dos comandos a seguir farão com que o APT atualize para " + "a(s) última(s) versão(ões) <literal>testing</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> #: apt_preferences.5.xml:633 @@@ -5060,13 -5060,13 +5064,13 @@@ msgstr " #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:92 msgid "" - "<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)" - "</literal> which expands to the Debian architecture (such as <literal>amd64</" - "literal> or <literal>armel</literal>) 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." + "<literal>distribution</literal> may also contain a variable, <literal>" + "$(ARCH)</literal> which expands to the Debian architecture (such as " + "<literal>amd64</literal> or <literal>armel</literal>) 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 "" #. type: Content of: <refentry><refsect1><para> @@@ -6187,9 -6187,9 +6191,9 @@@ msgstr " #: 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<aptitude>" - "(8) for the command line or B<synaptic>(8) for the X Window System. Some " - "options are only implemented in B<apt-get>(8) though." + "package management there are several frontends available, such as " + "B<aptitude>(8) for the command line or B<synaptic>(8) for the X Window " + "System. Some options are only implemented in B<apt-get>(8) though." msgstr "" #. type: SH diff --combined po/apt-all.pot index f0c430fef,1bfca4088..518844781 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@@ -5,9 -5,9 +5,15 @@@ #, fuzzy msgid "" msgstr "" ++<<<<<<< HEAD +"Project-Id-Version: apt 0.9.7.7ubuntu3\n" +"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" +"POT-Creation-Date: 2013-04-11 14:52+0200\n" ++======= + "Project-Id-Version: apt 0.9.8.1\n" + "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" + "POT-Creation-Date: 2013-06-26 07:37+0200\n" ++>>>>>>> upstream/debian/sid "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@@ -94,72 -94,72 +100,77 @@@ msgstr " msgid "Package file %s is out of sync." msgstr "" - #: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382 - #: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46 + #: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1422 + #: cmdline/apt-cache.cc:1424 cmdline/apt-cache.cc:1501 cmdline/apt-mark.cc:46 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "" - #: cmdline/apt-cache.cc:1226 + #: cmdline/apt-cache.cc:1243 msgid "You must give at least one search pattern" msgstr "" - #: cmdline/apt-cache.cc:1361 + #: cmdline/apt-cache.cc:1401 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" - #: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 + #: cmdline/apt-cache.cc:1496 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "" - #: cmdline/apt-cache.cc:1486 + #: cmdline/apt-cache.cc:1526 msgid "Package files:" msgstr "" - #: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584 + #: cmdline/apt-cache.cc:1533 cmdline/apt-cache.cc:1624 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" #. Show any packages have explicit pins - #: cmdline/apt-cache.cc:1507 + #: cmdline/apt-cache.cc:1547 msgid "Pinned packages:" msgstr "" - #: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564 + #: cmdline/apt-cache.cc:1559 cmdline/apt-cache.cc:1604 msgid "(not found)" msgstr "" - #: cmdline/apt-cache.cc:1527 + #: cmdline/apt-cache.cc:1567 msgid " Installed: " msgstr "" - #: cmdline/apt-cache.cc:1528 + #: cmdline/apt-cache.cc:1568 msgid " Candidate: " msgstr "" - #: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554 + #: cmdline/apt-cache.cc:1586 cmdline/apt-cache.cc:1594 msgid "(none)" msgstr "" - #: cmdline/apt-cache.cc:1561 + #: cmdline/apt-cache.cc:1601 msgid " Package pin: " msgstr "" #. Show the priority tables - #: cmdline/apt-cache.cc:1570 + #: cmdline/apt-cache.cc:1610 msgid " Version table:" msgstr "" ++<<<<<<< HEAD +#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3366 cmdline/apt-mark.cc:375 ++======= + #: cmdline/apt-cache.cc:1723 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 + #: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375 ++>>>>>>> upstream/debian/sid #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "" - #: cmdline/apt-cache.cc:1690 + #: cmdline/apt-cache.cc:1730 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@@ -196,20 -196,28 +207,28 @@@ "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" - #: cmdline/apt-cdrom.cc:79 + #. }}} + #: cmdline/apt-cdrom.cc:43 + msgid "" + "No CD-ROM could be auto-detected or found using the default mount point.\n" + "You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" + "cdrom' for more information about the CD-ROM auto-detection and mount point." + msgstr "" + + #: cmdline/apt-cdrom.cc:85 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "" - #: cmdline/apt-cdrom.cc:94 + #: cmdline/apt-cdrom.cc:100 msgid "Please insert a Disc in the drive and press enter" msgstr "" - #: cmdline/apt-cdrom.cc:129 + #: cmdline/apt-cdrom.cc:135 #, c-format msgid "Failed to mount '%s' to '%s'" msgstr "" - #: cmdline/apt-cdrom.cc:163 + #: cmdline/apt-cdrom.cc:170 msgid "Repeat this process for the rest of the CDs in your set." msgstr "" @@@ -425,7 -433,7 +444,7 @@@ msgstr " msgid "%s is already the newest version.\n" msgstr "" - #: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 + #: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2158 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "" @@@ -532,8 -540,8 +551,8 @@@ msgstr " msgid "After this operation, %sB disk space will be freed.\n" msgstr "" - #: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2591 - #: cmdline/apt-get.cc:2594 + #: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2590 + #: cmdline/apt-get.cc:2593 #, c-format msgid "Couldn't determine free space in %s" msgstr "" @@@ -569,7 -577,7 +588,11 @@@ msgstr " msgid "Do you want to continue [Y/n]? " msgstr "" ++<<<<<<< HEAD +#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2656 apt-pkg/algorithms.cc:1554 ++======= + #: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2655 apt-pkg/algorithms.cc:1562 ++>>>>>>> upstream/debian/sid #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@@ -578,7 -586,7 +601,7 @@@ msgid "Some files failed to download" msgstr "" - #: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2668 + #: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2667 msgid "Download complete and in download only mode" msgstr "" @@@ -654,7 -662,7 +677,7 @@@ msgstr " #. "that package should be filed.") << endl; #. } #. - #: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 + #: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1988 msgid "The following information may help to resolve the situation:" msgstr "" @@@ -699,7 -707,7 +722,7 @@@ msgid " "solution)." msgstr "" - #: cmdline/apt-get.cc:1974 + #: cmdline/apt-get.cc:1973 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" @@@ -707,85 -715,85 +730,89 @@@ "or been moved out of Incoming." msgstr "" - #: cmdline/apt-get.cc:1995 + #: cmdline/apt-get.cc:1994 msgid "Broken packages" msgstr "" - #: cmdline/apt-get.cc:2021 + #: cmdline/apt-get.cc:2020 msgid "The following extra packages will be installed:" msgstr "" - #: cmdline/apt-get.cc:2111 + #: cmdline/apt-get.cc:2110 msgid "Suggested packages:" msgstr "" - #: cmdline/apt-get.cc:2112 + #: cmdline/apt-get.cc:2111 msgid "Recommended packages:" msgstr "" - #: cmdline/apt-get.cc:2154 + #: cmdline/apt-get.cc:2153 #, c-format msgid "Couldn't find package %s" msgstr "" - #: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 + #: cmdline/apt-get.cc:2160 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "" - #: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 + #: cmdline/apt-get.cc:2168 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" - #: cmdline/apt-get.cc:2185 + #: cmdline/apt-get.cc:2184 msgid "Calculating upgrade... " msgstr "" ++<<<<<<< HEAD +#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 ++======= + #: cmdline/apt-get.cc:2187 methods/ftp.cc:711 methods/connect.cc:116 ++>>>>>>> upstream/debian/sid msgid "Failed" msgstr "" - #: cmdline/apt-get.cc:2193 + #: cmdline/apt-get.cc:2192 msgid "Done" msgstr "" - #: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 + #: cmdline/apt-get.cc:2259 cmdline/apt-get.cc:2267 msgid "Internal error, problem resolver broke stuff" msgstr "" - #: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 + #: cmdline/apt-get.cc:2295 cmdline/apt-get.cc:2331 msgid "Unable to lock the download directory" msgstr "" - #: cmdline/apt-get.cc:2388 + #: cmdline/apt-get.cc:2387 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" - #: cmdline/apt-get.cc:2393 + #: cmdline/apt-get.cc:2392 #, c-format msgid "Downloading %s %s" msgstr "" - #: cmdline/apt-get.cc:2453 + #: cmdline/apt-get.cc:2452 msgid "Must specify at least one package to fetch source for" msgstr "" - #: cmdline/apt-get.cc:2493 cmdline/apt-get.cc:2805 + #: cmdline/apt-get.cc:2492 cmdline/apt-get.cc:2804 #, c-format msgid "Unable to find a source package for %s" msgstr "" - #: cmdline/apt-get.cc:2510 + #: cmdline/apt-get.cc:2509 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" - #: cmdline/apt-get.cc:2515 + #: cmdline/apt-get.cc:2514 #, c-format msgid "" "Please use:\n" @@@ -793,141 -801,141 +820,149 @@@ "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" - #: cmdline/apt-get.cc:2568 + #: cmdline/apt-get.cc:2567 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" - #: cmdline/apt-get.cc:2605 + #: cmdline/apt-get.cc:2604 #, c-format msgid "You don't have enough free space in %s" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB - #: cmdline/apt-get.cc:2614 + #: cmdline/apt-get.cc:2613 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB - #: cmdline/apt-get.cc:2619 + #: cmdline/apt-get.cc:2618 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" - #: cmdline/apt-get.cc:2625 + #: cmdline/apt-get.cc:2624 #, c-format msgid "Fetch source %s\n" msgstr "" - #: cmdline/apt-get.cc:2663 + #: cmdline/apt-get.cc:2662 msgid "Failed to fetch some archives." msgstr "" - #: cmdline/apt-get.cc:2694 + #: cmdline/apt-get.cc:2693 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" - #: cmdline/apt-get.cc:2706 + #: cmdline/apt-get.cc:2705 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" - #: cmdline/apt-get.cc:2707 + #: cmdline/apt-get.cc:2706 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" - #: cmdline/apt-get.cc:2729 + #: cmdline/apt-get.cc:2728 #, c-format msgid "Build command '%s' failed.\n" msgstr "" - #: cmdline/apt-get.cc:2749 + #: cmdline/apt-get.cc:2748 msgid "Child process failed" msgstr "" - #: cmdline/apt-get.cc:2768 + #: cmdline/apt-get.cc:2767 msgid "Must specify at least one package to check builddeps for" msgstr "" - #: cmdline/apt-get.cc:2793 + #: cmdline/apt-get.cc:2792 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" - #: cmdline/apt-get.cc:2817 cmdline/apt-get.cc:2820 + #: cmdline/apt-get.cc:2816 cmdline/apt-get.cc:2819 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" - #: cmdline/apt-get.cc:2840 + #: cmdline/apt-get.cc:2839 #, c-format msgid "%s has no build depends.\n" msgstr "" - #: cmdline/apt-get.cc:3010 + #: cmdline/apt-get.cc:3009 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "" - #: cmdline/apt-get.cc:3028 + #: cmdline/apt-get.cc:3027 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" - #: cmdline/apt-get.cc:3051 + #: cmdline/apt-get.cc:3050 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" - #: cmdline/apt-get.cc:3090 + #: cmdline/apt-get.cc:3089 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " "package %s can't satisfy version requirements" msgstr "" - #: cmdline/apt-get.cc:3096 + #: cmdline/apt-get.cc:3095 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "" - #: cmdline/apt-get.cc:3119 + #: cmdline/apt-get.cc:3118 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" - #: cmdline/apt-get.cc:3135 + #: cmdline/apt-get.cc:3133 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" - #: cmdline/apt-get.cc:3140 + #: cmdline/apt-get.cc:3138 msgid "Failed to process build dependencies" msgstr "" - #: cmdline/apt-get.cc:3233 cmdline/apt-get.cc:3245 + #: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 #, c-format msgid "Changelog for %s (%s)" msgstr "" ++<<<<<<< HEAD +#: cmdline/apt-get.cc:3371 +msgid "Supported modules:" +msgstr "" + +#: cmdline/apt-get.cc:3412 ++======= + #: cmdline/apt-get.cc:3366 + msgid "Supported modules:" + msgstr "" + + #: cmdline/apt-get.cc:3407 ++>>>>>>> upstream/debian/sid msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@@ -973,7 -981,7 +1008,11 @@@ " This APT has Super Cow Powers.\n" msgstr "" ++<<<<<<< HEAD +#: cmdline/apt-get.cc:3577 ++======= + #: cmdline/apt-get.cc:3572 ++>>>>>>> upstream/debian/sid msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@@ -1041,7 -1049,8 +1080,12 @@@ msgid "%s was already not hold.\n msgstr "" #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 ++<<<<<<< HEAD +#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001 ++======= + #: apt-pkg/contrib/fileutl.cc:829 apt-pkg/contrib/gpgv.cc:223 + #: apt-pkg/deb/dpkgpm.cc:1002 ++>>>>>>> upstream/debian/sid #, c-format msgid "Waited for %s but it wasn't there" msgstr "" @@@ -1175,8 -1184,8 +1219,13 @@@ msgstr " msgid "Server closed the connection" msgstr "" ++<<<<<<< HEAD +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274 +#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286 ++======= + #: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1263 + #: apt-pkg/contrib/fileutl.cc:1272 apt-pkg/contrib/fileutl.cc:1275 ++>>>>>>> upstream/debian/sid msgid "Read error" msgstr "" @@@ -1189,8 -1198,8 +1238,13 @@@ msgid "Protocol corruption msgstr "" #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 ++<<<<<<< HEAD +#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381 +#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410 ++======= + #: apt-pkg/contrib/fileutl.cc:1359 apt-pkg/contrib/fileutl.cc:1368 + #: apt-pkg/contrib/fileutl.cc:1371 apt-pkg/contrib/fileutl.cc:1396 ++>>>>>>> upstream/debian/sid msgid "Write error" msgstr "" @@@ -1244,7 -1253,7 +1298,7 @@@ msgstr " msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 +#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 msgid "Problem hashing file" msgstr "" @@@ -1271,85 -1280,98 +1325,117 @@@ msgstr " msgid "Unable to invoke " msgstr "" -#: methods/connect.cc:76 +#: methods/connect.cc:75 #, c-format msgid "Connecting to %s (%s)" msgstr "" -#: methods/connect.cc:87 +#: methods/connect.cc:86 #, c-format msgid "[IP: %s %s]" msgstr "" -#: methods/connect.cc:94 +#: methods/connect.cc:93 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "" -#: methods/connect.cc:100 +#: methods/connect.cc:99 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "" -#: methods/connect.cc:108 +#: methods/connect.cc:107 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "" -#: methods/connect.cc:126 +#: methods/connect.cc:125 #, 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:154 methods/rsh.cc:433 +#: methods/connect.cc:153 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" msgstr "" -#: methods/connect.cc:180 methods/connect.cc:199 +#: methods/connect.cc:172 methods/connect.cc:191 #, c-format msgid "Could not resolve '%s'" msgstr "" -#: methods/connect.cc:205 +#: methods/connect.cc:197 #, c-format msgid "Temporary failure resolving '%s'" msgstr "" -#: methods/connect.cc:209 -#, c-format -msgid "System error resolving '%s:%s'" -msgstr "" - -#: methods/connect.cc:211 +#: methods/connect.cc:200 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "" -#: methods/connect.cc:258 +#: methods/connect.cc:247 #, c-format msgid "Unable to connect to %s:%s:" msgstr "" ++<<<<<<< HEAD +#: methods/gpgv.cc:180 ++======= + #: methods/gpgv.cc:166 ++>>>>>>> upstream/debian/sid msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" ++<<<<<<< HEAD +#: methods/gpgv.cc:185 +msgid "At least one invalid signature was encountered." +msgstr "" + +#: methods/gpgv.cc:189 +msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" +msgstr "" + +#: methods/gpgv.cc:194 +msgid "Unknown error executing gpgv" +msgstr "" + +#: methods/gpgv.cc:228 methods/gpgv.cc:235 +msgid "The following signatures were invalid:\n" +msgstr "" + +#: methods/gpgv.cc:242 ++======= + #: methods/gpgv.cc:170 + msgid "At least one invalid signature was encountered." + msgstr "" + + #: methods/gpgv.cc:172 + msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" + msgstr "" + + #. TRANSLATORS: %s is a single techy word like 'NODATA' + #: methods/gpgv.cc:178 + #, c-format + msgid "" + "Clearsigned file isn't valid, got '%s' (does the network require " + "authentication?)" + msgstr "" + + #: methods/gpgv.cc:182 + msgid "Unknown error executing gpgv" + msgstr "" + + #: methods/gpgv.cc:215 methods/gpgv.cc:222 + msgid "The following signatures were invalid:\n" + msgstr "" + + #: methods/gpgv.cc:229 ++>>>>>>> upstream/debian/sid msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@@ -1387,53 -1409,53 +1473,89 @@@ msgstr " msgid "Unknown date format" msgstr "" ++<<<<<<< HEAD +#: methods/http.cc:818 +msgid "Select failed" +msgstr "" + +#: methods/http.cc:823 +msgid "Connection timed out" +msgstr "" + +#: methods/http.cc:846 +msgid "Error writing to output file" +msgstr "" + +#: methods/http.cc:877 +msgid "Error writing to file" +msgstr "" + +#: methods/http.cc:905 +msgid "Error writing to the file" +msgstr "" + +#: methods/http.cc:919 +msgid "Error reading from server. Remote end closed connection" +msgstr "" + +#: methods/http.cc:921 ++======= + #: methods/http.cc:827 + msgid "Select failed" + msgstr "" + + #: methods/http.cc:832 + msgid "Connection timed out" + msgstr "" + + #: methods/http.cc:855 + msgid "Error writing to output file" + msgstr "" + + #: methods/http.cc:886 + msgid "Error writing to file" + msgstr "" + + #: methods/http.cc:914 + msgid "Error writing to the file" + msgstr "" + + #: methods/http.cc:928 + msgid "Error reading from server. Remote end closed connection" + msgstr "" + + #: methods/http.cc:930 ++>>>>>>> upstream/debian/sid msgid "Error reading from server" msgstr "" -#: methods/http.cc:1198 +#: methods/http.cc:1194 msgid "Bad header data" msgstr "" -#: methods/http.cc:1215 methods/http.cc:1270 +#: methods/http.cc:1211 methods/http.cc:1266 msgid "Connection failed" msgstr "" -#: methods/http.cc:1362 +#: methods/http.cc:1358 msgid "Internal error" msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. ++<<<<<<< HEAD +#: methods/mirror.cc:95 apt-inst/extract.cc:465 +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 +#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109 +#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 ++======= + #: methods/mirror.cc:95 apt-inst/extract.cc:464 + #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:401 + #: apt-pkg/contrib/fileutl.cc:514 apt-pkg/sourcelist.cc:208 + #: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 + #: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 ++>>>>>>> upstream/debian/sid #, c-format msgid "Unable to read %s" msgstr "" @@@ -1460,7 -1482,12 +1582,12 @@@ msgstr " msgid "Can not read mirror file '%s'" msgstr "" - #: methods/mirror.cc:442 + #: methods/mirror.cc:315 + #, c-format + msgid "No entry found in mirror file '%s'" + msgstr "" + + #: methods/mirror.cc:445 #, c-format msgid "[Mirror: %s]" msgstr "" @@@ -1540,7 -1567,7 +1667,11 @@@ msgid " " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" ++<<<<<<< HEAD +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1339 ++======= + #: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 ++>>>>>>> upstream/debian/sid #, c-format msgid "Unable to write to %s" msgstr "" @@@ -1645,8 -1672,8 +1776,8 @@@ msgstr " msgid "Unable to open DB file %s: %s" msgstr "" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 #, c-format msgid "Failed to stat %s" msgstr "" @@@ -1659,87 -1686,87 +1790,87 @@@ msgstr " msgid "Unable to get a cursor" msgstr "" -#: ftparchive/writer.cc:82 +#: ftparchive/writer.cc:80 #, c-format msgid "W: Unable to read directory %s\n" msgstr "" -#: ftparchive/writer.cc:87 +#: ftparchive/writer.cc:85 #, c-format msgid "W: Unable to stat %s\n" msgstr "" -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:141 msgid "E: " msgstr "" -#: ftparchive/writer.cc:145 +#: ftparchive/writer.cc:143 msgid "W: " msgstr "" -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:150 msgid "E: Errors apply to file " msgstr "" -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: ftparchive/writer.cc:168 ftparchive/writer.cc:200 #, c-format msgid "Failed to resolve %s" msgstr "" -#: ftparchive/writer.cc:183 +#: ftparchive/writer.cc:181 msgid "Tree walking failed" msgstr "" -#: ftparchive/writer.cc:210 +#: ftparchive/writer.cc:208 #, c-format msgid "Failed to open %s" msgstr "" -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:267 #, c-format msgid " DeLink %s [%s]\n" msgstr "" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:275 #, c-format msgid "Failed to readlink %s" msgstr "" -#: ftparchive/writer.cc:281 +#: ftparchive/writer.cc:279 #, c-format msgid "Failed to unlink %s" msgstr "" -#: ftparchive/writer.cc:288 +#: ftparchive/writer.cc:286 #, c-format msgid "*** Failed to link %s to %s" msgstr "" -#: ftparchive/writer.cc:298 +#: ftparchive/writer.cc:296 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr "" -#: ftparchive/writer.cc:403 +#: ftparchive/writer.cc:401 msgid "Archive had no package field" msgstr "" -#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:409 ftparchive/writer.cc:714 #, c-format msgid " %s has no override entry\n" msgstr "" -#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 +#: ftparchive/writer.cc:477 ftparchive/writer.cc:858 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" -#: ftparchive/writer.cc:711 +#: ftparchive/writer.cc:724 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:715 +#: ftparchive/writer.cc:728 #, c-format msgid " %s has no binary override entry either\n" msgstr "" @@@ -1813,7 -1840,7 +1944,7 @@@ msgstr " msgid "Problem unlinking %s" msgstr "" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 #, c-format msgid "Failed to rename %s to %s" msgstr "" @@@ -1850,23 -1877,23 +1981,23 @@@ msgid " " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" - #: apt-inst/contrib/extracttar.cc:117 + #: apt-inst/contrib/extracttar.cc:116 msgid "Failed to create pipes" msgstr "" - #: apt-inst/contrib/extracttar.cc:144 + #: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "" - #: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 + #: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 msgid "Corrupted archive" msgstr "" - #: apt-inst/contrib/extracttar.cc:196 + #: apt-inst/contrib/extracttar.cc:195 msgid "Tar checksum failed, archive corrupted" msgstr "" - #: apt-inst/contrib/extracttar.cc:303 + #: apt-inst/contrib/extracttar.cc:302 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "" @@@ -1937,54 -1964,54 +2068,54 @@@ msgstr " msgid "Failed to close file %s" msgstr "" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 +#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 #, c-format msgid "The path %s is too long" msgstr "" -#: apt-inst/extract.cc:125 +#: apt-inst/extract.cc:127 #, c-format msgid "Unpacking %s more than once" msgstr "" -#: apt-inst/extract.cc:135 +#: apt-inst/extract.cc:137 #, c-format msgid "The directory %s is diverted" msgstr "" -#: apt-inst/extract.cc:145 +#: 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:155 apt-inst/extract.cc:299 +#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 msgid "The diversion path is too long" msgstr "" -#: apt-inst/extract.cc:242 +#: apt-inst/extract.cc:243 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "" -#: apt-inst/extract.cc:282 +#: apt-inst/extract.cc:283 msgid "Failed to locate node in its hash bucket" msgstr "" -#: apt-inst/extract.cc:286 +#: apt-inst/extract.cc:287 msgid "The path is too long" msgstr "" -#: apt-inst/extract.cc:414 +#: apt-inst/extract.cc:415 #, c-format msgid "Overwrite package match with no version for %s" msgstr "" -#: apt-inst/extract.cc:431 +#: apt-inst/extract.cc:432 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "" -#: apt-inst/extract.cc:491 +#: apt-inst/extract.cc:492 #, c-format msgid "Unable to stat %s" msgstr "" @@@ -2060,30 -2087,30 +2191,34 @@@ msgid " msgstr "" #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:378 +#: apt-pkg/contrib/strutl.cc:372 #, c-format msgid "%lid %lih %limin %lis" msgstr "" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:385 +#: apt-pkg/contrib/strutl.cc:379 #, c-format msgid "%lih %limin %lis" msgstr "" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:392 +#: apt-pkg/contrib/strutl.cc:386 #, c-format msgid "%limin %lis" msgstr "" #. s means seconds -#: apt-pkg/contrib/strutl.cc:397 +#: apt-pkg/contrib/strutl.cc:391 #, c-format msgid "%lis" msgstr "" ++<<<<<<< HEAD +#: apt-pkg/contrib/strutl.cc:1167 ++======= + #: apt-pkg/contrib/strutl.cc:1173 ++>>>>>>> upstream/debian/sid #, c-format msgid "Selection %s not found" msgstr "" @@@ -2153,6 -2180,16 +2288,6 @@@ msgstr " msgid "%c%s... Done" msgstr "" -#: apt-pkg/contrib/progress.cc:179 -msgid "..." -msgstr "" - -#. Print the spinner -#: apt-pkg/contrib/progress.cc:195 -#, c-format -msgid "%c%s... %u%%" -msgstr "" - #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." @@@ -2213,114 -2250,120 +2348,162 @@@ msgstr " msgid "Problem closing the gzip file %s" msgstr "" - #: apt-pkg/contrib/fileutl.cc:225 + #: apt-pkg/contrib/fileutl.cc:226 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" - #: apt-pkg/contrib/fileutl.cc:230 + #: apt-pkg/contrib/fileutl.cc:231 #, c-format msgid "Could not open lock file %s" msgstr "" - #: apt-pkg/contrib/fileutl.cc:248 + #: apt-pkg/contrib/fileutl.cc:249 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" - #: apt-pkg/contrib/fileutl.cc:252 + #: apt-pkg/contrib/fileutl.cc:253 #, c-format msgid "Could not get lock %s" msgstr "" - #: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 + #: apt-pkg/contrib/fileutl.cc:393 apt-pkg/contrib/fileutl.cc:507 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" - #: apt-pkg/contrib/fileutl.cc:426 + #: apt-pkg/contrib/fileutl.cc:427 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" - #: apt-pkg/contrib/fileutl.cc:444 + #: apt-pkg/contrib/fileutl.cc:445 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" - #: apt-pkg/contrib/fileutl.cc:453 + #: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" - #: apt-pkg/contrib/fileutl.cc:840 + #: apt-pkg/contrib/fileutl.cc:841 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" - #: apt-pkg/contrib/fileutl.cc:842 + #: apt-pkg/contrib/fileutl.cc:843 #, c-format msgid "Sub-process %s received signal %u." msgstr "" ++<<<<<<< HEAD +#: apt-pkg/contrib/fileutl.cc:846 ++======= + #: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:243 ++>>>>>>> upstream/debian/sid #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" ++<<<<<<< HEAD +#: apt-pkg/contrib/fileutl.cc:848 ++======= + #: apt-pkg/contrib/fileutl.cc:849 apt-pkg/contrib/gpgv.cc:236 ++>>>>>>> upstream/debian/sid #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" ++<<<<<<< HEAD +#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659 ++======= + #: apt-pkg/contrib/fileutl.cc:985 ++>>>>>>> upstream/debian/sid #, c-format msgid "Could not open file %s" msgstr "" ++<<<<<<< HEAD +#: apt-pkg/contrib/fileutl.cc:1066 ++======= + #: apt-pkg/contrib/fileutl.cc:1062 ++>>>>>>> upstream/debian/sid #, c-format msgid "Could not open file descriptor %d" msgstr "" ++<<<<<<< HEAD +#: apt-pkg/contrib/fileutl.cc:1156 +msgid "Failed to create subprocess IPC" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:1212 +msgid "Failed to exec compressor " +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:1309 ++======= + #: apt-pkg/contrib/fileutl.cc:1147 + msgid "Failed to create subprocess IPC" + msgstr "" + + #: apt-pkg/contrib/fileutl.cc:1202 + msgid "Failed to exec compressor " + msgstr "" + + #: apt-pkg/contrib/fileutl.cc:1297 ++>>>>>>> upstream/debian/sid #, c-format msgid "read, still have %llu to read but none left" msgstr "" ++<<<<<<< HEAD +#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420 ++======= + #: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1406 ++>>>>>>> upstream/debian/sid #, c-format msgid "write, still have %llu to write but couldn't" msgstr "" ++<<<<<<< HEAD +#: apt-pkg/contrib/fileutl.cc:1736 ++======= + #: apt-pkg/contrib/fileutl.cc:1681 ++>>>>>>> upstream/debian/sid #, c-format msgid "Problem closing the file %s" msgstr "" ++<<<<<<< HEAD +#: apt-pkg/contrib/fileutl.cc:1748 ++======= + #: apt-pkg/contrib/fileutl.cc:1693 ++>>>>>>> upstream/debian/sid #, c-format msgid "Problem renaming the file %s to %s" msgstr "" ++<<<<<<< HEAD +#: apt-pkg/contrib/fileutl.cc:1759 ++======= + #: apt-pkg/contrib/fileutl.cc:1704 ++>>>>>>> upstream/debian/sid #, c-format msgid "Problem unlinking the file %s" msgstr "" ++<<<<<<< HEAD +#: apt-pkg/contrib/fileutl.cc:1774 ++======= + #: apt-pkg/contrib/fileutl.cc:1717 ++>>>>>>> upstream/debian/sid msgid "Problem syncing the file" msgstr "" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:76 -#, c-format -msgid "No keyring installed in %s." -msgstr "" - #: apt-pkg/pkgcache.cc:148 msgid "Empty package cache" msgstr "" @@@ -2346,59 -2389,59 +2529,59 @@@ msgstr " msgid "The package cache was built for a different architecture" msgstr "" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:305 msgid "Depends" msgstr "" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:305 msgid "PreDepends" msgstr "" -#: apt-pkg/pkgcache.cc:314 +#: apt-pkg/pkgcache.cc:305 msgid "Suggests" msgstr "" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:306 msgid "Recommends" msgstr "" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:306 msgid "Conflicts" msgstr "" -#: apt-pkg/pkgcache.cc:315 +#: apt-pkg/pkgcache.cc:306 msgid "Replaces" msgstr "" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:307 msgid "Obsoletes" msgstr "" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:307 msgid "Breaks" msgstr "" -#: apt-pkg/pkgcache.cc:316 +#: apt-pkg/pkgcache.cc:307 msgid "Enhances" msgstr "" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:318 msgid "important" msgstr "" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:318 msgid "required" msgstr "" -#: apt-pkg/pkgcache.cc:327 +#: apt-pkg/pkgcache.cc:318 msgid "standard" msgstr "" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:319 msgid "optional" msgstr "" -#: apt-pkg/pkgcache.cc:328 +#: apt-pkg/pkgcache.cc:319 msgid "extra" msgstr "" @@@ -2498,29 -2541,29 +2681,29 @@@ msgstr " msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:289 +#: apt-pkg/sourcelist.cc:285 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:293 +#: apt-pkg/sourcelist.cc:289 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" - #: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:898 + #: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:921 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" - #: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:504 + #: apt-pkg/packagemanager.cc:496 apt-pkg/packagemanager.cc:527 #, c-format msgid "Could not configure '%s'. " msgstr "" - #: apt-pkg/packagemanager.cc:546 + #: apt-pkg/packagemanager.cc:569 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@@ -2539,23 -2582,23 +2722,35 @@@ msgid " "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" ++<<<<<<< HEAD +#: apt-pkg/algorithms.cc:1228 ++======= + #: apt-pkg/algorithms.cc:1234 ++>>>>>>> upstream/debian/sid msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" ++<<<<<<< HEAD +#: apt-pkg/algorithms.cc:1230 +msgid "Unable to correct problems, you have held broken packages." +msgstr "" + +#: apt-pkg/algorithms.cc:1580 apt-pkg/algorithms.cc:1582 ++======= + #: apt-pkg/algorithms.cc:1236 + msgid "Unable to correct problems, you have held broken packages." + msgstr "" + + #: apt-pkg/algorithms.cc:1588 apt-pkg/algorithms.cc:1590 ++>>>>>>> upstream/debian/sid msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." msgstr "" - #: apt-pkg/acquire.cc:81 + #: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 #, c-format msgid "List directory %spartial is missing." msgstr "" @@@ -2592,17 -2635,17 +2787,17 @@@ msgstr " msgid "Method %s did not start correctly" msgstr "" - #: apt-pkg/acquire-worker.cc:440 + #: apt-pkg/acquire-worker.cc:447 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -#: apt-pkg/init.cc:151 +#: apt-pkg/init.cc:152 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" -#: apt-pkg/init.cc:167 +#: apt-pkg/init.cc:168 msgid "Unable to determine a suitable packaging system type" msgstr "" @@@ -2655,14 -2698,14 +2850,25 @@@ msgstr " #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 ++<<<<<<< HEAD +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325 +#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375 +#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396 +#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410 +#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435 +#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556 +#: apt-pkg/pkgcachegen.cc:570 ++======= + #: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 + #: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 + #: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 + #: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 + #: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 + #: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 + #: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 + #: apt-pkg/pkgcachegen.cc:563 ++>>>>>>> upstream/debian/sid #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "" @@@ -2683,26 -2726,26 +2889,47 @@@ msgstr " msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" ++<<<<<<< HEAD +#: apt-pkg/pkgcachegen.cc:577 ++======= + #: apt-pkg/pkgcachegen.cc:570 ++>>>>>>> upstream/debian/sid #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" ++<<<<<<< HEAD +#: apt-pkg/pkgcachegen.cc:1150 ++======= + #: apt-pkg/pkgcachegen.cc:1199 ++>>>>>>> upstream/debian/sid #, c-format msgid "Couldn't stat source package list %s" msgstr "" ++<<<<<<< HEAD +#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 +#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 +msgid "Reading package lists" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:1255 +msgid "Collecting File Provides" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 ++======= + #: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 + #: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 + msgid "Reading package lists" + msgstr "" + + #: apt-pkg/pkgcachegen.cc:1304 + msgid "Collecting File Provides" + msgstr "" + + #: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 ++>>>>>>> upstream/debian/sid msgid "IO Error saving source cache" msgstr "" @@@ -2715,97 -2758,97 +2942,146 @@@ msgstr " msgid "MD5Sum mismatch" msgstr "" ++<<<<<<< HEAD +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870 +#: apt-pkg/acquire-item.cc:2013 +msgid "Hash Sum mismatch" +msgstr "" + +#: apt-pkg/acquire-item.cc:1381 ++======= + #: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1876 + #: apt-pkg/acquire-item.cc:2019 + msgid "Hash Sum mismatch" + msgstr "" + + #: apt-pkg/acquire-item.cc:1377 ++>>>>>>> upstream/debian/sid #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" ++<<<<<<< HEAD +#: apt-pkg/acquire-item.cc:1397 ++======= + #: apt-pkg/acquire-item.cc:1393 ++>>>>>>> upstream/debian/sid #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "" ++<<<<<<< HEAD +#: apt-pkg/acquire-item.cc:1439 +msgid "There is no public key available for the following key IDs:\n" +msgstr "" + +#: apt-pkg/acquire-item.cc:1477 ++======= + #: apt-pkg/acquire-item.cc:1435 + msgid "There is no public key available for the following key IDs:\n" + msgstr "" + + #: apt-pkg/acquire-item.cc:1473 ++>>>>>>> upstream/debian/sid #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" ++<<<<<<< HEAD +#: apt-pkg/acquire-item.cc:1499 ++======= + #: apt-pkg/acquire-item.cc:1495 ++>>>>>>> upstream/debian/sid #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" ++<<<<<<< HEAD +#: apt-pkg/acquire-item.cc:1532 ++======= + #: apt-pkg/acquire-item.cc:1525 ++>>>>>>> upstream/debian/sid #, c-format msgid "" -"An error occurred during the signature verification. The repository is not " +"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 "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) ++<<<<<<< HEAD +#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547 ++======= + #: apt-pkg/acquire-item.cc:1535 apt-pkg/acquire-item.cc:1540 ++>>>>>>> upstream/debian/sid #, c-format msgid "GPG error: %s: %s" msgstr "" ++<<<<<<< HEAD +#: apt-pkg/acquire-item.cc:1646 ++======= + #: apt-pkg/acquire-item.cc:1652 ++>>>>>>> upstream/debian/sid #, 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 "" ++<<<<<<< HEAD +#: apt-pkg/acquire-item.cc:1705 ++======= + #: apt-pkg/acquire-item.cc:1711 ++>>>>>>> upstream/debian/sid #, 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." msgstr "" ++<<<<<<< HEAD +#: apt-pkg/acquire-item.cc:1764 ++======= + #: apt-pkg/acquire-item.cc:1770 ++>>>>>>> upstream/debian/sid #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" ++<<<<<<< HEAD +#: apt-pkg/acquire-item.cc:1862 ++======= + #: apt-pkg/acquire-item.cc:1868 ++>>>>>>> upstream/debian/sid msgid "Size mismatch" msgstr "" -#: apt-pkg/indexrecords.cc:68 +#: apt-pkg/indexrecords.cc:64 #, c-format msgid "Unable to parse Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:78 +#: apt-pkg/indexrecords.cc:74 #, c-format msgid "No sections in Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:112 +#: apt-pkg/indexrecords.cc:108 #, c-format msgid "No Hash entry in Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:121 #, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/indexrecords.cc:140 #, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "" @@@ -2831,7 -2874,7 +3107,7 @@@ msgstr " msgid "Stored label: %s\n" msgstr "" - #: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 + #: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 msgid "Unmounting CD-ROM...\n" msgstr "" @@@ -2889,30 -2932,30 +3165,46 @@@ msgstr " msgid "Copying package lists..." msgstr "" - #: apt-pkg/cdrom.cc:857 + #: apt-pkg/cdrom.cc:865 msgid "Writing new source list\n" msgstr "" - #: apt-pkg/cdrom.cc:865 + #: apt-pkg/cdrom.cc:873 msgid "Source list entries for this disc are:\n" msgstr "" ++<<<<<<< HEAD +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880 ++======= + #: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:774 ++>>>>>>> upstream/debian/sid #, c-format msgid "Wrote %i records.\n" msgstr "" ++<<<<<<< HEAD +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882 ++======= + #: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:776 ++>>>>>>> upstream/debian/sid #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" ++<<<<<<< HEAD +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885 ++======= + #: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:779 ++>>>>>>> upstream/debian/sid #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" ++<<<<<<< HEAD +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888 ++======= + #: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:782 ++>>>>>>> upstream/debian/sid #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@@ -2927,17 -2970,6 +3219,17 @@@ msgstr " msgid "Hash mismatch for: %s" msgstr "" +#: apt-pkg/indexcopy.cc:662 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:692 +#, c-format +msgid "No keyring installed in %s." +msgstr "" + #: apt-pkg/cacheset.cc:403 #, c-format msgid "Release '%s' for '%s' was not found" @@@ -3001,119 -3033,119 +3293,119 @@@ msgstr " msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 +#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 msgid "Execute external solver" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:73 +#: apt-pkg/deb/dpkgpm.cc:72 #, c-format msgid "Installing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951 #, c-format msgid "Configuring %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958 #, c-format msgid "Removing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:76 +#: apt-pkg/deb/dpkgpm.cc:75 #, c-format msgid "Completely removing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:77 +#: apt-pkg/deb/dpkgpm.cc:76 #, c-format msgid "Noting disappearance of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:78 +#: apt-pkg/deb/dpkgpm.cc:77 #, c-format msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:704 #, c-format msgid "Directory '%s' missing" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739 #, c-format msgid "Could not open file '%s'" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:944 #, c-format msgid "Preparing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:945 #, c-format msgid "Unpacking %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:950 #, c-format msgid "Preparing to configure %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:952 #, c-format msgid "Installed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:957 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:959 #, c-format msgid "Removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:964 #, c-format msgid "Preparing to completely remove %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:965 #, c-format msgid "Completely removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1212 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1243 +#: apt-pkg/deb/dpkgpm.cc:1242 msgid "Running dpkg" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: apt-pkg/deb/dpkgpm.cc:1414 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1477 +#: apt-pkg/deb/dpkgpm.cc:1476 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1482 +#: apt-pkg/deb/dpkgpm.cc:1481 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1484 +#: apt-pkg/deb/dpkgpm.cc:1483 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1490 +#: apt-pkg/deb/dpkgpm.cc:1489 msgid "" "No apport report written because the error message indicates a disk full " "error" @@@ -3125,13 -3157,7 +3417,13 @@@ msgid " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1503 +#: apt-pkg/deb/dpkgpm.cc:1503 apt-pkg/deb/dpkgpm.cc:1509 +msgid "" +"No apport report written because the error message indicates an issue on the " +"local system" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1530 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" diff --combined test/interactive-helper/aptwebserver.cc index ff60d64a3,a8d191d0e..dc17d4991 --- a/test/interactive-helper/aptwebserver.cc +++ b/test/interactive-helper/aptwebserver.cc @@@ -23,8 -23,10 +23,10 @@@ #include <dirent.h> #include <signal.h> - char const * const httpcodeToStr(int const httpcode) { /*{{{*/ - switch (httpcode) { + char const * const httpcodeToStr(int const httpcode) /*{{{*/ + { + switch (httpcode) + { // Informational 1xx case 100: return "100 Continue"; case 101: return "101 Switching Protocols"; @@@ -63,6 -65,7 +65,7 @@@ case 415: return "415 Unsupported Media Type"; case 416: return "416 Requested range not satisfiable"; case 417: return "417 Expectation Failed"; + case 418: return "418 I'm a teapot"; // Server error 5xx case 500: return "500 Internal Server Error"; case 501: return "501 Not Implemented"; @@@ -74,7 -77,8 +77,8 @@@ return NULL; } /*}}}*/ - void addFileHeaders(std::list<std::string> &headers, FileFd &data) { /*{{{*/ + void addFileHeaders(std::list<std::string> &headers, FileFd &data) /*{{{*/ + { std::ostringstream contentlength; contentlength << "Content-Length: " << data.FileSize(); headers.push_back(contentlength.str()); @@@ -82,27 -86,17 +86,17 @@@ std::string lastmodified("Last-Modified: "); lastmodified.append(TimeRFC1123(data.ModificationTime())); headers.push_back(lastmodified); - - std::string const fileext = flExtension(data.Name()); - if (fileext.empty() == false && fileext != data.Name()) { - std::string confcontenttype("aptwebserver::ContentType::"); - confcontenttype.append(fileext); - std::string const contenttype = _config->Find(confcontenttype); - if (contenttype.empty() == false) { - std::string header("Content-Type: "); - header.append(contenttype); - headers.push_back(header); - } - } } /*}}}*/ - void addDataHeaders(std::list<std::string> &headers, std::string &data) {/*{{{*/ + void addDataHeaders(std::list<std::string> &headers, std::string &data) /*{{{*/ + { std::ostringstream contentlength; contentlength << "Content-Length: " << data.size(); headers.push_back(contentlength.str()); } /*}}}*/ - bool sendHead(int const client, int const httpcode, std::list<std::string> &headers) { /*{{{*/ + bool sendHead(int const client, int const httpcode, std::list<std::string> &headers)/*{{{*/ + { std::string response("HTTP/1.1 "); response.append(httpcodeToStr(httpcode)); headers.push_front(response); @@@ -113,12 -107,11 +107,11 @@@ date.append(TimeRFC1123(time(NULL))); headers.push_back(date); - headers.push_back("Accept-Ranges: bytes"); - std::clog << ">>> RESPONSE >>>" << std::endl; bool Success = true; for (std::list<std::string>::const_iterator h = headers.begin(); - Success == true && h != headers.end(); ++h) { + Success == true && h != headers.end(); ++h) + { Success &= FileFd::Write(client, h->c_str(), h->size()); if (Success == true) Success &= FileFd::Write(client, "\r\n", 2); @@@ -130,11 -123,13 +123,13 @@@ return Success; } /*}}}*/ - bool sendFile(int const client, FileFd &data) { /*{{{*/ + bool sendFile(int const client, FileFd &data) /*{{{*/ + { bool Success = true; char buffer[500]; unsigned long long actual = 0; - while ((Success &= data.Read(buffer, sizeof(buffer), &actual)) == true) { + while ((Success &= data.Read(buffer, sizeof(buffer), &actual)) == true) + { if (actual == 0) break; if (Success == true) @@@ -145,7 -140,8 +140,8 @@@ return Success; } /*}}}*/ - bool sendData(int const client, std::string const &data) { /*{{{*/ + bool sendData(int const client, std::string const &data) /*{{{*/ + { bool Success = true; Success &= FileFd::Write(client, data.c_str(), data.size()); if (Success == true) @@@ -153,7 -149,9 +149,9 @@@ return Success; } /*}}}*/ - void sendError(int const client, int const httpcode, std::string const &request, bool content, std::string const &error = "") { /*{{{*/ + void sendError(int const client, int const httpcode, std::string const &request,/*{{{*/ + bool content, std::string const &error = "") + { std::list<std::string> headers; std::string response("<html><head><title>"); response.append(httpcodeToStr(httpcode)).append(""); @@@ -168,7 -166,9 +166,9 @@@ sendData(client, response); } /*}}}*/ - void sendRedirect(int const client, int const httpcode, std::string const &uri, std::string const &request, bool content) { /*{{{*/ + void sendRedirect(int const client, int const httpcode, std::string const &uri,/*{{{*/ + std::string const &request, bool content) + { std::list headers; std::string response(""); response.append(httpcodeToStr(httpcode)).append(""); @@@ -188,8 -188,8 +188,8 @@@ sendData(client, response); } /*}}}*/ - // sendDirectoryLisiting /*{{{*/ - int filter_hidden_files(const struct dirent *a) { + int filter_hidden_files(const struct dirent *a) /*{{{*/ + { if (a->d_name[0] == '.') return 0; #ifdef _DIRENT_HAVE_D_TYPE @@@ -225,13 -225,17 +225,17 @@@ int grouped_alpha_case_sort(const struc } return strcasecmp((*a)->d_name, (*b)->d_name); } - void sendDirectoryListing(int const client, std::string const &dir, std::string const &request, bool content) { + /*}}}*/ + void sendDirectoryListing(int const client, std::string const &dir, /*{{{*/ + std::string const &request, bool content) + { std::list headers; std::ostringstream listing; struct dirent **namelist; int const counter = scandir(dir.c_str(), &namelist, filter_hidden_files, grouped_alpha_case_sort); - if (counter == -1) { + if (counter == -1) + { sendError(client, 500, request, content); return; } @@@ -251,11 -255,14 +255,14 @@@ std::string filename(dir); filename.append("/").append(namelist[i]->d_name); stat(filename.c_str(), &fs); - if (S_ISDIR(fs.st_mode)) { + if (S_ISDIR(fs.st_mode)) + { listing << "d" << "d_name << "/\">" << namelist[i]->d_name << "" << "-"; - } else { + } + else + { listing << "f" << "d_name << "\">" << namelist[i]->d_name << "" << "" << SizeToStr(fs.st_size) << "B"; @@@ -271,7 -278,10 +278,10 @@@ sendData(client, response); } /*}}}*/ - bool parseFirstLine(int const client, std::string const &request, std::string &filename, bool &sendContent, bool &closeConnection) { /*{{{*/ + bool parseFirstLine(int const client, std::string const &request, /*{{{*/ + std::string &filename, bool &sendContent, + bool &closeConnection) + { if (strncmp(request.c_str(), "HEAD ", 5) == 0) sendContent = false; if (strncmp(request.c_str(), "GET ", 4) != 0) @@@ -285,7 -295,8 +295,8 @@@ for (; request[filestart] == ' '; ++filestart); size_t fileend = request.rfind(' ', lineend); if (lineend == std::string::npos || filestart == std::string::npos || - fileend == std::string::npos || filestart == fileend) { + fileend == std::string::npos || filestart == fileend) + { sendError(client, 500, request, sendContent, "Filename can't be extracted"); return false; } @@@ -296,13 -307,15 +307,15 @@@ closeConnection = strcasecmp(LookupTag(request, "Connection", "Keep-Alive").c_str(), "Keep-Alive") != 0; else if (strncmp(request.c_str() + httpstart, "HTTP/1.0\r", 9) == 0) closeConnection = strcasecmp(LookupTag(request, "Connection", "Keep-Alive").c_str(), "close") == 0; - else { - sendError(client, 500, request, sendContent, "Not an HTTP/1.{0,1} request"); + else + { + sendError(client, 500, request, sendContent, "Not a HTTP/1.{0,1} request"); return false; } filename = request.substr(filestart, fileend - filestart); - if (filename.find(' ') != std::string::npos) { + if (filename.find(' ') != std::string::npos) + { sendError(client, 500, request, sendContent, "Filename contains an unencoded space"); return false; } @@@ -312,7 -325,8 +325,8 @@@ if (filename.empty() == true || filename[0] != '/' || strncmp(filename.c_str(), "//", 2) == 0 || filename.find_first_of("\r\n\t\f\v") != std::string::npos || - filename.find("/../") != std::string::npos) { + filename.find("/../") != std::string::npos) + { sendError(client, 400, request, sendContent, "Filename contains illegal character (sequence)"); return false; } @@@ -327,8 -341,6 +341,8 @@@ int main(int const argc, const char * argv[]) { CommandLine::Args Args[] = { + {0, "simulate-paywall", "aptwebserver::Simulate-Paywall", + CommandLine::Boolean}, {0, "port", "aptwebserver::port", CommandLine::HasArg}, {'c',"config-file",0,CommandLine::ConfigFile}, {'o',"option",0,CommandLine::ArbItem}, @@@ -336,7 -348,8 +350,8 @@@ }; CommandLine CmdL(Args, _config); - if(CmdL.Parse(argc,argv) == false) { + if(CmdL.Parse(argc,argv) == false) + { _error->DumpErrors(); exit(1); } @@@ -345,20 -358,19 +360,21 @@@ // ignore SIGPIPE, this can happen on write() if the socket closes connection signal(SIGPIPE, SIG_IGN); int sock = socket(AF_INET6, SOCK_STREAM, 0); - if(sock < 0 ) { + if(sock < 0) + { _error->Errno("aptwerbserver", "Couldn't create socket"); _error->DumpErrors(std::cerr); return 1; } + // get the port int const port = _config->FindI("aptwebserver::port", 8080); + bool const simulate_broken_server = _config->FindB("aptwebserver::Simulate-Paywall", false); // ensure that we accept all connections: v4 or v6 int const iponly = 0; setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, &iponly, sizeof(iponly)); - // to not linger to an address + // to not linger on an address int const enable = 1; setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(enable)); @@@ -368,29 -380,62 +384,66 @@@ locAddr.sin6_port = htons(port); locAddr.sin6_addr = in6addr_any; - if (bind(sock, (struct sockaddr*) &locAddr, sizeof(locAddr)) < 0) { + if (bind(sock, (struct sockaddr*) &locAddr, sizeof(locAddr)) < 0) + { _error->Errno("aptwerbserver", "Couldn't bind"); _error->DumpErrors(std::cerr); return 2; } + FileFd pidfile; + if (_config->FindB("aptwebserver::fork", false) == true) + { + std::string const pidfilename = _config->Find("aptwebserver::pidfile", "aptwebserver.pid"); + int const pidfilefd = GetLock(pidfilename); + if (pidfilefd < 0 || pidfile.OpenDescriptor(pidfilefd, FileFd::WriteOnly) == false) + { + _error->Errno("aptwebserver", "Couldn't acquire lock on pidfile '%s'", pidfilename.c_str()); + _error->DumpErrors(std::cerr); + return 3; + } + + pid_t child = fork(); + if (child < 0) + { + _error->Errno("aptwebserver", "Forking failed"); + _error->DumpErrors(std::cerr); + return 4; + } + else if (child != 0) + { + // successfully forked: ready to serve! + std::string pidcontent; + strprintf(pidcontent, "%d", child); + pidfile.Write(pidcontent.c_str(), pidcontent.size()); + if (_error->PendingError() == true) + { + _error->DumpErrors(std::cerr); + return 5; + } + std::cout << "Successfully forked as " << child << std::endl; + return 0; + } + } + - std::clog << "Serving ANY file on port: " << port << std::endl; - + if (simulate_broken_server) { + std::clog << "Simulating a broken web server that return nonsense " + "for all querries" << std::endl; + } else { + std::clog << "Serving ANY file on port: " << port << std::endl; + } - listen(sock, 1); /*}}}*/ std::vector messages; int client; - while ((client = accept(sock, NULL, NULL)) != -1) { + while ((client = accept(sock, NULL, NULL)) != -1) + { std::clog << "ACCEPT client " << client << " on socket " << sock << std::endl; - while (ReadMessages(client, messages)) { + while (ReadMessages(client, messages)) + { bool closeConnection = false; for (std::vector::const_iterator m = messages.begin(); m != messages.end() && closeConnection == false; ++m) { @@@ -403,101 -448,84 +456,92 @@@ continue; std::string host = LookupTag(*m, "Host", ""); - if (host.empty() == true) { + if (host.empty() == true) + { // RFC 2616 §14.23 requires Host sendError(client, 400, *m, sendContent, "Host header is required"); continue; } + if (simulate_broken_server == true) { + std::string data("ni ni ni\n"); + addDataHeaders(headers, data); + sendHead(client, 200, headers); + sendData(client, data); ++ continue; + } - else if (RealFileExists(filename) == true) { ++ + // string replacements in the requested filename + ::Configuration::Item const *Replaces = _config->Tree("aptwebserver::redirect::replace"); + if (Replaces != NULL) + { + std::string redirect = "/" + filename; + for (::Configuration::Item *I = Replaces->Child; I != NULL; I = I->Next) + redirect = SubstVar(redirect, I->Tag, I->Value); + redirect.erase(0,1); + if (redirect != filename) + { + sendRedirect(client, 301, redirect, *m, sendContent); + continue; + } + } + + ::Configuration::Item const *Overwrite = _config->Tree("aptwebserver::overwrite"); + if (Overwrite != NULL) + { + for (::Configuration::Item *I = Overwrite->Child; I != NULL; I = I->Next) + { + regex_t *pattern = new regex_t; + int const res = regcomp(pattern, I->Tag.c_str(), REG_EXTENDED | REG_ICASE | REG_NOSUB); + if (res != 0) + { + char error[300]; + regerror(res, pattern, error, sizeof(error)); + sendError(client, 500, *m, sendContent, error); + continue; + } + if (regexec(pattern, filename.c_str(), 0, 0, 0) == 0) + { + filename = _config->Find("aptwebserver::overwrite::" + I->Tag + "::filename", filename); + if (filename[0] == '/') + filename.erase(0,1); + regfree(pattern); + break; + } + regfree(pattern); + } + } + + // deal with the request + if (RealFileExists(filename) == true) + { FileFd data(filename, FileFd::ReadOnly); std::string condition = LookupTag(*m, "If-Modified-Since", ""); - if (condition.empty() == false) { + if (condition.empty() == false) + { time_t cache; if (RFC1123StrToTime(condition.c_str(), cache) == true && - cache >= data.ModificationTime()) { + cache >= data.ModificationTime()) + { sendHead(client, 304, headers); continue; } } - condition = LookupTag(*m, "If-Range", ""); - bool ignoreRange = false; - if (condition.empty() == false) { - time_t cache; - if (RFC1123StrToTime(condition.c_str(), cache) == false || - cache < data.ModificationTime()) - ignoreRange = true; - } - condition = LookupTag(*m, "Range", ""); - if (ignoreRange == false && condition.empty() == false && - strncmp(condition.c_str(), "bytes=", 6) == 0) { - size_t end = condition.find(','); - // FIXME: support multiple byte-ranges - if (end == std::string::npos) { - size_t start = 6; - unsigned long long filestart = strtoull(condition.c_str() + start, NULL, 10); - // FIXME: no fileend support - size_t dash = condition.find('-') + 1; - unsigned long long fileend = strtoull(condition.c_str() + dash, NULL, 10); - unsigned long long filesize = data.FileSize(); - if (fileend == 0 || fileend == filesize) { - if (filesize > filestart) { - data.Skip(filestart); - std::ostringstream contentlength; - contentlength << "Content-Length: " << (filesize - filestart); - headers.push_back(contentlength.str()); - std::ostringstream contentrange; - contentrange << "Content-Range: bytes " << filestart << "-" - << filesize - 1 << "/" << filesize; - headers.push_back(contentrange.str()); - sendHead(client, 206, headers); - if (sendContent == true) - sendFile(client, data); - continue; - } else { - headers.push_back("Content-Length: 0"); - std::ostringstream contentrange; - contentrange << "Content-Range: bytes 0-0/" << filesize; - headers.push_back(contentrange.str()); - sendHead(client, 416, headers); - continue; - } - } - } - } addFileHeaders(headers, data); sendHead(client, 200, headers); if (sendContent == true) sendFile(client, data); } - else if (DirectoryExists(filename) == true) { + else if (DirectoryExists(filename) == true) + { if (filename == "." || filename[filename.length()-1] == '/') sendDirectoryListing(client, filename, *m, sendContent); else sendRedirect(client, 301, filename.append("/"), *m, sendContent); } else - { - ::Configuration::Item const *Replaces = _config->Tree("aptwebserver::redirect::replace"); - if (Replaces != NULL) { - std::string redirect = "/" + filename; - for (::Configuration::Item *I = Replaces->Child; I != NULL; I = I->Next) - redirect = SubstVar(redirect, I->Tag, I->Value); - redirect.erase(0,1); - if (redirect != filename) { - sendRedirect(client, 301, redirect, *m, sendContent); - continue; - } - } sendError(client, 404, *m, sendContent); - } } _error->DumpErrors(std::cerr); messages.clear(); @@@ -509,5 -537,7 +553,7 @@@ << " on socket " << sock << std::endl; close(client); } + pidfile.Close(); + return 0; } diff --combined test/interactive-helper/makefile index fee94cd77,f43df97e3..74659cf12 --- a/test/interactive-helper/makefile +++ b/test/interactive-helper/makefile @@@ -1,6 -1,7 +1,7 @@@ # -*- make -*- BASE=../.. SUBDIR=test/interactive-helper + APT_DOMAIN=none # Bring in the default rules include ../../buildlib/defaults.mak @@@ -38,7 -39,7 +39,7 @@@ include $(PROGRAM_H #SOURCE = rpmver.cc #include $(PROGRAM_H) -# Program for testing udevcdrom +# very simple webserver for APT testing PROGRAM=aptwebserver SLIBS = -lapt-pkg LIB_MAKES = apt-pkg/makefile