summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apt-pkg/contrib/netrc.cc211
-rw-r--r--apt-pkg/contrib/netrc.h29
-rw-r--r--apt-pkg/deb/dpkgpm.cc1
-rw-r--r--apt-pkg/depcache.cc2
-rw-r--r--apt-pkg/indexcopy.cc6
-rw-r--r--apt-pkg/init.cc1
-rw-r--r--apt-pkg/init.h2
-rw-r--r--apt-pkg/makefile6
-rw-r--r--apt-pkg/packagemanager.cc10
-rw-r--r--buildlib/configure.mak10
-rw-r--r--cmdline/apt-get.cc262
-rwxr-xr-xcmdline/apt-key18
-rw-r--r--debian/apt.conf.autoremove1
-rw-r--r--debian/changelog110
-rw-r--r--doc/examples/configure-index2
-rw-r--r--doc/po/apt-doc.pot311
-rw-r--r--doc/po/de.po278
-rw-r--r--doc/po/es.po282
-rw-r--r--doc/po/fr.po399
-rw-r--r--doc/po/it.po278
-rw-r--r--doc/po/ja.po469
-rw-r--r--doc/po/pl.po278
-rw-r--r--doc/po/pt_BR.po278
-rw-r--r--methods/ftp.cc5
-rw-r--r--methods/http.cc7
-rw-r--r--methods/https.cc9
-rw-r--r--methods/https.h2
-rw-r--r--po/apt-all.pot288
-rw-r--r--po/it.po423
-rw-r--r--po/sk.po477
-rw-r--r--po/zh_CN.po883
31 files changed, 2641 insertions, 2697 deletions
diff --git a/apt-pkg/contrib/netrc.cc b/apt-pkg/contrib/netrc.cc
new file mode 100644
index 000000000..d8027fc24
--- /dev/null
+++ b/apt-pkg/contrib/netrc.cc
@@ -0,0 +1,211 @@
+// -*- mode: cpp; mode: fold -*-
+// Description /*{{{*/
+// $Id: netrc.c,v 1.38 2007-11-07 09:21:35 bagder Exp $
+/* ######################################################################
+
+ netrc file parser - returns the login and password of a give host in
+ a specified netrc-type file
+
+ Originally written by Daniel Stenberg, <daniel@haxx.se>, et al. and
+ placed into the Public Domain, do with it what you will.
+
+ ##################################################################### */
+ /*}}}*/
+
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/fileutl.h>
+#include <iostream>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <pwd.h>
+
+#include "netrc.h"
+
+
+/* Get user and password from .netrc when given a machine name */
+
+enum {
+ NOTHING,
+ HOSTFOUND, /* the 'machine' keyword was found */
+ HOSTCOMPLETE, /* the machine name following the keyword was found too */
+ HOSTVALID, /* this is "our" machine! */
+ HOSTEND /* LAST enum */
+};
+
+/* make sure we have room for at least this size: */
+#define LOGINSIZE 64
+#define PASSWORDSIZE 64
+#define NETRC DOT_CHAR "netrc"
+
+/* returns -1 on failure, 0 if the host is found, 1 is the host isn't found */
+int parsenetrc (char *host, char *login, char *password, char *netrcfile = NULL)
+{
+ FILE *file;
+ int retcode = 1;
+ int specific_login = (login[0] != 0);
+ char *home = NULL;
+ bool netrc_alloc = false;
+ int state = NOTHING;
+
+ char state_login = 0; /* Found a login keyword */
+ char state_password = 0; /* Found a password keyword */
+ int state_our_login = false; /* With specific_login,
+ found *our* login name */
+
+ if (!netrcfile) {
+ home = getenv ("HOME"); /* portable environment reader */
+
+ if (!home) {
+ struct passwd *pw;
+ pw = getpwuid (geteuid ());
+ if(pw)
+ home = pw->pw_dir;
+ }
+
+ if (!home)
+ return -1;
+
+ asprintf (&netrcfile, "%s%s%s", home, DIR_CHAR, NETRC);
+ if(!netrcfile)
+ return -1;
+ else
+ netrc_alloc = true;
+ }
+
+ file = fopen (netrcfile, "r");
+ if(file) {
+ char *tok;
+ char *tok_buf;
+ bool done = false;
+ char netrcbuffer[256];
+
+ while (!done && fgets(netrcbuffer, sizeof (netrcbuffer), file)) {
+ tok = strtok_r (netrcbuffer, " \t\n", &tok_buf);
+ while (!done && tok) {
+ if(login[0] && password[0]) {
+ done = true;
+ break;
+ }
+
+ switch(state) {
+ case NOTHING:
+ if (!strcasecmp ("machine", tok)) {
+ /* the next tok is the machine name, this is in itself the
+ delimiter that starts the stuff entered for this machine,
+ after this we need to search for 'login' and
+ 'password'. */
+ state = HOSTFOUND;
+ }
+ break;
+ case HOSTFOUND:
+ /* extended definition of a "machine" if we have a "/"
+ we match the start of the string (host.startswith(token) */
+ if ((strchr(host, '/') && strstr(host, tok) == host) ||
+ (!strcasecmp (host, tok))) {
+ /* and yes, this is our host! */
+ state = HOSTVALID;
+ retcode = 0; /* we did find our host */
+ }
+ else
+ /* not our host */
+ state = NOTHING;
+ break;
+ case HOSTVALID:
+ /* we are now parsing sub-keywords concerning "our" host */
+ if (state_login) {
+ if (specific_login)
+ state_our_login = !strcasecmp (login, tok);
+ else
+ strncpy (login, tok, LOGINSIZE - 1);
+ state_login = 0;
+ } else if (state_password) {
+ if (state_our_login || !specific_login)
+ strncpy (password, tok, PASSWORDSIZE - 1);
+ state_password = 0;
+ } else if (!strcasecmp ("login", tok))
+ state_login = 1;
+ else if (!strcasecmp ("password", tok))
+ state_password = 1;
+ else if(!strcasecmp ("machine", tok)) {
+ /* ok, there's machine here go => */
+ state = HOSTFOUND;
+ state_our_login = false;
+ }
+ break;
+ } /* switch (state) */
+
+ tok = strtok_r (NULL, " \t\n", &tok_buf);
+ } /* while(tok) */
+ } /* while fgets() */
+
+ fclose(file);
+ }
+
+ if (netrc_alloc)
+ free(netrcfile);
+
+ return retcode;
+}
+
+void maybe_add_auth (URI &Uri, string NetRCFile)
+{
+ if (_config->FindB("Debug::Acquire::netrc", false) == true)
+ std::clog << "maybe_add_auth: " << (string)Uri
+ << " " << NetRCFile << std::endl;
+ if (Uri.Password.empty () == true || Uri.User.empty () == true)
+ {
+ if (NetRCFile.empty () == false)
+ {
+ char login[64] = "";
+ char password[64] = "";
+ char *netrcfile = strdupa (NetRCFile.c_str ());
+
+ // first check for a generic host based netrc entry
+ char *host = strdupa (Uri.Host.c_str ());
+ if (host && parsenetrc (host, login, password, netrcfile) == 0)
+ {
+ if (_config->FindB("Debug::Acquire::netrc", false) == true)
+ std::clog << "host: " << host
+ << " user: " << login
+ << " pass-size: " << strlen(password)
+ << std::endl;
+ Uri.User = string (login);
+ Uri.Password = string (password);
+ return;
+ }
+
+ // if host did not work, try Host+Path next, this will trigger
+ // a lookup uri.startswith(host) in the netrc file parser (because
+ // of the "/"
+ char *hostpath = strdupa (string(Uri.Host+Uri.Path).c_str ());
+ if (hostpath && parsenetrc (hostpath, login, password, netrcfile) == 0)
+ {
+ if (_config->FindB("Debug::Acquire::netrc", false) == true)
+ std::clog << "hostpath: " << hostpath
+ << " user: " << login
+ << " pass-size: " << strlen(password)
+ << std::endl;
+ Uri.User = string (login);
+ Uri.Password = string (password);
+ return;
+ }
+ }
+ }
+}
+
+#ifdef DEBUG
+int main(int argc, char* argv[])
+{
+ char login[64] = "";
+ char password[64] = "";
+
+ if(argc < 2)
+ return -1;
+
+ if(0 == parsenetrc (argv[1], login, password, argv[2])) {
+ printf("HOST: %s LOGIN: %s PASSWORD: %s\n", argv[1], login, password);
+ }
+}
+#endif
diff --git a/apt-pkg/contrib/netrc.h b/apt-pkg/contrib/netrc.h
new file mode 100644
index 000000000..02a5eb09f
--- /dev/null
+++ b/apt-pkg/contrib/netrc.h
@@ -0,0 +1,29 @@
+// -*- mode: cpp; mode: fold -*-
+// Description /*{{{*/
+// $Id: netrc.h,v 1.11 2004/01/07 09:19:35 bagder Exp $
+/* ######################################################################
+
+ netrc file parser - returns the login and password of a give host in
+ a specified netrc-type file
+
+ Originally written by Daniel Stenberg, <daniel@haxx.se>, et al. and
+ placed into the Public Domain, do with it what you will.
+
+ ##################################################################### */
+ /*}}}*/
+#ifndef NETRC_H
+#define NETRC_H
+
+#include <apt-pkg/strutl.h>
+
+#define DOT_CHAR "."
+#define DIR_CHAR "/"
+
+// Assume: password[0]=0, host[0] != 0.
+// If login[0] = 0, search for login and password within a machine section
+// in the netrc.
+// If login[0] != 0, search for password within machine and login.
+int parsenetrc (char *host, char *login, char *password, char *filename);
+
+void maybe_add_auth (URI &Uri, string NetRCFile);
+#endif
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index adaf362fa..6eb3b40ac 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -49,6 +49,7 @@ namespace
std::make_pair("install", N_("Installing %s")),
std::make_pair("configure", N_("Configuring %s")),
std::make_pair("remove", N_("Removing %s")),
+ std::make_pair("purge", N_("Completely removing %s")),
std::make_pair("trigproc", N_("Running post-installation trigger %s"))
};
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index 228750b74..ec7a5de64 100644
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -243,7 +243,7 @@ bool pkgDepCache::writeStateFile(OpProgress *prog, bool InstalledOnly) /*{{{*/
continue;
bool newAuto = (PkgState[pkg->ID].Flags & Flag::Auto);
if(_config->FindB("Debug::pkgAutoRemove",false))
- std::clog << "Update exisiting AutoInstall info: "
+ std::clog << "Update existing AutoInstall info: "
<< pkg.Name() << std::endl;
TFRewriteData rewrite[2];
rewrite[0].Tag = "Auto-Installed";
diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc
index 0142d7dbe..57c9f95ca 100644
--- a/apt-pkg/indexcopy.cc
+++ b/apt-pkg/indexcopy.cc
@@ -527,19 +527,19 @@ bool SigVerify::Verify(string prefix, string file, indexRecords *MetaIndex)
// (non-existing files are not considered a error)
if(!FileExists(prefix+file))
{
- _error->Warning("Skipping non-exisiting file %s", string(prefix+file).c_str());
+ _error->Warning(_("Skipping nonexistent file %s"), string(prefix+file).c_str());
return true;
}
if (!Record)
{
- _error->Warning("Can't find authentication record for: %s",file.c_str());
+ _error->Warning(_("Can't find authentication record for: %s"), file.c_str());
return false;
}
if (!Record->Hash.VerifyFile(prefix+file))
{
- _error->Warning("Hash mismatch for: %s",file.c_str());
+ _error->Warning(_("Hash mismatch for: %s"),file.c_str());
return false;
}
diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index 15efb1a3d..a54c09a36 100644
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -65,6 +65,7 @@ bool pkgInitConfig(Configuration &Cnf)
Cnf.Set("Dir::Etc::vendorlist","vendors.list");
Cnf.Set("Dir::Etc::vendorparts","vendors.list.d");
Cnf.Set("Dir::Etc::main","apt.conf");
+ Cnf.Set("Dir::ETc::netrc", "auth.conf");
Cnf.Set("Dir::Etc::parts","apt.conf.d");
Cnf.Set("Dir::Etc::preferences","preferences");
Cnf.Set("Dir::Etc::preferencesparts","preferences.d");
diff --git a/apt-pkg/init.h b/apt-pkg/init.h
index b3e4b147f..f0757f644 100644
--- a/apt-pkg/init.h
+++ b/apt-pkg/init.h
@@ -22,7 +22,7 @@
// Non-ABI-Breaks should only increase RELEASE number.
// See also buildlib/libversion.mak
#define APT_PKG_MAJOR 4
-#define APT_PKG_MINOR 9
+#define APT_PKG_MINOR 8
#define APT_PKG_RELEASE 0
extern const char *pkgVersion;
diff --git a/apt-pkg/makefile b/apt-pkg/makefile
index f71367ace..3d6209658 100644
--- a/apt-pkg/makefile
+++ b/apt-pkg/makefile
@@ -21,10 +21,10 @@ APT_DOMAIN:=libapt-pkg$(LIBAPTPKG_MAJOR)
SOURCE = contrib/mmap.cc contrib/error.cc contrib/strutl.cc \
contrib/configuration.cc contrib/progress.cc contrib/cmndline.cc \
contrib/md5.cc contrib/sha1.cc contrib/sha256.cc contrib/hashes.cc \
- contrib/cdromutl.cc contrib/crc-16.cc \
+ contrib/cdromutl.cc contrib/crc-16.cc contrib/netrc.cc \
contrib/fileutl.cc
-HEADERS = mmap.h error.h configuration.h fileutl.h cmndline.h \
- md5.h crc-16.h cdromutl.h strutl.h sptr.h sha1.h sha256.h hashes.h
+HEADERS = mmap.h error.h configuration.h fileutl.h cmndline.h netrc.h\
+ md5.h crc-16.h cdromutl.h strutl.h sptr.h sha1.h sha256.h hashes.h
# Source code for the core main library
SOURCE+= pkgcache.cc version.cc depcache.cc \
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 1ab3203a1..491bff110 100644
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -293,6 +293,9 @@ bool pkgPackageManager::ConfigureAll()
of it's dependents. */
bool pkgPackageManager::SmartConfigure(PkgIterator Pkg)
{
+ if (Debug == true)
+ clog << "SmartConfigure " << Pkg.Name() << endl;
+
pkgOrderList OList(&Cache);
if (DepAdd(OList,Pkg) == false)
@@ -489,6 +492,9 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg)
while (End->Type == pkgCache::Dep::PreDepends)
{
+ if (Debug == true)
+ clog << "PreDepends order for " << Pkg.Name() << std::endl;
+
// Look for possible ok targets.
SPtrArray<Version *> VList = Start.AllTargets();
bool Bad = true;
@@ -502,6 +508,8 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg)
Pkg.State() == PkgIterator::NeedsNothing)
{
Bad = false;
+ if (Debug == true)
+ clog << "Found ok package " << Pkg.Name() << endl;
continue;
}
}
@@ -517,6 +525,8 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg)
(Cache[Pkg].Keep() == true && Pkg.State() == PkgIterator::NeedsNothing))
continue;
+ if (Debug == true)
+ clog << "Trying to SmartConfigure " << Pkg.Name() << endl;
Bad = !SmartConfigure(Pkg);
}
diff --git a/buildlib/configure.mak b/buildlib/configure.mak
index d3c548ee3..310c2600c 100644
--- a/buildlib/configure.mak
+++ b/buildlib/configure.mak
@@ -15,11 +15,13 @@ BUILDDIR=build
.PHONY: startup
startup: configure $(BUILDDIR)/config.status $(addprefix $(BUILDDIR)/,$(CONVERTED))
-configure: aclocal.m4 configure.in
- # use the files provided from the system instead of carry around
- # and use (most of the time outdated) copycats
+# use the files provided from the system instead of carry around
+# and use (most of the time outdated) copycats
+buildlib/config.sub:
ln -sf /usr/share/misc/config.sub buildlib/config.sub
- ln -sf /usr/share/misc/config.guess buildlib/config.guess
+buildlib/config.guess:
+ ln -sf /usr/share/misc/config.guess buildlib/config.guess
+configure: aclocal.m4 configure.in buildlib/config.guess buildlib/config.sub
autoconf
aclocal.m4: $(wildcard buildlib/*.m4)
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 7325bbf22..f84c82d28 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1247,131 +1247,143 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
pkgSrcRecords &SrcRecs,string &Src,
pkgDepCache &Cache)
{
- string VerTag;
- string DefRel = _config->Find("APT::Default-Release");
- string TmpSrc = Name;
- const size_t found = TmpSrc.find_last_of("/=");
-
- // extract the version/release from the pkgname
- if (found != string::npos) {
- if (TmpSrc[found] == '/')
- DefRel = TmpSrc.substr(found+1);
- else
- VerTag = TmpSrc.substr(found+1);
- TmpSrc = TmpSrc.substr(0,found);
- }
-
- /* Lookup the version of the package we would install if we were to
- install a version and determine the source package name, then look
- in the archive for a source package of the same name. */
- bool MatchSrcOnly = _config->FindB("APT::Get::Only-Source");
- const pkgCache::PkgIterator Pkg = Cache.FindPkg(TmpSrc);
- if (MatchSrcOnly == false && Pkg.end() == false) {
- if(VerTag.empty() == false || DefRel.empty() == false) {
- // we have a default release, try to locate the pkg. we do it like
- // this because GetCandidateVer() will not "downgrade", that means
- // "apt-get source -t stable apt" won't work on a unstable system
- for (pkgCache::VerIterator Ver = Pkg.VersionList();
- Ver.end() == false; Ver++) {
- for (pkgCache::VerFileIterator VF = Ver.FileList();
- VF.end() == false; VF++) {
- /* If this is the status file, and the current version is not the
- version in the status file (ie it is not installed, or somesuch)
- then it is not a candidate for installation, ever. This weeds
- out bogus entries that may be due to config-file states, or
- other. */
- if ((VF.File()->Flags & pkgCache::Flag::NotSource) ==
- pkgCache::Flag::NotSource && Pkg.CurrentVer() != Ver)
- continue;
-
- // We match against a concrete version (or a part of this version)
- if (VerTag.empty() == false && strncmp(VerTag.c_str(), Ver.VerStr(), VerTag.size()) != 0)
- continue;
-
- // or we match against a release
- if(VerTag.empty() == false ||
- (VF.File().Archive() != 0 && VF.File().Archive() == DefRel) ||
- (VF.File().Codename() != 0 && VF.File().Codename() == DefRel)) {
- pkgRecords::Parser &Parse = Recs.Lookup(VF);
- Src = Parse.SourcePkg();
- if (VerTag.empty() == true)
- VerTag = Parse.SourceVer();
- break;
- }
- }
- }
- if (Src.empty() == true) {
- if (VerTag.empty() == false)
- _error->Warning(_("Ignore unavailable version '%s' of package '%s'"), VerTag.c_str(), TmpSrc.c_str());
- else
- _error->Warning(_("Ignore unavailable target release '%s' of package '%s'"), DefRel.c_str(), TmpSrc.c_str());
- VerTag.clear();
- DefRel.clear();
- }
- }
- if (VerTag.empty() == true && DefRel.empty() == true) {
- // if we don't have a version or default release, use the CandidateVer to find the Source
- pkgCache::VerIterator Ver = Cache.GetCandidateVer(Pkg);
- if (Ver.end() == false) {
- pkgRecords::Parser &Parse = Recs.Lookup(Ver.FileList());
- Src = Parse.SourcePkg();
- VerTag = Parse.SourceVer();
- }
- }
- }
-
- if (Src.empty() == true)
- Src = TmpSrc;
- else {
- /* if we have a source pkg name, make sure to only search
- for srcpkg names, otherwise apt gets confused if there
- is a binary package "pkg1" and a source package "pkg1"
- with the same name but that comes from different packages */
- MatchSrcOnly = true;
- if (Src != TmpSrc) {
- ioprintf(c1out, _("Picking '%s' as source package instead of '%s'\n"), Src.c_str(), TmpSrc.c_str());
- }
- }
-
- // The best hit
- pkgSrcRecords::Parser *Last = 0;
- unsigned long Offset = 0;
- string Version;
-
- /* Iterate over all of the hits, which includes the resulting
- binary packages in the search */
- pkgSrcRecords::Parser *Parse;
- while (true) {
- SrcRecs.Restart();
- while ((Parse = SrcRecs.Find(Src.c_str(), MatchSrcOnly)) != 0) {
- const string Ver = Parse->Version();
-
- // Ignore all versions which doesn't fit
- if (VerTag.empty() == false && strncmp(VerTag.c_str(), Ver.c_str(), VerTag.size()) != 0)
- continue;
-
- // Newer version or an exact match? Save the hit
- if (Last == 0 || Cache.VS().CmpVersion(Version,Ver) < 0) {
- Last = Parse;
- Offset = Parse->Offset();
- Version = Ver;
- }
-
- // was the version check above an exact match? If so, we don't need to look further
- if (VerTag.empty() == false && VerTag.size() == Ver.size())
- break;
- }
- if (Last != 0 || VerTag.empty() == true)
- break;
- //if (VerTag.empty() == false && Last == 0)
- _error->Warning(_("Ignore unavailable version '%s' of package '%s'"), VerTag.c_str(), TmpSrc.c_str());
- VerTag.clear();
- }
-
- if (Last == 0 || Last->Jump(Offset) == false)
- return 0;
-
- return Last;
+ string VerTag;
+ string DefRel = _config->Find("APT::Default-Release");
+ string TmpSrc = Name;
+
+ // extract the version/release from the pkgname
+ const size_t found = TmpSrc.find_last_of("/=");
+ if (found != string::npos) {
+ if (TmpSrc[found] == '/')
+ DefRel = TmpSrc.substr(found+1);
+ else
+ VerTag = TmpSrc.substr(found+1);
+ TmpSrc = TmpSrc.substr(0,found);
+ }
+
+ /* Lookup the version of the package we would install if we were to
+ install a version and determine the source package name, then look
+ in the archive for a source package of the same name. */
+ bool MatchSrcOnly = _config->FindB("APT::Get::Only-Source");
+ const pkgCache::PkgIterator Pkg = Cache.FindPkg(TmpSrc);
+ if (MatchSrcOnly == false && Pkg.end() == false)
+ {
+ if(VerTag.empty() == false || DefRel.empty() == false)
+ {
+ // we have a default release, try to locate the pkg. we do it like
+ // this because GetCandidateVer() will not "downgrade", that means
+ // "apt-get source -t stable apt" won't work on a unstable system
+ for (pkgCache::VerIterator Ver = Pkg.VersionList();
+ Ver.end() == false; Ver++)
+ {
+ for (pkgCache::VerFileIterator VF = Ver.FileList();
+ VF.end() == false; VF++)
+ {
+ /* If this is the status file, and the current version is not the
+ version in the status file (ie it is not installed, or somesuch)
+ then it is not a candidate for installation, ever. This weeds
+ out bogus entries that may be due to config-file states, or
+ other. */
+ if ((VF.File()->Flags & pkgCache::Flag::NotSource) ==
+ pkgCache::Flag::NotSource && Pkg.CurrentVer() != Ver)
+ continue;
+
+ // We match against a concrete version (or a part of this version)
+ if (VerTag.empty() == false && strncmp(VerTag.c_str(), Ver.VerStr(), VerTag.size()) != 0)
+ continue;
+
+ // or we match against a release
+ if(VerTag.empty() == false ||
+ (VF.File().Archive() != 0 && VF.File().Archive() == DefRel) ||
+ (VF.File().Codename() != 0 && VF.File().Codename() == DefRel))
+ {
+ pkgRecords::Parser &Parse = Recs.Lookup(VF);
+ Src = Parse.SourcePkg();
+ if (VerTag.empty() == true)
+ VerTag = Parse.SourceVer();
+ break;
+ }
+ }
+ }
+ if (Src.empty() == true)
+ {
+ if (VerTag.empty() == false)
+ _error->Warning(_("Ignore unavailable version '%s' of package '%s'"), VerTag.c_str(), TmpSrc.c_str());
+ else
+ _error->Warning(_("Ignore unavailable target release '%s' of package '%s'"), DefRel.c_str(), TmpSrc.c_str());
+ VerTag.clear();
+ DefRel.clear();
+ }
+ }
+ if (VerTag.empty() == true && DefRel.empty() == true)
+ {
+ // if we don't have a version or default release, use the CandidateVer to find the Source
+ pkgCache::VerIterator Ver = Cache.GetCandidateVer(Pkg);
+ if (Ver.end() == false)
+ {
+ pkgRecords::Parser &Parse = Recs.Lookup(Ver.FileList());
+ Src = Parse.SourcePkg();
+ VerTag = Parse.SourceVer();
+ }
+ }
+ }
+
+ if (Src.empty() == true)
+ Src = TmpSrc;
+ else
+ {
+ /* if we have a source pkg name, make sure to only search
+ for srcpkg names, otherwise apt gets confused if there
+ is a binary package "pkg1" and a source package "pkg1"
+ with the same name but that comes from different packages */
+ MatchSrcOnly = true;
+ if (Src != TmpSrc)
+ {
+ ioprintf(c1out, _("Picking '%s' as source package instead of '%s'\n"), Src.c_str(), TmpSrc.c_str());
+ }
+ }
+
+ // The best hit
+ pkgSrcRecords::Parser *Last = 0;
+ unsigned long Offset = 0;
+ string Version;
+
+ /* Iterate over all of the hits, which includes the resulting
+ binary packages in the search */
+ pkgSrcRecords::Parser *Parse;
+ while (true)
+ {
+ SrcRecs.Restart();
+ while ((Parse = SrcRecs.Find(Src.c_str(), MatchSrcOnly)) != 0)
+ {
+ const string Ver = Parse->Version();
+
+ // Ignore all versions which doesn't fit
+ if (VerTag.empty() == false && strncmp(VerTag.c_str(), Ver.c_str(), VerTag.size()) != 0)
+ continue;
+
+ // Newer version or an exact match? Save the hit
+ if (Last == 0 || Cache.VS().CmpVersion(Version,Ver) < 0) {
+ Last = Parse;
+ Offset = Parse->Offset();
+ Version = Ver;
+ }
+
+ // was the version check above an exact match? If so, we don't need to look further
+ if (VerTag.empty() == false && VerTag.size() == Ver.size())
+ break;
+ }
+ if (Last != 0 || VerTag.empty() == true)
+ break;
+ //if (VerTag.empty() == false && Last == 0)
+ _error->Warning(_("Ignore unavailable version '%s' of package '%s'"), VerTag.c_str(), TmpSrc.c_str());
+ VerTag.clear();
+ }
+
+ if (Last == 0 || Last->Jump(Offset) == false)
+ return 0;
+
+ return Last;
}
/*}}}*/
// DoUpdate - Update the package lists /*{{{*/
diff --git a/cmdline/apt-key b/cmdline/apt-key
index 7bb30240e..5f4e02fdf 100755
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -93,13 +93,17 @@ update() {
# add any security. we *need* this check on net-update though
$GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export | $GPG --import
- # remove no-longer supported/used keys
- keys=`$GPG_CMD --keyring $REMOVED_KEYS --with-colons --list-keys | grep ^pub | cut -d: -f5`
- for key in $keys; do
- if $GPG --list-keys --with-colons | grep ^pub | cut -d: -f5 | grep -q $key; then
- $GPG --quiet --batch --delete-key --yes ${key}
- fi
- done
+ if [ -r "$REMOVED_KEYS" ]; then
+ # remove no-longer supported/used keys
+ keys=`$GPG_CMD --keyring $REMOVED_KEYS --with-colons --list-keys | grep ^pub | cut -d: -f5`
+ for key in $keys; do
+ if $GPG --list-keys --with-colons | grep ^pub | cut -d: -f5 | grep -q $key; then
+ $GPG --quiet --batch --delete-key --yes ${key}
+ fi
+ done
+ else
+ echo "Warning: removed keys keyring $REMOVED_KEYS missing or not readable" >&2
+ fi
}
diff --git a/debian/apt.conf.autoremove b/debian/apt.conf.autoremove
index 98143ce9a..b41be8397 100644
--- a/debian/apt.conf.autoremove
+++ b/debian/apt.conf.autoremove
@@ -4,5 +4,6 @@ APT
{
"^linux-image.*";
"^linux-restricted-modules.*";
+ "^kfreebsd-image.*";
};
};
diff --git a/debian/changelog b/debian/changelog
index 26b3e8c1e..5cd6eeb4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,45 @@
+apt (0.7.26) UNRELEASED; urgency=low
+
+ [ David Kalnischkies ]
+ * [BREAK] add possibility to download and use multiply
+ Translation files, configurable with Acquire::Translation
+ (Closes: #444222, #448216, #550564)
+ * Ignore :qualifiers after package name in build dependencies
+ for now as long we don't understand them (Closes: #558103)
+ * doc/apt.conf.5.xml:
+ - briefly document the behaviour of the new https options
+ * methods/connect.cc:
+ - add AI_ADDRCONFIG to ai_flags as suggested by Aurelien Jarno
+ in response to Bernhard R. Link, thanks! (Closes: #505020)
+ * methods/rred.cc:
+ - rewrite to be able to handle even big patch files
+ - adopt optional mmap+iovec patch from Morten Hustveit
+ (Closes: #463354) which should speed up a bit. Thanks!
+ * apt-pkg/contrib/mmap.{cc,h}:
+ - extend it to have a growable flag - unused now but maybe...
+ * apt-pkg/pkgcache.h:
+ - use long instead of short for {Ver,Desc}File size,
+ patch from Víctor Manuel Jáquez Leal, thanks! (Closes: #538917)
+ * apt-pkg/acquire-item.cc:
+ - allow also to skip the last patch if target is reached,
+ thanks Bernhard R. Link! (Closes: #545699)
+ * methods/http{,s}.cc
+ - add config setting for User-Agent to the Acquire group,
+ thanks Timothy J. Miller! (Closes: #355782)
+ - add https options which default to http ones (Closes: #557085)
+ * ftparchive/writer.{cc,h}:
+ - add APT::FTPArchive::AlwaysStat to disable the too aggressive
+ caching if versions are build multiply times (not recommend)
+ Patch by Christoph Goehre, thanks! (Closes: #463260)
+ * ftparchive/*:
+ - fix a few typos in strings, comments and manpage,
+ thanks Karl Goetz! (Closes: #558757)
+ * debian/apt.cron.daily:
+ - check cache size even if we do nothing else otherwise, thanks
+ Francesco Poli for patch(s) and patience! (Closes: #459344)
+
+ -- Michael Vogt <mvo@debian.org> Thu, 10 Dec 2009 22:02:38 +0100
+
apt (0.7.25) UNRELEASED; urgency=low
[ Christian Perrier ]
@@ -17,13 +59,36 @@ apt (0.7.25) UNRELEASED; urgency=low
Closes: #552606
* Italian translation update by Milo Casagrande
Closes: #555797
+ * Simplified Chinese translation update by Aron Xu
+ Closes: #558737
+ * Slovak translation update by Ivan Masár
+ Closes: #559277
+
+ [ Michael Vogt ]
+ * 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 (Closes: #518473)
+ (thanks also to Jussi Hakala and Julian Andres Klode)
+ * apt-pkg/deb/dpkgpm.cc:
+ - add "purge" to list of known actions
+
+ [ Brian Murray ]
+ * apt-pkg/depcache.cc, apt-pkg/indexcopy.cc:
+ - typo fix (LP: #462328)
+
+ [ Loïc Minier ]
+ * cmdline/apt-key:
+ - Emit a warning if removed keys keyring is missing and skip associated
+ checks (LP: #218971)
[ David Kalnischkies ]
- * [BREAK] add possibility to download and use multiply
- Translation files, configurable with Acquire::Translation
- (Closes: #444222, #448216, #550564)
- * Ignore :qualifiers after package name in build dependencies
- for now as long we don't understand them (Closes: #558103)
* apt-pkg/packagemanager.cc:
- better debug output for ImmediateAdd with depth and why
- improve the message shown for failing immediate configuration
@@ -31,7 +96,6 @@ apt (0.7.25) UNRELEASED; urgency=low
* doc/po4a.conf: activate translation of guide.sgml and offline.sgml
* doc/apt.conf.5.xml:
- provide a few more details about APT::Immediate-Configure
- - briefly document the behaviour of the new https options
* doc/sources.list.5.xml:
- add note about additional apt-transport-methods
* doc/apt-mark.8.xml:
@@ -44,8 +108,6 @@ apt (0.7.25) UNRELEASED; urgency=low
- add --debian-only as alias for --diff-only
* methods/connect.cc:
- display also strerror of "wicked" getaddrinfo errors
- - add AI_ADDRCONFIG to ai_flags as suggested by Aurelien Jarno
- in response to Bernhard R. Link, thanks! (Closes: #505020)
* buildlib/configure.mak, buildlib/config.{sub,guess}:
- remove (outdated) config.{sub,guess} and use the ones provided
by the new added build-dependency autotools-dev instead
@@ -59,40 +121,15 @@ apt (0.7.25) UNRELEASED; urgency=low
- bump policy to 3.8.3 as we have no outdated manpages anymore
* debian/NEWS:
- fix a typo in 0.7.24: Allready -> Already (Closes: #557674)
- * methods/rred.cc:
- - rewrite to be able to handle even big patch files
- - adopt optional mmap+iovec patch from Morten Hustveit
- (Closes: #463354) which should speed up a bit. Thanks!
- * apt-pkg/contrib/mmap.{cc,h}:
- - extend it to have a growable flag - unused now but maybe...
- * apt-pkg/pkgcache.h:
- - use long instead of short for {Ver,Desc}File size,
- patch from Víctor Manuel Jáquez Leal, thanks! (Closes: #538917)
- * apt-pkg/acquire-item.cc:
- - allow also to skip the last patch if target is reached,
- thanks Bernhard R. Link! (Closes: #545699)
* cmdline/apt-mark:
- print an error if a new state file can't be created,
thanks Carl Chenet! (Closes: #521289)
- print an error and exit if python-apt is not installed,
thanks Carl Chenet! (Closes: #521284)
- * methods/http{,s}.cc
- - add config setting for User-Agent to the Acquire group,
- thanks Timothy J. Miller! (Closes: #355782)
- - add https options which default to http ones (Closes: #557085)
* ftparchive/writer.{cc,h}:
- add APT::FTPArchive::LongDescription to be able to disable them
- - add APT::FTPArchive::AlwaysStat to disable the too aggressive
- caching if versions are build multiply times (not recommend)
- Patch by Christoph Goehre, thanks! (Closes: #463260)
- * ftparchive/*:
- - fix a few typos in strings, comments and manpage,
- thanks Karl Goetz! (Closes: #558757)
* apt-pkg/deb/debsrcrecords.cc:
- use "diff" filetype for .debian.tar.* files (Closes: #554898)
- * debian/apt.cron.daily:
- - check cache size even if we do nothing else otherwise, thanks
- Francesco Poli for patch(s) and patience! (Closes: #459344)
[ Chris Leick ]
* doc/ various manpages:
@@ -113,13 +150,12 @@ apt (0.7.25) UNRELEASED; urgency=low
- Restrict option names to alphanumerical characters and "/-:._+".
- Deprecate #include, we have apt.conf.d nowadays which should be
sufficient.
- * methods/https.cc:
- - Add support for authentication using netrc (Closes: #518473), patch
- by Jussi Hakala <jussi.hakala@hut.fi>.
* ftparchive/apt-ftparchive.cc:
- Call setlocale() so translations are actually used.
+ * debian/apt.conf.autoremove:
+ - Add kfreebsd-image-* to the list (Closes: #558803)
- -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 29 Sep 2009 15:51:34 +0200
+ -- Michael Vogt <mvo@debian.org> Thu, 10 Dec 2009 22:02:38 +0100
apt (0.7.24) unstable; urgency=low
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 05826feaa..0a20e8f2b 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -309,6 +309,7 @@ Dir "/"
// Config files
Etc "etc/apt/" {
Main "apt.conf";
+ Netrc "auth.conf";
Parts "apt.conf.d/";
Preferences "preferences";
PreferencesParts "preferences.d";
@@ -407,6 +408,7 @@ Debug
Acquire::gpgv "false"; // Show the gpgv traffic
aptcdrom "false"; // Show found package files
IdentCdrom "false";
+ acquire::netrc "false"; // netrc parser
}
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 5172f7f84..58af2ebdf 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-28 02:08+0100\n"
+"POT-Creation-Date: 2009-12-10 22:04+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1411,12 +1411,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554 apt-sortpkgs.1.xml:64
+#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:556 apt-get.8.xml:554 apt-sortpkgs.1.xml:64
msgid "&apt-commonoptions;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 apt.conf.5.xml:1017 apt_preferences.5.xml:615
+#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 apt.conf.5.xml:988 apt_preferences.5.xml:615
msgid "Files"
msgstr ""
@@ -1426,7 +1426,7 @@ msgid "&file-sourceslist; &file-statelists;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622 sources.list.5.xml:233
+#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569 apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:994 apt_preferences.5.xml:622 sources.list.5.xml:233
msgid "See Also"
msgstr ""
@@ -1436,7 +1436,7 @@ msgid "&apt-conf;, &sources-list;, &apt-get;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575 apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
+#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:576 apt-get.8.xml:575 apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
msgstr ""
@@ -1735,7 +1735,7 @@ msgid "Just show the contents of the configuration space."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585 apt-sortpkgs.1.xml:70
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573 apt-sortpkgs.1.xml:70
msgid "&apt-conf;"
msgstr ""
@@ -2690,30 +2690,11 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:547
-msgid "<option>APT::FTPArchive::AlwaysStat</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:549
-msgid ""
-"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If "
-"packages are recompiled and/or republished with the same version again, this "
-"will lead to problems as the now outdated cached metadata like size and "
-"checksums will be used. With this option enabled this will no longer happen "
-"as it will be checked if the file was changed. Note that this option is set "
-"to \"<literal>false</literal>\" by default as it is not recommend to upload "
-"multiply versions/builds of a package with the same versionnumber, so in "
-"theory nobody will have these problems and therefore all these extra checks "
-"are useless."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:559
msgid "<option>APT::FTPArchive::LongDescription</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml:549
msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
"only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -2723,12 +2704,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1011 apt_preferences.5.xml:462 sources.list.5.xml:193
+#: apt-ftparchive.1.xml:561 apt.conf.5.xml:982 apt_preferences.5.xml:462 sources.list.5.xml:193
msgid "Examples"
msgstr ""
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:579
+#: apt-ftparchive.1.xml:567
#, no-wrap
msgid ""
"<command>apt-ftparchive</command> packages "
@@ -2737,14 +2718,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:575
+#: apt-ftparchive.1.xml:563
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:589
+#: apt-ftparchive.1.xml:577
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -4642,7 +4623,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:264 apt.conf.5.xml:328
+#: apt.conf.5.xml:264 apt.conf.5.xml:321
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method, this applies to all things including connection timeout and data "
@@ -4680,12 +4661,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:286
+#: apt.conf.5.xml:281
msgid "https"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:287
+#: apt.conf.5.xml:282
msgid ""
"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
"options are the same as for <literal>http</literal> method and will also "
@@ -4695,7 +4676,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:286
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -4717,12 +4698,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:311 sources.list.5.xml:150
+#: apt.conf.5.xml:304 sources.list.5.xml:150
msgid "ftp"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:312
+#: apt.conf.5.xml:305
msgid ""
"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@ -4742,7 +4723,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#: apt.conf.5.xml:324
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 "
@@ -4752,7 +4733,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:338
+#: apt.conf.5.xml:331
msgid ""
"It is possible to proxy FTP over HTTP by setting the "
"<envar>ftp_proxy</envar> environment variable to a http url - see the "
@@ -4762,7 +4743,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:343
+#: apt.conf.5.xml:336
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4772,18 +4753,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:350 sources.list.5.xml:132
+#: apt.conf.5.xml:343 sources.list.5.xml:132
msgid "cdrom"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:356
+#: apt.conf.5.xml:349
#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:344
msgid ""
"CDROM URIs; the only setting for CDROM URIs is the mount point, "
"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@ -4796,12 +4777,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:361
+#: apt.conf.5.xml:354
msgid "gpgv"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:362
+#: apt.conf.5.xml:355
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
@@ -4809,12 +4790,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:360
msgid "CompressionTypes"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:373
+#: apt.conf.5.xml:366
#, no-wrap
msgid ""
"Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> "
@@ -4822,7 +4803,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:368
+#: apt.conf.5.xml:361
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -4834,19 +4815,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:378
+#: apt.conf.5.xml:371
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:381
+#: apt.conf.5.xml:374
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:374
+#: apt.conf.5.xml:367
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 "
@@ -4863,13 +4844,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:385
+#: apt.conf.5.xml:378
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:383
+#: apt.conf.5.xml:376
msgid ""
"Note that at run time the "
"<literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will be "
@@ -4884,7 +4865,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:383
msgid ""
"While it is possible to add an empty compression type to the order list, but "
"APT in its current version doesn't understand it correctly and will display "
@@ -4949,12 +4930,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:392
msgid "Directories"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:422
+#: apt.conf.5.xml:394
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -4966,7 +4947,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:429
+#: apt.conf.5.xml:401
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4979,7 +4960,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:438
+#: apt.conf.5.xml:410
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4989,7 +4970,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:444
+#: apt.conf.5.xml:416
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 "
@@ -4997,7 +4978,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:448
+#: apt.conf.5.xml:420
msgid ""
"Binary programs are pointed to by "
"<literal>Dir::Bin</literal>. <literal>Dir::Bin::Methods</literal> specifies "
@@ -5009,7 +4990,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:456
+#: apt.conf.5.xml:428
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -5022,12 +5003,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:469
+#: apt.conf.5.xml:441
msgid "APT in DSelect"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:471
+#: apt.conf.5.xml:443
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -5035,12 +5016,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:475
+#: apt.conf.5.xml:447
msgid "Clean"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:476
+#: apt.conf.5.xml:448
msgid ""
"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
"and never. always and prompt will remove all packages from the cache after "
@@ -5051,50 +5032,50 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:485
+#: apt.conf.5.xml:457
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the install phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:489
+#: apt.conf.5.xml:461
msgid "Updateoptions"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:462
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the update phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:494
+#: apt.conf.5.xml:466
msgid "PromptAfterUpdate"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:495
+#: apt.conf.5.xml:467
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:501
+#: apt.conf.5.xml:473
msgid "How APT calls dpkg"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:474
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:507
+#: apt.conf.5.xml:479
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 "
@@ -5102,17 +5083,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:484
msgid "Pre-Invoke"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:484
msgid "Post-Invoke"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:513
+#: apt.conf.5.xml:485
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 "
@@ -5121,12 +5102,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:519
+#: apt.conf.5.xml:491
msgid "Pre-Install-Pkgs"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:520
+#: apt.conf.5.xml:492
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 "
@@ -5136,7 +5117,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:526
+#: apt.conf.5.xml:498
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -5147,36 +5128,36 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:533
+#: apt.conf.5.xml:505
msgid "Run-Directory"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:534
+#: apt.conf.5.xml:506
msgid ""
"APT chdirs to this directory before invoking dpkg, the default is "
"<filename>/</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:510
msgid "Build-options"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:511
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:544
+#: apt.conf.5.xml:516
msgid "dpkg trigger usage (and related options)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:545
+#: apt.conf.5.xml:517
msgid ""
"APT can call dpkg in a way so it can make aggressive use of triggers over "
"multiply calls of dpkg. Without further options dpkg will use triggers only "
@@ -5191,7 +5172,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:532
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -5201,7 +5182,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:554
+#: apt.conf.5.xml:526
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 "
@@ -5215,12 +5196,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:538
msgid "DPkg::NoTriggers"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:567
+#: apt.conf.5.xml:539
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 "
@@ -5232,12 +5213,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:574
+#: apt.conf.5.xml:546
msgid "PackageManager::Configure"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:575
+#: apt.conf.5.xml:547
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
@@ -5254,12 +5235,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:557
msgid "DPkg::ConfigurePending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:586
+#: apt.conf.5.xml:558
msgid ""
"If this option is set apt will call <command>dpkg --configure "
"--pending</command> to let dpkg handle all required configurations and "
@@ -5271,12 +5252,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:592
+#: apt.conf.5.xml:564
msgid "DPkg::TriggersPending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:593
+#: apt.conf.5.xml:565
msgid ""
"Useful for <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -5286,12 +5267,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:570
msgid "PackageManager::UnpackAll"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:599
+#: apt.conf.5.xml:571
msgid ""
"As the configuration can be deferred to be done at the end by dpkg it can be "
"tried to order the unpack series only by critical needs, e.g. by "
@@ -5303,12 +5284,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:606
+#: apt.conf.5.xml:578
msgid "OrderList::Score::Immediate"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:586
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -5320,7 +5301,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:579
msgid ""
"Essential packages (and there dependencies) should be configured immediately "
"after unpacking. It will be a good idea to do this quite early in the "
@@ -5334,12 +5315,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:627
+#: apt.conf.5.xml:599
msgid "Periodic and Archives options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:628
+#: apt.conf.5.xml:600
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -5348,12 +5329,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:636
+#: apt.conf.5.xml:608
msgid "Debug options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:638
+#: apt.conf.5.xml:610
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -5364,7 +5345,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:621
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, "
@@ -5372,7 +5353,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:657
+#: apt.conf.5.xml:629
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s "
@@ -5380,7 +5361,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:666
+#: apt.conf.5.xml:638
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -5390,110 +5371,110 @@ msgstr ""
#. motivating example, except I haven't a clue why you'd want
#. to do this.
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:674
+#: apt.conf.5.xml:646
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CDROM IDs."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:656
msgid "A full list of debugging options to apt follows."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:689
+#: apt.conf.5.xml:661
msgid "<literal>Debug::Acquire::cdrom</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:665
msgid "Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:700
+#: apt.conf.5.xml:672
msgid "<literal>Debug::Acquire::ftp</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:704
+#: apt.conf.5.xml:676
msgid "Print information related to downloading packages using FTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:683
msgid "<literal>Debug::Acquire::http</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:687
msgid "Print information related to downloading packages using HTTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:722
+#: apt.conf.5.xml:694
msgid "<literal>Debug::Acquire::https</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:698
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:705
msgid "<literal>Debug::Acquire::gpgv</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:709
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:744
+#: apt.conf.5.xml:716
msgid "<literal>Debug::aptcdrom</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:748
+#: apt.conf.5.xml:720
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:755
+#: apt.conf.5.xml:727
msgid "<literal>Debug::BuildDeps</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:730
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:737
msgid "<literal>Debug::Hashes</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:768
+#: apt.conf.5.xml:740
msgid ""
"Output each cryptographic hash that is generated by the "
"<literal>apt</literal> libraries."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:775
+#: apt.conf.5.xml:747
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:778
+#: apt.conf.5.xml:750
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 "
@@ -5501,92 +5482,92 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:786
+#: apt.conf.5.xml:758
msgid "<literal>Debug::NoLocking</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:761
msgid ""
"Disable all file locking. For instance, this will allow two instances of "
"<quote><literal>apt-get update</literal></quote> to run at the same time."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:769
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:773
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:808
+#: apt.conf.5.xml:780
msgid "<literal>Debug::pkgAcquire::Auth</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:811
+#: apt.conf.5.xml:783
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:818
+#: apt.conf.5.xml:790
msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:821
+#: apt.conf.5.xml:793
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:829
+#: apt.conf.5.xml:801
msgid "<literal>Debug::pkgAcquire::RRed</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:833
+#: apt.conf.5.xml:805
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:840
+#: apt.conf.5.xml:812
msgid "<literal>Debug::pkgAcquire::Worker</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:844
+#: apt.conf.5.xml:816
msgid "Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:851
+#: apt.conf.5.xml:823
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:827
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:862
+#: apt.conf.5.xml:834
msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:837
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial "
@@ -5596,12 +5577,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:876
+#: apt.conf.5.xml:848
msgid "<literal>Debug::pkgDepCache::Marker</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:851
msgid ""
"Generate debug messages describing which package is marked as "
"keep/install/remove while the ProblemResolver does his work. Each addition "
@@ -5619,90 +5600,90 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:898
+#: apt.conf.5.xml:870
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:901
+#: apt.conf.5.xml:873
msgid "Dump the default configuration to standard error on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:908
+#: apt.conf.5.xml:880
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:911
+#: apt.conf.5.xml:883
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:919
+#: apt.conf.5.xml:891
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:922
+#: apt.conf.5.xml:894
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:901
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:933
+#: apt.conf.5.xml:905
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:941
+#: apt.conf.5.xml:913
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:945
+#: apt.conf.5.xml:917
msgid "Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:952
+#: apt.conf.5.xml:924
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:928
msgid "Output the priority of each package list on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:962
+#: apt.conf.5.xml:934
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:966
+#: apt.conf.5.xml:938
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:974
+#: apt.conf.5.xml:946
msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:977
+#: apt.conf.5.xml:949
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 "
@@ -5710,32 +5691,32 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:985
+#: apt.conf.5.xml:957
msgid "<literal>Debug::sourceList</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:989
+#: apt.conf.5.xml:961
msgid ""
"Print information about the vendors read from "
"<filename>/etc/apt/vendors.list</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1012
+#: apt.conf.5.xml:983
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1019
+#: apt.conf.5.xml:990
msgid "&file-aptconf;"
msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:995
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr ""
diff --git a/doc/po/de.po b/doc/po/de.po
index 3ec7c4a5b..bc15abae3 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 0.7.24\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2009-11-27 00:05+0100\n"
+"POT-Creation-Date: 2009-12-10 22:04+0100\n"
"PO-Revision-Date: 2009-10-28 23:51+GMT\n"
"Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -1949,7 +1949,7 @@ msgstr "&apt-commonoptions;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122
-#: apt.conf.5.xml:1017 apt_preferences.5.xml:615
+#: apt.conf.5.xml:988 apt_preferences.5.xml:615
msgid "Files"
msgstr "Dateien"
@@ -1962,7 +1962,7 @@ msgstr "&file-sourceslist; &file-statelists;"
#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569
#: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:994 apt_preferences.5.xml:622
#: sources.list.5.xml:233
msgid "See Also"
msgstr "Siehe auch"
@@ -3594,7 +3594,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462
+#: apt-ftparchive.1.xml:561 apt.conf.5.xml:982 apt_preferences.5.xml:462
#: sources.list.5.xml:193
msgid "Examples"
msgstr "Beispiele"
@@ -6234,7 +6234,7 @@ msgstr ""
"unterstützt keine dieser Optionen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:264 apt.conf.5.xml:328
+#: apt.conf.5.xml:264 apt.conf.5.xml:321
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method, this applies to all things including connection timeout and data "
@@ -6298,12 +6298,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:286
+#: apt.conf.5.xml:281
msgid "https"
msgstr "https"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:287
+#: apt.conf.5.xml:282
#, fuzzy
#| msgid ""
#| "HTTPS URIs. Cache-control and proxy options are the same as for "
@@ -6321,7 +6321,7 @@ msgstr ""
"literal> wird noch nicht unterstützt."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:286
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -6360,12 +6360,12 @@ msgstr ""
"SslForceVersion</literal> ist die entsprechende per-Host-Option."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:311 sources.list.5.xml:150
+#: apt.conf.5.xml:304 sources.list.5.xml:150
msgid "ftp"
msgstr "ftp"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:312
+#: apt.conf.5.xml:305
msgid ""
"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@ -6400,7 +6400,7 @@ msgstr ""
"entsprechenden URI-Bestandteil genommen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#: apt.conf.5.xml:324
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 "
@@ -6417,7 +6417,7 @@ msgstr ""
"Beispielskonfiguration, um Beispiele zu erhalten)."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:338
+#: apt.conf.5.xml:331
msgid ""
"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
"envar> environment variable to a http url - see the discussion of the http "
@@ -6431,7 +6431,7 @@ msgstr ""
"Effizienz nicht empfohlen FTP über HTTP zu benutzen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:343
+#: apt.conf.5.xml:336
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -6447,19 +6447,19 @@ msgstr ""
"Server RFC2428 unterstützen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:350 sources.list.5.xml:132
+#: apt.conf.5.xml:343 sources.list.5.xml:132
msgid "cdrom"
msgstr "cdrom"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:356
+#: apt.conf.5.xml:349
#, fuzzy, no-wrap
#| msgid "\"/cdrom/\"::Mount \"foo\";"
msgid "/cdrom/::Mount \"foo\";"
msgstr "\"/cdrom/\"::Mount \"foo\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:344
msgid ""
"CDROM URIs; the only setting for CDROM URIs is the mount point, "
"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@ -6481,12 +6481,12 @@ msgstr ""
"können per UMount angegeben werden."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:361
+#: apt.conf.5.xml:354
msgid "gpgv"
msgstr "gpgv"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:362
+#: apt.conf.5.xml:355
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
@@ -6497,18 +6497,18 @@ msgstr ""
"Zusätzliche Parameter werden an gpgv weitergeleitet."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:360
msgid "CompressionTypes"
msgstr "CompressionTypes"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:373
+#: apt.conf.5.xml:366
#, 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><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:368
+#: apt.conf.5.xml:361
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -6528,19 +6528,19 @@ msgstr ""
"\"synopsis\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:378
+#: apt.conf.5.xml:371
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:381
+#: apt.conf.5.xml:374
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:374
+#: apt.conf.5.xml:367
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 "
@@ -6571,13 +6571,13 @@ msgstr ""
"explizit zur Liste hinzuzufügen, da es automatisch hinzufügt wird."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:385
+#: apt.conf.5.xml:378
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:383
+#: apt.conf.5.xml:376
msgid ""
"Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
"replaceable></literal> will be checked: If this setting exists the method "
@@ -6603,7 +6603,7 @@ msgstr ""
"diesen Typ nur vor die Liste setzen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:383
msgid ""
"While it is possible to add an empty compression type to the order list, but "
"APT in its current version doesn't understand it correctly and will display "
@@ -6677,12 +6677,12 @@ msgstr ""
"id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:392
msgid "Directories"
msgstr "Verzeichnisse"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:422
+#: apt.conf.5.xml:394
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -6702,7 +6702,7 @@ msgstr ""
"filename> oder <filename>./</filename> beginnen."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:429
+#: apt.conf.5.xml:401
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -6725,7 +6725,7 @@ msgstr ""
"<literal>Dir::Cache</literal> enthalten."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:438
+#: apt.conf.5.xml:410
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -6740,7 +6740,7 @@ msgstr ""
"Konfigurationsdatei erfolgt)."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:444
+#: apt.conf.5.xml:416
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 "
@@ -6752,7 +6752,7 @@ msgstr ""
"geladen."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:448
+#: apt.conf.5.xml:420
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -6770,7 +6770,7 @@ msgstr ""
"Programms an."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:456
+#: apt.conf.5.xml:428
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -6790,12 +6790,12 @@ msgstr ""
"<filename>/tmp/staging/var/lib/dpkg/status</filename> nachgesehen."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:469
+#: apt.conf.5.xml:441
msgid "APT in DSelect"
msgstr "APT in DSelect"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:471
+#: apt.conf.5.xml:443
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -6806,12 +6806,12 @@ msgstr ""
"<literal>DSelect</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:475
+#: apt.conf.5.xml:447
msgid "Clean"
msgstr "Clean"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:476
+#: apt.conf.5.xml:448
msgid ""
"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
"and never. always and prompt will remove all packages from the cache after "
@@ -6829,7 +6829,7 @@ msgstr ""
"Herunterladen neuer Pakete durch."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:485
+#: apt.conf.5.xml:457
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the install phase."
@@ -6838,12 +6838,12 @@ msgstr ""
"übermittelt, wenn es für die Installationsphase durchlaufen wird."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:489
+#: apt.conf.5.xml:461
msgid "Updateoptions"
msgstr "Updateoptions"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:462
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the update phase."
@@ -6852,12 +6852,12 @@ msgstr ""
"übermittelt, wenn es für die Aktualisierungsphase durchlaufen wird."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:494
+#: apt.conf.5.xml:466
msgid "PromptAfterUpdate"
msgstr "PromptAfterUpdate"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:495
+#: apt.conf.5.xml:467
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
@@ -6866,12 +6866,12 @@ msgstr ""
"nachfragen, um fortzufahren. Vorgabe ist es, nur bei Fehlern nachzufragen."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:501
+#: apt.conf.5.xml:473
msgid "How APT calls dpkg"
msgstr "Wie APT Dpkg aufruft"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:474
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
@@ -6880,7 +6880,7 @@ msgstr ""
"stehen im Abschnitt <literal>DPkg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:507
+#: apt.conf.5.xml:479
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 "
@@ -6891,17 +6891,17 @@ msgstr ""
"jedes Listenelement wird als einzelnes Argument an &dpkg; übermittelt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:484
msgid "Pre-Invoke"
msgstr "Pre-Invoke"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:484
msgid "Post-Invoke"
msgstr "Post-Invoke"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:513
+#: apt.conf.5.xml:485
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 "
@@ -6915,12 +6915,12 @@ msgstr ""
"APT abgebrochen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:519
+#: apt.conf.5.xml:491
msgid "Pre-Install-Pkgs"
msgstr "Pre-Install-Pkgs"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:520
+#: apt.conf.5.xml:492
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 "
@@ -6937,7 +6937,7 @@ msgstr ""
"pro Zeile."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:526
+#: apt.conf.5.xml:498
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -6953,12 +6953,12 @@ msgstr ""
"literal> gegeben wird."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:533
+#: apt.conf.5.xml:505
msgid "Run-Directory"
msgstr "Run-Directory"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:534
+#: apt.conf.5.xml:506
msgid ""
"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
"</filename>."
@@ -6967,12 +6967,12 @@ msgstr ""
"die Vorgabe ist <filename>/</filename>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:510
msgid "Build-options"
msgstr "Build-options"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:511
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages, the "
"default is to disable signing and produce all binaries."
@@ -6982,12 +6982,12 @@ msgstr ""
"Programme werden erstellt."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:544
+#: apt.conf.5.xml:516
msgid "dpkg trigger usage (and related options)"
msgstr "Dpkd-Trigger-Benutzung (und zugehöriger Optionen)"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:545
+#: apt.conf.5.xml:517
msgid ""
"APT can call dpkg in a way so it can make aggressive use of triggers over "
"multiply calls of dpkg. Without further options dpkg will use triggers only "
@@ -7013,7 +7013,7 @@ msgstr ""
"Status 100% stehen, während es aktuell alle Pakete konfiguriert."
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:532
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -7027,7 +7027,7 @@ msgstr ""
"DPkg::TriggersPending \"true\";"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:554
+#: apt.conf.5.xml:526
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 "
@@ -7052,12 +7052,12 @@ msgstr ""
"wäre <placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:538
msgid "DPkg::NoTriggers"
msgstr "DPkg::NoTriggers"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:567
+#: apt.conf.5.xml:539
#, fuzzy
#| msgid ""
#| "Add the no triggers flag to all dpkg calls (expect the ConfigurePending "
@@ -7088,12 +7088,12 @@ msgstr ""
"außerdem an die unpack- und remove-Aufrufe anhängen."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:574
+#: apt.conf.5.xml:546
msgid "PackageManager::Configure"
msgstr "PackageManager::Configure"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:575
+#: apt.conf.5.xml:547
#, fuzzy
#| msgid ""
#| "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
@@ -7136,12 +7136,12 @@ msgstr ""
"mehr startbar sein könnte."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:557
msgid "DPkg::ConfigurePending"
msgstr "DPkg::ConfigurePending"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:586
+#: apt.conf.5.xml:558
#, fuzzy
#| msgid ""
#| "If this option is set apt will call <command>dpkg --configure --pending</"
@@ -7168,12 +7168,12 @@ msgstr ""
"deaktivieren."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:592
+#: apt.conf.5.xml:564
msgid "DPkg::TriggersPending"
msgstr "DPkg::TriggersPending"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:593
+#: apt.conf.5.xml:565
msgid ""
"Useful for <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -7189,12 +7189,12 @@ msgstr ""
"benötigt werden."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:570
msgid "PackageManager::UnpackAll"
msgstr "PackageManager::UnpackAll"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:599
+#: apt.conf.5.xml:571
msgid ""
"As the configuration can be deferred to be done at the end by dpkg it can be "
"tried to order the unpack series only by critical needs, e.g. by Pre-"
@@ -7213,12 +7213,12 @@ msgstr ""
"und weitere Verbesserungen benötigt, bevor sie wirklich nützlich wird."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:606
+#: apt.conf.5.xml:578
msgid "OrderList::Score::Immediate"
msgstr "OrderList::Score::Immediate"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:586
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -7236,7 +7236,7 @@ msgstr ""
"};"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:579
msgid ""
"Essential packages (and there dependencies) should be configured immediately "
"after unpacking. It will be a good idea to do this quite early in the "
@@ -7260,12 +7260,12 @@ msgstr ""
"mit ihren Vorgabewerten. <placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:627
+#: apt.conf.5.xml:599
msgid "Periodic and Archives options"
msgstr "Periodische- und Archivoptionen"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:628
+#: apt.conf.5.xml:600
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -7279,12 +7279,12 @@ msgstr ""
"Dokumentation dieser Optionen zu erhalten."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:636
+#: apt.conf.5.xml:608
msgid "Debug options"
msgstr "Fehlersuchoptionen"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:638
+#: apt.conf.5.xml:610
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -7302,7 +7302,7 @@ msgstr ""
"könnten es sein:"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:621
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -7313,7 +7313,7 @@ msgstr ""
"getroffenen Entscheidungen ein."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:657
+#: apt.conf.5.xml:629
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -7324,7 +7324,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:666
+#: apt.conf.5.xml:638
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -7336,7 +7336,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:674
+#: apt.conf.5.xml:646
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CDROM IDs."
@@ -7345,17 +7345,17 @@ msgstr ""
"Daten in CDROM-IDs aus."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:656
msgid "A full list of debugging options to apt follows."
msgstr "Eine vollständige Liste der Fehlersuchoptionen von APT folgt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:689
+#: apt.conf.5.xml:661
msgid "<literal>Debug::Acquire::cdrom</literal>"
msgstr "<literal>Debug::Acquire::cdrom</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:665
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
@@ -7363,48 +7363,48 @@ msgstr ""
"literal>-Quellen beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:700
+#: apt.conf.5.xml:672
msgid "<literal>Debug::Acquire::ftp</literal>"
msgstr "<literal>Debug::Acquire::ftp</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:704
+#: apt.conf.5.xml:676
msgid "Print information related to downloading packages using FTP."
msgstr ""
"Gibt Informationen aus, die sich auf das Herunterladen von Paketen per FTP "
"beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:683
msgid "<literal>Debug::Acquire::http</literal>"
msgstr "<literal>Debug::Acquire::http</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:687
msgid "Print information related to downloading packages using HTTP."
msgstr ""
"Gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTP "
"beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:722
+#: apt.conf.5.xml:694
msgid "<literal>Debug::Acquire::https</literal>"
msgstr "<literal>Debug::Acquire::https</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:698
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
"Gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTPS "
"beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:705
msgid "<literal>Debug::Acquire::gpgv</literal>"
msgstr "<literal>Debug::Acquire::gpgv</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:709
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
@@ -7413,12 +7413,12 @@ msgstr ""
"mittels <literal>gpg</literal> beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:744
+#: apt.conf.5.xml:716
msgid "<literal>Debug::aptcdrom</literal>"
msgstr "<literal>Debug::aptcdrom</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:748
+#: apt.conf.5.xml:720
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
@@ -7427,23 +7427,23 @@ msgstr ""
"CD-ROMs gespeichert sind."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:755
+#: apt.conf.5.xml:727
msgid "<literal>Debug::BuildDeps</literal>"
msgstr "<literal>Debug::BuildDeps</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:730
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
"Beschreibt den Prozess der Auflösung von Bauabhängigkeiten in &apt-get;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:737
msgid "<literal>Debug::Hashes</literal>"
msgstr "<literal>Debug::Hashes</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:768
+#: apt.conf.5.xml:740
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
@@ -7452,12 +7452,12 @@ msgstr ""
"Bibliotheken generiert wurde."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:775
+#: apt.conf.5.xml:747
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr "<literal>Debug::IdentCDROM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:778
+#: apt.conf.5.xml:750
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 "
@@ -7468,12 +7468,12 @@ msgstr ""
"ID für eine CD-ROM generiert wird."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:786
+#: apt.conf.5.xml:758
msgid "<literal>Debug::NoLocking</literal>"
msgstr "<literal>Debug::NoLocking</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:761
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."
@@ -7483,24 +7483,24 @@ msgstr ""
"gleichen Zeit laufen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:769
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr "<literal>Debug::pkgAcquire</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:773
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
"Protokollieren, wenn Elemente aus der globalen Warteschlange zum "
"Herunterladen hinzugefügt oder entfernt werden."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:808
+#: apt.conf.5.xml:780
msgid "<literal>Debug::pkgAcquire::Auth</literal>"
msgstr "<literal>Debug::pkgAcquire::Auth</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:811
+#: apt.conf.5.xml:783
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
@@ -7509,12 +7509,12 @@ msgstr ""
"und kryptografischen Signaturen von heruntergeladenen Dateien beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:818
+#: apt.conf.5.xml:790
msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
msgstr "<literal>Debug::pkgAcquire::Diffs</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:821
+#: apt.conf.5.xml:793
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
@@ -7523,12 +7523,12 @@ msgstr ""
"und Fehler, die die Paketindexlisten-Diffs betreffen, ausgeben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:829
+#: apt.conf.5.xml:801
msgid "<literal>Debug::pkgAcquire::RRed</literal>"
msgstr "<literal>Debug::pkgAcquire::RRed</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:833
+#: apt.conf.5.xml:805
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
@@ -7538,12 +7538,12 @@ msgstr ""
"werden."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:840
+#: apt.conf.5.xml:812
msgid "<literal>Debug::pkgAcquire::Worker</literal>"
msgstr "<literal>Debug::pkgAcquire::Worker</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:844
+#: apt.conf.5.xml:816
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
@@ -7551,12 +7551,12 @@ msgstr ""
"durchführen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:851
+#: apt.conf.5.xml:823
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr "<literal>Debug::pkgAutoRemove</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:827
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
@@ -7566,12 +7566,12 @@ msgstr ""
"beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:862
+#: apt.conf.5.xml:834
msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:837
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -7587,12 +7587,12 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:876
+#: apt.conf.5.xml:848
msgid "<literal>Debug::pkgDepCache::Marker</literal>"
msgstr "<literal>Debug::pkgDepCache::Marker</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:851
msgid ""
"Generate debug messages describing which package is marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -7624,23 +7624,23 @@ msgstr ""
"erscheint."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:898
+#: apt.conf.5.xml:870
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr "<literal>Debug::pkgInitConfig</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:901
+#: apt.conf.5.xml:873
msgid "Dump the default configuration to standard error on startup."
msgstr ""
"Die Vorgabekonfiguration beim Start auf der Standardfehlerausgabe ausgeben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:908
+#: apt.conf.5.xml:880
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr "<literal>Debug::pkgDPkgPM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:911
+#: apt.conf.5.xml:883
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
@@ -7650,12 +7650,12 @@ msgstr ""
"sind."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:919
+#: apt.conf.5.xml:891
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:922
+#: apt.conf.5.xml:894
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
@@ -7664,12 +7664,12 @@ msgstr ""
"alle während deren Auswertung gefundenen Fehler ausgeben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:901
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr "<literal>Debug::pkgOrderList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:933
+#: apt.conf.5.xml:905
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
@@ -7679,12 +7679,12 @@ msgstr ""
"soll."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:941
+#: apt.conf.5.xml:913
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr "<literal>Debug::pkgPackageManager</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:945
+#: apt.conf.5.xml:917
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
@@ -7692,22 +7692,22 @@ msgstr ""
"von &dpkg; ausgeführt werden."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:952
+#: apt.conf.5.xml:924
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr "<literal>Debug::pkgPolicy</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:928
msgid "Output the priority of each package list on startup."
msgstr "Die Priorität jeder Paketliste beim Start ausgeben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:962
+#: apt.conf.5.xml:934
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr "<literal>Debug::pkgProblemResolver</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:966
+#: apt.conf.5.xml:938
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
@@ -7717,12 +7717,12 @@ msgstr ""
"aufgetreten ist)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:974
+#: apt.conf.5.xml:946
msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:977
+#: apt.conf.5.xml:949
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 "
@@ -7734,12 +7734,12 @@ msgstr ""
"beschrieben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:985
+#: apt.conf.5.xml:957
msgid "<literal>Debug::sourceList</literal>"
msgstr "<literal>Debug::sourceList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:989
+#: apt.conf.5.xml:961
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
@@ -7748,7 +7748,7 @@ msgstr ""
"gelesenen Anbieter ausgeben."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1012
+#: apt.conf.5.xml:983
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -7757,13 +7757,13 @@ msgstr ""
"möglichen Optionen zeigen."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1019
+#: apt.conf.5.xml:990
msgid "&file-aptconf;"
msgstr "&file-aptconf;"
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:995
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
diff --git a/doc/po/es.po b/doc/po/es.po
index 266f69c02..d79d8d0ec 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -14,7 +14,7 @@
msgid ""
msgstr ""
"Project-Id-Version: apt\n"
-"POT-Creation-Date: 2009-11-27 00:05+0100\n"
+"POT-Creation-Date: 2009-12-10 22:04+0100\n"
"PO-Revision-Date: 2004-09-20 17:05+0000\n"
"Last-Translator: Rubén Porras Campo <nahoo@inicia.es>\n"
"Language-Team: <debian-l10n-spanish@lists.debian.org>\n"
@@ -1770,7 +1770,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122
-#: apt.conf.5.xml:1017 apt_preferences.5.xml:615
+#: apt.conf.5.xml:988 apt_preferences.5.xml:615
#, fuzzy
msgid "Files"
msgstr "Ficheros"
@@ -1784,7 +1784,7 @@ msgstr ""
#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569
#: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:994 apt_preferences.5.xml:622
#: sources.list.5.xml:233
#, fuzzy
msgid "See Also"
@@ -3284,7 +3284,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462
+#: apt-ftparchive.1.xml:561 apt.conf.5.xml:982 apt_preferences.5.xml:462
#: sources.list.5.xml:193
#, fuzzy
msgid "Examples"
@@ -5728,7 +5728,7 @@ msgstr ""
"Nota: Squid 2.0.2 no soporta ninguna de estas opciones."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:264 apt.conf.5.xml:328
+#: apt.conf.5.xml:264 apt.conf.5.xml:321
#, fuzzy
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
@@ -5778,13 +5778,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:286
+#: apt.conf.5.xml:281
#, fuzzy
msgid "https"
msgstr "http"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:287
+#: apt.conf.5.xml:282
msgid ""
"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
"options are the same as for <literal>http</literal> method and will also "
@@ -5794,7 +5794,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:286
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -5815,13 +5815,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:311 sources.list.5.xml:150
+#: apt.conf.5.xml:304 sources.list.5.xml:150
#, fuzzy
msgid "ftp"
msgstr "ftp"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:312
+#: apt.conf.5.xml:305
#, fuzzy
msgid ""
"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
@@ -5853,7 +5853,7 @@ msgstr ""
"de la URI correspondiente."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#: apt.conf.5.xml:324
#, fuzzy
msgid ""
"Several settings are provided to control passive mode. Generally it is safe "
@@ -5870,7 +5870,7 @@ msgstr ""
"fichero de configuración de muestra para ver ejemplos)."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:338
+#: apt.conf.5.xml:331
#, fuzzy
msgid ""
"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
@@ -5885,7 +5885,7 @@ msgstr ""
"eficiencia."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:343
+#: apt.conf.5.xml:336
#, fuzzy
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
@@ -5901,19 +5901,19 @@ msgstr ""
"la mayoría de los servidores FTP no soportan RFC2428."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:350 sources.list.5.xml:132
+#: apt.conf.5.xml:343 sources.list.5.xml:132
#, fuzzy
msgid "cdrom"
msgstr "apt-cdrom"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:356
+#: apt.conf.5.xml:349
#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:344
#, fuzzy
msgid ""
"CDROM URIs; the only setting for CDROM URIs is the mount point, "
@@ -5933,12 +5933,12 @@ msgstr ""
"antiguas). Respecto a la sintaxis se pone"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:361
+#: apt.conf.5.xml:354
msgid "gpgv"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:362
+#: apt.conf.5.xml:355
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
@@ -5946,18 +5946,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:360
msgid "CompressionTypes"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:373
+#: apt.conf.5.xml:366
#, no-wrap
msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:368
+#: apt.conf.5.xml:361
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -5969,19 +5969,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:378
+#: apt.conf.5.xml:371
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:381
+#: apt.conf.5.xml:374
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:374
+#: apt.conf.5.xml:367
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 "
@@ -5998,13 +5998,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:385
+#: apt.conf.5.xml:378
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:383
+#: apt.conf.5.xml:376
msgid ""
"Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
"replaceable></literal> will be checked: If this setting exists the method "
@@ -6019,7 +6019,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:383
msgid ""
"While it is possible to add an empty compression type to the order list, but "
"APT in its current version doesn't understand it correctly and will display "
@@ -6086,13 +6086,13 @@ msgstr ""
"paquetes y los manejadores de URI."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:392
#, fuzzy
msgid "Directories"
msgstr "Directorios"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:422
+#: apt.conf.5.xml:394
#, fuzzy
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
@@ -6113,7 +6113,7 @@ msgstr ""
"filename> o <filename>./</filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:429
+#: apt.conf.5.xml:401
#, fuzzy
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
@@ -6135,7 +6135,7 @@ msgstr ""
"literal> el directorio predeterminado está en <literal>Dir::Cache</literal>"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:438
+#: apt.conf.5.xml:410
#, fuzzy
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
@@ -6152,7 +6152,7 @@ msgstr ""
"envar>)."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:444
+#: apt.conf.5.xml:416
#, fuzzy
msgid ""
"The <literal>Dir::Parts</literal> setting reads in all the config fragments "
@@ -6164,7 +6164,7 @@ msgstr ""
"esto se carga el fichero principal de configuración."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:448
+#: apt.conf.5.xml:420
#, fuzzy
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
@@ -6182,7 +6182,7 @@ msgstr ""
"respectivos programas."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:456
+#: apt.conf.5.xml:428
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -6195,13 +6195,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:469
+#: apt.conf.5.xml:441
#, fuzzy
msgid "APT in DSelect"
msgstr "APT con DSelect"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:471
+#: apt.conf.5.xml:443
#, fuzzy
msgid ""
"When APT is used as a &dselect; method several configuration directives "
@@ -6213,13 +6213,13 @@ msgstr ""
"la sección <literal>DSelect</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:475
+#: apt.conf.5.xml:447
#, fuzzy
msgid "Clean"
msgstr "clean"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:476
+#: apt.conf.5.xml:448
#, fuzzy
msgid ""
"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
@@ -6237,7 +6237,7 @@ msgstr ""
"descargar los paquetes nuevos."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:485
+#: apt.conf.5.xml:457
#, fuzzy
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
@@ -6247,13 +6247,13 @@ msgstr ""
"ordenes cuando se ejecuta en la fase de instalación."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:489
+#: apt.conf.5.xml:461
#, fuzzy
msgid "Updateoptions"
msgstr "Opciones"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:462
#, fuzzy
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
@@ -6263,13 +6263,13 @@ msgstr ""
"ordenes cuando se ejecuta en la fase de actualización."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:494
+#: apt.conf.5.xml:466
#, fuzzy
msgid "PromptAfterUpdate"
msgstr "PromptAfterUpdate"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:495
+#: apt.conf.5.xml:467
#, fuzzy
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
@@ -6279,13 +6279,13 @@ msgstr ""
"continuar. Por omisión sólo pregunta en caso de error."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:501
+#: apt.conf.5.xml:473
#, fuzzy
msgid "How APT calls dpkg"
msgstr "Como APT llama a dpkg"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:474
#, fuzzy
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
@@ -6295,7 +6295,7 @@ msgstr ""
"encuentran en la sección <literal>DPkg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:507
+#: apt.conf.5.xml:479
#, fuzzy
msgid ""
"This is a list of options to pass to dpkg. The options must be specified "
@@ -6307,19 +6307,19 @@ msgstr ""
"como un sólo argumento."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:484
#, fuzzy
msgid "Pre-Invoke"
msgstr "Pre-Invoke"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:484
#, fuzzy
msgid "Post-Invoke"
msgstr "Post-Invoke"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:513
+#: apt.conf.5.xml:485
#, fuzzy
msgid ""
"This is a list of shell commands to run before/after invoking &dpkg;. Like "
@@ -6333,13 +6333,13 @@ msgstr ""
"si alguna falla APT abortará."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:519
+#: apt.conf.5.xml:491
#, fuzzy
msgid "Pre-Install-Pkgs"
msgstr "Pre-Install-Pkgs"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:520
+#: apt.conf.5.xml:492
#, fuzzy
msgid ""
"This is a list of shell commands to run before invoking dpkg. Like "
@@ -6355,7 +6355,7 @@ msgstr ""
"todos los .deb que va ha instalar por la entrada estándar, uno por línea."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:526
+#: apt.conf.5.xml:498
#, fuzzy
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
@@ -6371,13 +6371,13 @@ msgstr ""
"dada a <literal>Pre-Install-Pkgs</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:533
+#: apt.conf.5.xml:505
#, fuzzy
msgid "Run-Directory"
msgstr "Run-Directory"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:534
+#: apt.conf.5.xml:506
#, fuzzy
msgid ""
"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
@@ -6387,13 +6387,13 @@ msgstr ""
"omisión es <filename>/</filename>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:510
#, fuzzy
msgid "Build-options"
msgstr "Opciones"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:511
#, fuzzy
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages, the "
@@ -6404,12 +6404,12 @@ msgstr ""
"binarios."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:544
+#: apt.conf.5.xml:516
msgid "dpkg trigger usage (and related options)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:545
+#: apt.conf.5.xml:517
msgid ""
"APT can call dpkg in a way so it can make aggressive use of triggers over "
"multiply calls of dpkg. Without further options dpkg will use triggers only "
@@ -6424,7 +6424,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:532
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -6434,7 +6434,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:554
+#: apt.conf.5.xml:526
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 "
@@ -6448,12 +6448,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:538
msgid "DPkg::NoTriggers"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:567
+#: apt.conf.5.xml:539
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 "
@@ -6465,12 +6465,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:574
+#: apt.conf.5.xml:546
msgid "PackageManager::Configure"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:575
+#: apt.conf.5.xml:547
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
@@ -6486,12 +6486,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:557
msgid "DPkg::ConfigurePending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:586
+#: apt.conf.5.xml:558
msgid ""
"If this option is set apt will call <command>dpkg --configure --pending</"
"command> to let dpkg handle all required configurations and triggers. This "
@@ -6502,12 +6502,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:592
+#: apt.conf.5.xml:564
msgid "DPkg::TriggersPending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:593
+#: apt.conf.5.xml:565
msgid ""
"Useful for <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -6517,12 +6517,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:570
msgid "PackageManager::UnpackAll"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:599
+#: apt.conf.5.xml:571
msgid ""
"As the configuration can be deferred to be done at the end by dpkg it can be "
"tried to order the unpack series only by critical needs, e.g. by Pre-"
@@ -6534,12 +6534,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:606
+#: apt.conf.5.xml:578
msgid "OrderList::Score::Immediate"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:586
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -6551,7 +6551,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:579
msgid ""
"Essential packages (and there dependencies) should be configured immediately "
"after unpacking. It will be a good idea to do this quite early in the "
@@ -6565,12 +6565,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:627
+#: apt.conf.5.xml:599
msgid "Periodic and Archives options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:628
+#: apt.conf.5.xml:600
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -6579,13 +6579,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:636
+#: apt.conf.5.xml:608
#, fuzzy
msgid "Debug options"
msgstr "Opciones"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:638
+#: apt.conf.5.xml:610
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -6596,7 +6596,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:621
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -6604,7 +6604,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:657
+#: apt.conf.5.xml:629
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -6612,7 +6612,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:666
+#: apt.conf.5.xml:638
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -6622,120 +6622,120 @@ 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:674
+#: apt.conf.5.xml:646
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CDROM IDs."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:656
msgid "A full list of debugging options to apt follows."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:689
+#: apt.conf.5.xml:661
#, fuzzy
msgid "<literal>Debug::Acquire::cdrom</literal>"
msgstr "La línea <literal>Archive:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:665
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:700
+#: apt.conf.5.xml:672
#, fuzzy
msgid "<literal>Debug::Acquire::ftp</literal>"
msgstr "La línea <literal>Archive:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:704
+#: apt.conf.5.xml:676
msgid "Print information related to downloading packages using FTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:683
#, fuzzy
msgid "<literal>Debug::Acquire::http</literal>"
msgstr "La línea <literal>Archive:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:687
msgid "Print information related to downloading packages using HTTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:722
+#: apt.conf.5.xml:694
#, fuzzy
msgid "<literal>Debug::Acquire::https</literal>"
msgstr "La línea <literal>Archive:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:698
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:705
#, fuzzy
msgid "<literal>Debug::Acquire::gpgv</literal>"
msgstr "La línea <literal>Archive:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:709
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:744
+#: apt.conf.5.xml:716
#, fuzzy
msgid "<literal>Debug::aptcdrom</literal>"
msgstr "La línea <literal>Version:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:748
+#: apt.conf.5.xml:720
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:755
+#: apt.conf.5.xml:727
#, fuzzy
msgid "<literal>Debug::BuildDeps</literal>"
msgstr "La línea <literal>Label:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:730
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:737
#, fuzzy
msgid "<literal>Debug::Hashes</literal>"
msgstr "La línea <literal>Label:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:768
+#: apt.conf.5.xml:740
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:775
+#: apt.conf.5.xml:747
#, fuzzy
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr "La línea <literal>Label:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:778
+#: apt.conf.5.xml:750
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 "
@@ -6743,99 +6743,99 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:786
+#: apt.conf.5.xml:758
#, fuzzy
msgid "<literal>Debug::NoLocking</literal>"
msgstr "La línea <literal>Origin:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:761
msgid ""
"Disable all file locking. For instance, this will allow two instances of "
"<quote><literal>apt-get update</literal></quote> to run at the same time."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:769
#, fuzzy
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr "La línea <literal>Archive:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:773
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:808
+#: apt.conf.5.xml:780
#, fuzzy
msgid "<literal>Debug::pkgAcquire::Auth</literal>"
msgstr "La línea <literal>Archive:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:811
+#: apt.conf.5.xml:783
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:818
+#: apt.conf.5.xml:790
#, fuzzy
msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
msgstr "La línea <literal>Archive:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:821
+#: apt.conf.5.xml:793
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:829
+#: apt.conf.5.xml:801
#, fuzzy
msgid "<literal>Debug::pkgAcquire::RRed</literal>"
msgstr "La línea <literal>Archive:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:833
+#: apt.conf.5.xml:805
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:840
+#: apt.conf.5.xml:812
#, fuzzy
msgid "<literal>Debug::pkgAcquire::Worker</literal>"
msgstr "La línea <literal>Archive:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:844
+#: apt.conf.5.xml:816
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:851
+#: apt.conf.5.xml:823
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:827
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:862
+#: apt.conf.5.xml:834
msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:837
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -6845,12 +6845,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:876
+#: apt.conf.5.xml:848
msgid "<literal>Debug::pkgDepCache::Marker</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:851
msgid ""
"Generate debug messages describing which package is marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -6867,96 +6867,96 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:898
+#: apt.conf.5.xml:870
#, fuzzy
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr "La línea <literal>Version:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:901
+#: apt.conf.5.xml:873
msgid "Dump the default configuration to standard error on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:908
+#: apt.conf.5.xml:880
#, fuzzy
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr "La línea <literal>Package:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:911
+#: apt.conf.5.xml:883
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:919
+#: apt.conf.5.xml:891
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:922
+#: apt.conf.5.xml:894
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:901
#, fuzzy
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr "La línea <literal>Origin:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:933
+#: apt.conf.5.xml:905
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:941
+#: apt.conf.5.xml:913
#, fuzzy
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr "La línea <literal>Package:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:945
+#: apt.conf.5.xml:917
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:952
+#: apt.conf.5.xml:924
#, fuzzy
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr "La línea <literal>Label:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:928
msgid "Output the priority of each package list on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:962
+#: apt.conf.5.xml:934
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:966
+#: apt.conf.5.xml:938
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:974
+#: apt.conf.5.xml:946
msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:977
+#: apt.conf.5.xml:949
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 "
@@ -6964,20 +6964,20 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:985
+#: apt.conf.5.xml:957
#, fuzzy
msgid "<literal>Debug::sourceList</literal>"
msgstr "La línea <literal>Version:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:989
+#: apt.conf.5.xml:961
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1012
+#: apt.conf.5.xml:983
#, fuzzy
msgid ""
"&configureindex; is a configuration file showing example values for all "
@@ -6987,14 +6987,14 @@ msgstr ""
"los valores predeterminados para todas las opciones posibles."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1019
+#: apt.conf.5.xml:990
#, fuzzy
msgid "&file-aptconf;"
msgstr "apt-cdrom"
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:995
#, fuzzy
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache; &apt-conf;"
@@ -9867,6 +9867,10 @@ msgid "Which will use the already fetched archives on the disc."
msgstr ""
#, fuzzy
+#~ msgid "<option>APT::FTPArchive::AlwaysStat</option>"
+#~ msgstr "<option>--all-versions</option>"
+
+#, fuzzy
#~ msgid "/usr/share/doc/apt/"
#~ msgstr "/usr/share/doc/apt/"
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 49dc38f7f..0bc12a321 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2009-11-27 00:05+0100\n"
+"POT-Creation-Date: 2009-12-10 22:04+0100\n"
"PO-Revision-Date: 2009-09-26 19:25+0200\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -696,7 +696,6 @@ msgstr ""
"<!ENTITY apt-author.team \"\n"
" <author>\n"
" <othername>Équipe de développement d'APT</othername>\n"
-" <contrib></contrib>\n"
" </author>\n"
"\">\n"
@@ -1586,10 +1585,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cache.8.xml:234
#, fuzzy
-#| msgid ""
-#| "Note that a package which APT knows of is not nessasarily available to "
-#| "download, installable or installed, e.g. virtual packages are also listed "
-#| "in the generated list."
msgid ""
"Note that a package which APT knows of is not necessarily available to "
"download, installable or installed, e.g. virtual packages are also listed in "
@@ -1955,7 +1950,7 @@ msgstr "&apt-commonoptions;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122
-#: apt.conf.5.xml:1017 apt_preferences.5.xml:615
+#: apt.conf.5.xml:988 apt_preferences.5.xml:615
msgid "Files"
msgstr "Fichiers"
@@ -1968,7 +1963,7 @@ msgstr "&file-sourceslist; &file-statelists;"
#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569
#: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:994 apt_preferences.5.xml:622
#: sources.list.5.xml:233
msgid "See Also"
msgstr "Voir aussi"
@@ -2477,9 +2472,6 @@ msgstr ""
#. type: Content of: <refentry><refentryinfo>
#: apt-ftparchive.1.xml:13
#, fuzzy
-#| msgid ""
-#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>2 "
-#| "November 2007</date>"
msgid ""
"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 "
"August 2009</date>"
@@ -3597,7 +3589,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462
+#: apt-ftparchive.1.xml:561 apt.conf.5.xml:982 apt_preferences.5.xml:462
#: sources.list.5.xml:193
msgid "Examples"
msgstr "Exemples"
@@ -3993,14 +3985,6 @@ msgstr "source"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:251
#, fuzzy
-#| msgid ""
-#| "<literal>source</literal> causes <command>apt-get</command> to fetch "
-#| "source packages. APT will examine the available packages to decide which "
-#| "source package to fetch. It will then find and download into the current "
-#| "directory the newest available version of that source package while "
-#| "respect the default release, set with the option <literal>APT::Default-"
-#| "Release</literal>, the <option>-t</option> option or per package with "
-#| "with the <literal>pkg/release</literal> syntax, if possible."
msgid ""
"<literal>source</literal> causes <command>apt-get</command> to fetch source "
"packages. APT will examine the available packages to decide which source "
@@ -4315,14 +4299,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:386
#, fuzzy
-#| msgid ""
-#| "Simulation run as user will deactivate locking (<literal>Debug::"
-#| "NoLocking</literal>) automatical. Also a notice will be displayed "
-#| "indicating that this is only a simulation, if the option <literal>APT::"
-#| "Get::Show-User-Simulation-Note</literal> is set (Default: true) Neigther "
-#| "NoLocking nor the notice will be triggered if run as root (root should "
-#| "know what he is doing without further warnings by <literal>apt-get</"
-#| "literal>)."
msgid ""
"Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
"literal>) automatic. Also a notice will be displayed indicating that this "
@@ -4999,9 +4975,6 @@ msgstr "&apt-get;, &apt-secure;"
#. type: Content of: <refentry><refentryinfo>
#: apt-mark.8.xml:13
#, fuzzy
-#| msgid ""
-#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>2 "
-#| "November 2007</date>"
msgid ""
"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
"August 2009</date>"
@@ -5022,11 +4995,6 @@ msgstr "marquer/démarquer un paquet comme ayant été installé automatiquement
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-mark.8.xml:36
#, fuzzy
-#| msgid ""
-#| "<command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
-#| "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"req"
-#| "\"><arg>markauto</arg><arg>unmarkauto</arg></group> <arg choice=\"plain\" "
-#| "rep=\"repeat\"><replaceable>package</replaceable></arg>"
msgid ""
" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
"f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
@@ -5052,12 +5020,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt-mark.8.xml:57
#, fuzzy
-#| msgid ""
-#| "When you request that a package is installed, and as a result other "
-#| "packages are installed to satisfy its dependencies, the dependencies are "
-#| "marked as being automatically installed. Once these automatically "
-#| "installed packages are no longer depended on by any manually installed "
-#| "packages, they will be removed."
msgid ""
"When you request that a package is installed, and as a result other packages "
"are installed to satisfy its dependencies, the dependencies are marked as "
@@ -5110,10 +5072,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml:82
#, fuzzy
-#| msgid ""
-#| "<literal>autoremove</literal> is used to remove packages that were "
-#| "automatically installed to satisfy dependencies for some package and that "
-#| "are no more needed."
msgid ""
"<literal>showauto</literal> is used to print a list of automatically "
"installed packages with each package on a new line."
@@ -5125,7 +5083,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-mark.8.xml:93
#, fuzzy
-#| msgid "<option>-f=<filename>FILENAME</filename></option>"
msgid ""
"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
msgstr "<option>-f=<filename>FICHIER</filename></option>"
@@ -5133,7 +5090,6 @@ msgstr "<option>-f=<filename>FICHIER</filename></option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-mark.8.xml:94
#, fuzzy
-#| msgid "<option>--file=<filename>FILENAME</filename></option>"
msgid ""
"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
"option>"
@@ -5142,11 +5098,6 @@ msgstr "<option>--file=<filename>FICHIER</filename></option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml:97
#, fuzzy
-#| msgid ""
-#| "Read/Write package stats from <filename>FILENAME</filename> instead of "
-#| "the default location, which is <filename>extended_status</filename> in "
-#| "the directory defined by the Configuration Item: <literal>Dir::State</"
-#| "literal>."
msgid ""
"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
"filename> instead of the default location, which is "
@@ -5191,7 +5142,6 @@ msgstr "Afficher la version du programme."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-mark.8.xml:124
#, fuzzy
-#| msgid "<filename>/etc/apt/preferences</filename>"
msgid "<filename>/var/lib/apt/extended_states</filename>"
msgstr "<filename>/etc/apt/preferences</filename>"
@@ -5206,7 +5156,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt-mark.8.xml:134
#, fuzzy
-#| msgid "&apt-cache; &apt-conf;"
msgid "&apt-get;,&aptitude;,&apt-conf;"
msgstr "&apt-cache; &apt-conf;"
@@ -5386,11 +5335,11 @@ msgid ""
"element (router, switch, etc.) or by redirecting traffic to a rogue server "
"(through arp or DNS spoofing attacks)."
msgstr ""
-"<literal>Attaque réseau de type <quote>homme au milieu</quote></literal>. "
-"Sans vérification de signature, quelqu'un de malveillant peut s'introduire "
-"au milieu du processus de téléchargement et insérer du code soit en "
-"contrôlant un élément du réseau, routeur, commutateur, etc. soit en "
-"détournant le trafic vers un serveur fourbe (par usurpation d'adresses)."
+"<literal>Attaque réseau de type « homme au milieu »</literal>. Sans "
+"vérification de signature, quelqu'un de malveillant peut s'introduire au "
+"milieu du processus de téléchargement et insérer du code soit en contrôlant "
+"un élément du réseau, routeur, commutateur, etc. soit en détournant le "
+"trafic vers un serveur fourbe (par usurpation d'adresses)."
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#: apt-secure.8.xml:122
@@ -5630,11 +5579,6 @@ msgstr ""
#. type: Content of: <refentry><refentryinfo>
#: apt.conf.5.xml:13
#, fuzzy
-#| msgid ""
-#| "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
-#| "firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
-#| "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-"
-#| "email; &apt-product; <date>10 December 2008</date>"
msgid ""
"&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
"firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
@@ -5711,14 +5655,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:56
#, fuzzy
-#| msgid ""
-#| "Syntactically the configuration language is modeled after what the ISC "
-#| "tools such as bind and dhcp use. Lines starting with <literal>//</"
-#| "literal> are treated as comments (ignored), as well as all text between "
-#| "<literal>/*</literal> and <literal>*/</literal>, just like C/C++ "
-#| "comments. Each line is of the form <literal>APT::Get::Assume-Yes \"true"
-#| "\";</literal> The trailing semicolon is required and the quotes are "
-#| "optional. A new scope can be opened with curly braces, like:"
msgid ""
"Syntactically the configuration language is modeled after what the ISC tools "
"such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@ -5810,13 +5746,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:98
#, fuzzy
-#| msgid ""
-#| "Two specials are allowed, <literal>#include</literal> and "
-#| "<literal>#clear</literal> <literal>#include</literal> will include the "
-#| "given file, unless the filename ends in a slash, then the whole directory "
-#| "is included. <literal>#clear</literal> is used to erase a part of the "
-#| "configuration tree. The specified element and all its descendents are "
-#| "erased."
msgid ""
"Two specials are allowed, <literal>#include</literal> (which is deprecated "
"and not supported by alternative implementations) and <literal>#clear</"
@@ -5846,12 +5775,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:111
#, fuzzy
-#| msgid ""
-#| "All of the APT tools take a -o option which allows an arbitrary "
-#| "configuration directive to be specified on the command line. The syntax "
-#| "is a full option name (<literal>APT::Get::Assume-Yes</literal> for "
-#| "instance) followed by an equals sign then the new value of the option. "
-#| "Lists can be appended too by adding a trailing :: to the list name."
msgid ""
"All of the APT tools take a -o option which allows an arbitrary "
"configuration directive to be specified on the command line. The syntax is a "
@@ -6178,13 +6101,6 @@ msgstr "http"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:246
#, fuzzy
-#| msgid ""
-#| "HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
-#| "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. "
-#| "Per host proxies can also be specified by using the form <literal>http::"
-#| "Proxy::&lt;host&gt;</literal> with the special keyword <literal>DIRECT</"
-#| "literal> meaning to use no proxies. The <envar>http_proxy</envar> "
-#| "environment variable will override all settings."
msgid ""
"HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
"standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@ -6228,7 +6144,7 @@ msgstr ""
"en compte aucune de ces options."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:264 apt.conf.5.xml:328
+#: apt.conf.5.xml:264 apt.conf.5.xml:321
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method, this applies to all things including connection timeout and data "
@@ -6285,12 +6201,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:286
+#: apt.conf.5.xml:281
msgid "https"
msgstr "https"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:287
+#: apt.conf.5.xml:282
#, fuzzy
#| msgid ""
#| "HTTPS URIs. Cache-control and proxy options are the same as for "
@@ -6308,7 +6224,7 @@ msgstr ""
"<literal>Pipeline-Depth</literal> n'est pas encore supportée."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:286
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -6340,25 +6256,13 @@ msgstr ""
"ou 'SSLv3'."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:311 sources.list.5.xml:150
+#: apt.conf.5.xml:304 sources.list.5.xml:150
msgid "ftp"
msgstr "ftp"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:312
+#: apt.conf.5.xml:305
#, fuzzy
-#| msgid ""
-#| "FTP URIs; ftp::Proxy is the default proxy server to use. It is in the "
-#| "standard form of <literal>ftp://[[user][:pass]@]host[:port]/</literal> "
-#| "and is overridden by the <envar>ftp_proxy</envar> environment variable. "
-#| "To use a ftp proxy you will have to set the <literal>ftp::ProxyLogin</"
-#| "literal> script in the configuration file. This entry specifies the "
-#| "commands to send to tell the proxy server what to connect to. Please see "
-#| "&configureindex; for an example of how to do this. The substitution "
-#| "variables available are <literal>$(PROXY_USER)</literal> <literal>"
-#| "$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal> <literal>"
-#| "$(SITE_PASS)</literal> <literal>$(SITE)</literal> and <literal>"
-#| "$(SITE_PORT)</literal> Each is taken from it's respective URI component."
msgid ""
"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@ -6393,7 +6297,7 @@ msgstr ""
"respectif de l'URI."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#: apt.conf.5.xml:324
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 "
@@ -6410,7 +6314,7 @@ msgstr ""
"modèle de fichier de configuration)."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:338
+#: apt.conf.5.xml:331
msgid ""
"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
"envar> environment variable to a http url - see the discussion of the http "
@@ -6425,7 +6329,7 @@ msgstr ""
"de cette méthode."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:343
+#: apt.conf.5.xml:336
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -6441,19 +6345,18 @@ msgstr ""
"des serveurs FTP ne suivent pas la RFC 2428."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:350 sources.list.5.xml:132
+#: apt.conf.5.xml:343 sources.list.5.xml:132
msgid "cdrom"
msgstr "cdrom"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:356
+#: apt.conf.5.xml:349
#, fuzzy, no-wrap
-#| msgid "\"/cdrom/\"::Mount \"foo\";"
msgid "/cdrom/::Mount \"foo\";"
msgstr "\"/cdrom/\"::Mount \"foo\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:344
msgid ""
"CDROM URIs; the only setting for CDROM URIs is the mount point, "
"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@ -6475,12 +6378,12 @@ msgstr ""
"spécifiées en utilisant <literal>UMount</literal>."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:361
+#: apt.conf.5.xml:354
msgid "gpgv"
msgstr "gpgv"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:362
+#: apt.conf.5.xml:355
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
@@ -6491,18 +6394,18 @@ msgstr ""
"supplémentaires passées à gpgv."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:360
msgid "CompressionTypes"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:373
+#: apt.conf.5.xml:366
#, no-wrap
msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:368
+#: apt.conf.5.xml:361
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -6514,19 +6417,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:378
+#: apt.conf.5.xml:371
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:381
+#: apt.conf.5.xml:374
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:374
+#: apt.conf.5.xml:367
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 "
@@ -6543,13 +6446,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:385
+#: apt.conf.5.xml:378
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:383
+#: apt.conf.5.xml:376
msgid ""
"Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
"replaceable></literal> will be checked: If this setting exists the method "
@@ -6564,7 +6467,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:383
msgid ""
"While it is possible to add an empty compression type to the order list, but "
"APT in its current version doesn't understand it correctly and will display "
@@ -6631,12 +6534,12 @@ msgstr ""
"id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:392
msgid "Directories"
msgstr "Les répertoires"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:422
+#: apt.conf.5.xml:394
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -6656,7 +6559,7 @@ msgstr ""
"filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:429
+#: apt.conf.5.xml:401
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -6679,7 +6582,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:438
+#: apt.conf.5.xml:410
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -6694,7 +6597,7 @@ msgstr ""
"fichier de configuration indiqué par la variable <envar>APT_CONFIG</envar>)."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:444
+#: apt.conf.5.xml:416
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 "
@@ -6705,15 +6608,8 @@ msgstr ""
"configuration est chargé."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:448
+#: apt.conf.5.xml:420
#, fuzzy
-#| msgid ""
-#| "Binary programs are pointed to by <literal>Dir::Bin</literal>. "
-#| "<literal>Dir::Bin::Methods</literal> specifies the location of the method "
-#| "handlers and <literal>gzip</literal>, <literal>dpkg</literal>, "
-#| "<literal>apt-get</literal> <literal>dpkg-source</literal> <literal>dpkg-"
-#| "buildpackage</literal> and <literal>apt-cache</literal> specify the "
-#| "location of the respective programs."
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -6730,7 +6626,7 @@ msgstr ""
"l'emplacement des programmes correspondants."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:456
+#: apt.conf.5.xml:428
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -6752,12 +6648,12 @@ msgstr ""
"staging/var/lib/dpkg/status</filename>."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:469
+#: apt.conf.5.xml:441
msgid "APT in DSelect"
msgstr "APT et DSelect"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:471
+#: apt.conf.5.xml:443
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -6768,12 +6664,12 @@ msgstr ""
"<literal>DSelect</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:475
+#: apt.conf.5.xml:447
msgid "Clean"
msgstr "Clean"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:476
+#: apt.conf.5.xml:448
msgid ""
"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
"and never. always and prompt will remove all packages from the cache after "
@@ -6791,7 +6687,7 @@ msgstr ""
"supprime avant de récupérer de nouveaux paquets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:485
+#: apt.conf.5.xml:457
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the install phase."
@@ -6800,12 +6696,12 @@ msgstr ""
"&apt-get; lors de la phase d'installation."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:489
+#: apt.conf.5.xml:461
msgid "Updateoptions"
msgstr "UpdateOptions"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:462
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the update phase."
@@ -6814,12 +6710,12 @@ msgstr ""
"&apt-get; lors de la phase de mise à jour."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:494
+#: apt.conf.5.xml:466
msgid "PromptAfterUpdate"
msgstr "PromptAfterUpdate"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:495
+#: apt.conf.5.xml:467
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
@@ -6829,12 +6725,12 @@ msgstr ""
"d'erreur que l'on propose à l'utilisateur d'intervenir."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:501
+#: apt.conf.5.xml:473
msgid "How APT calls dpkg"
msgstr "Méthode d'appel de &dpkg; par APT"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:474
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
@@ -6843,7 +6739,7 @@ msgstr ""
"&dpkg; : elles figurent dans la section <literal>DPkg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:507
+#: apt.conf.5.xml:479
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 "
@@ -6854,17 +6750,17 @@ msgstr ""
"est passé comme un seul paramètre à &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:484
msgid "Pre-Invoke"
msgstr "Pre-Invoke"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:484
msgid "Post-Invoke"
msgstr "Post-Invoke"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:513
+#: apt.conf.5.xml:485
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 "
@@ -6877,12 +6773,12 @@ msgstr ""
"<filename>/bin/sh</filename> : APT s'arrête dès que l'une d'elles échoue."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:519
+#: apt.conf.5.xml:491
msgid "Pre-Install-Pkgs"
msgstr "Pre-Install-Pkgs"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:520
+#: apt.conf.5.xml:492
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 "
@@ -6898,7 +6794,7 @@ msgstr ""
"qu'il va installer, à raison d'un par ligne."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:526
+#: apt.conf.5.xml:498
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -6914,12 +6810,12 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:533
+#: apt.conf.5.xml:505
msgid "Run-Directory"
msgstr "Run-Directory"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:534
+#: apt.conf.5.xml:506
msgid ""
"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
"</filename>."
@@ -6928,12 +6824,12 @@ msgstr ""
"le répertoire <filename>/</filename>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:510
msgid "Build-options"
msgstr "Build-options"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:511
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages, the "
"default is to disable signing and produce all binaries."
@@ -6943,12 +6839,12 @@ msgstr ""
"créés."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:544
+#: apt.conf.5.xml:516
msgid "dpkg trigger usage (and related options)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:545
+#: apt.conf.5.xml:517
msgid ""
"APT can call dpkg in a way so it can make aggressive use of triggers over "
"multiply calls of dpkg. Without further options dpkg will use triggers only "
@@ -6963,7 +6859,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:532
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -6973,7 +6869,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:554
+#: apt.conf.5.xml:526
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 "
@@ -6987,12 +6883,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:538
msgid "DPkg::NoTriggers"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:567
+#: apt.conf.5.xml:539
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 "
@@ -7004,14 +6900,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:574
+#: apt.conf.5.xml:546
#, fuzzy
-#| msgid "Packages::Compress"
msgid "PackageManager::Configure"
msgstr "Packages::Compress"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:575
+#: apt.conf.5.xml:547
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
@@ -7027,12 +6922,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:557
msgid "DPkg::ConfigurePending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:586
+#: apt.conf.5.xml:558
msgid ""
"If this option is set apt will call <command>dpkg --configure --pending</"
"command> to let dpkg handle all required configurations and triggers. This "
@@ -7043,12 +6938,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:592
+#: apt.conf.5.xml:564
msgid "DPkg::TriggersPending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:593
+#: apt.conf.5.xml:565
msgid ""
"Useful for <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -7058,12 +6953,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:570
msgid "PackageManager::UnpackAll"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:599
+#: apt.conf.5.xml:571
msgid ""
"As the configuration can be deferred to be done at the end by dpkg it can be "
"tried to order the unpack series only by critical needs, e.g. by Pre-"
@@ -7075,12 +6970,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:606
+#: apt.conf.5.xml:578
msgid "OrderList::Score::Immediate"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:586
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -7092,7 +6987,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:579
msgid ""
"Essential packages (and there dependencies) should be configured immediately "
"after unpacking. It will be a good idea to do this quite early in the "
@@ -7106,12 +7001,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:627
+#: apt.conf.5.xml:599
msgid "Periodic and Archives options"
msgstr "Options « Periodic » et « Archive »"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:628
+#: apt.conf.5.xml:600
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -7123,12 +7018,12 @@ msgstr ""
"script <literal>/etc/cron.daily/apt</literal>, lancé quotidiennement."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:636
+#: apt.conf.5.xml:608
msgid "Debug options"
msgstr "Les options de débogage"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:638
+#: apt.conf.5.xml:610
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -7146,7 +7041,7 @@ msgstr ""
"peuvent tout de même être utiles :"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:621
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -7157,7 +7052,7 @@ msgstr ""
"upgrade, upgrade, install, remove et purge</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:657
+#: apt.conf.5.xml:629
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -7169,7 +7064,7 @@ msgstr ""
"superutilisateur."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:666
+#: apt.conf.5.xml:638
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -7181,7 +7076,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:674
+#: apt.conf.5.xml:646
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CDROM IDs."
@@ -7190,17 +7085,17 @@ msgstr ""
"type statfs dans les identifiants de CD."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:656
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><term>
-#: apt.conf.5.xml:689
+#: apt.conf.5.xml:661
msgid "<literal>Debug::Acquire::cdrom</literal>"
msgstr "<literal>Debug::Acquire::cdrom</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:665
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
@@ -7208,44 +7103,44 @@ msgstr ""
"literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:700
+#: apt.conf.5.xml:672
msgid "<literal>Debug::Acquire::ftp</literal>"
msgstr "<literal>Debug::Acquire::ftp</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:704
+#: apt.conf.5.xml:676
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><term>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:683
msgid "<literal>Debug::Acquire::http</literal>"
msgstr "<literal>Debug::Acquire::http</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:687
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><term>
-#: apt.conf.5.xml:722
+#: apt.conf.5.xml:694
msgid "<literal>Debug::Acquire::https</literal>"
msgstr "<literal>Debug::Acquire::https</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:698
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><term>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:705
msgid "<literal>Debug::Acquire::gpgv</literal>"
msgstr "<literal>Debug::Acquire::gpgv</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:709
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
@@ -7254,12 +7149,12 @@ msgstr ""
"cryptographiques avec <literal>gpg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:744
+#: apt.conf.5.xml:716
msgid "<literal>Debug::aptcdrom</literal>"
msgstr "<literal>Debug::aptcdrom</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:748
+#: apt.conf.5.xml:720
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
@@ -7268,24 +7163,24 @@ msgstr ""
"stockées sur CD."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:755
+#: apt.conf.5.xml:727
msgid "<literal>Debug::BuildDeps</literal>"
msgstr "<literal>Debug::BuildDeps</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:730
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><term>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:737
msgid "<literal>Debug::Hashes</literal>"
msgstr "<literal>Debug::Hashes</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:768
+#: apt.conf.5.xml:740
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
@@ -7294,12 +7189,12 @@ msgstr ""
"librairies d'<literal>apt</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:775
+#: apt.conf.5.xml:747
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr "<literal>Debug::IdentCDROM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:778
+#: apt.conf.5.xml:750
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 "
@@ -7310,12 +7205,12 @@ msgstr ""
"utilisés sur le système de fichier du CD."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:786
+#: apt.conf.5.xml:758
msgid "<literal>Debug::NoLocking</literal>"
msgstr "<literal>Debug::NoLocking</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:761
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."
@@ -7325,24 +7220,24 @@ msgstr ""
"temps."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:769
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr "<literal>Debug::pkgAcquire</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:773
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><term>
-#: apt.conf.5.xml:808
+#: apt.conf.5.xml:780
msgid "<literal>Debug::pkgAcquire::Auth</literal>"
msgstr "<literal>Debug::pkgAcquire::Auth</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:811
+#: apt.conf.5.xml:783
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
@@ -7352,12 +7247,12 @@ msgstr ""
"éventuelles."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:818
+#: apt.conf.5.xml:790
msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
msgstr "<literal>Debug::pkgAcquire::Diffs</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:821
+#: apt.conf.5.xml:793
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
@@ -7367,12 +7262,12 @@ msgstr ""
"éventuelles."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:829
+#: apt.conf.5.xml:801
msgid "<literal>Debug::pkgAcquire::RRed</literal>"
msgstr "<literal>Debug::pkgAcquire::RRed</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:833
+#: apt.conf.5.xml:805
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
@@ -7382,12 +7277,12 @@ msgstr ""
"place des fichiers complets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:840
+#: apt.conf.5.xml:812
msgid "<literal>Debug::pkgAcquire::Worker</literal>"
msgstr "<literal>Debug::pkgAcquire::Worker</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:844
+#: apt.conf.5.xml:816
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
@@ -7395,12 +7290,12 @@ msgstr ""
"effectivement des téléchargements."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:851
+#: apt.conf.5.xml:823
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr "<literal>Debug::pkgAutoRemove</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:827
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
@@ -7409,12 +7304,12 @@ msgstr ""
"automatiquement, et la suppression des paquets inutiles."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:862
+#: apt.conf.5.xml:834
msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:837
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -7429,12 +7324,12 @@ msgstr ""
"de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:876
+#: apt.conf.5.xml:848
msgid "<literal>Debug::pkgDepCache::Marker</literal>"
msgstr "<literal>Debug::pkgDepCache::Marker</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:851
msgid ""
"Generate debug messages describing which package is marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -7469,24 +7364,24 @@ msgstr ""
"de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:898
+#: apt.conf.5.xml:870
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr "<literal>Debug::pkgInitConfig</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:901
+#: apt.conf.5.xml:873
msgid "Dump the default configuration to standard error on startup."
msgstr ""
"Affiche, au lancement, l'ensemble de la configuration sur la sortie d'erreur "
"standard."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:908
+#: apt.conf.5.xml:880
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr "<literal>Debug::pkgDPkgPM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:911
+#: apt.conf.5.xml:883
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
@@ -7495,12 +7390,12 @@ msgstr ""
"paramètres sont séparés par des espaces."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:919
+#: apt.conf.5.xml:891
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:922
+#: apt.conf.5.xml:894
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
@@ -7510,12 +7405,12 @@ msgstr ""
"fichier."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:901
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr "<literal>Debug::pkgOrderList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:933
+#: apt.conf.5.xml:905
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
@@ -7524,33 +7419,33 @@ msgstr ""
"<literal>apt</literal> passe les paquets à &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:941
+#: apt.conf.5.xml:913
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr "<literal>Debug::pkgPackageManager</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:945
+#: apt.conf.5.xml:917
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><term>
-#: apt.conf.5.xml:952
+#: apt.conf.5.xml:924
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr "<literal>Debug::pkgPolicy</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:928
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><term>
-#: apt.conf.5.xml:962
+#: apt.conf.5.xml:934
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr "<literal>Debug::pkgProblemResolver</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:966
+#: apt.conf.5.xml:938
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
@@ -7559,12 +7454,12 @@ msgstr ""
"concerne que les cas où un problème de dépendances complexe se présente)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:974
+#: apt.conf.5.xml:946
msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:977
+#: apt.conf.5.xml:949
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 "
@@ -7575,12 +7470,12 @@ msgstr ""
"est décrite dans <literal>Debug::pkgDepCache::Marker</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:985
+#: apt.conf.5.xml:957
msgid "<literal>Debug::sourceList</literal>"
msgstr "<literal>Debug::sourceList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:989
+#: apt.conf.5.xml:961
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
@@ -7589,7 +7484,7 @@ msgstr ""
"list</filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1012
+#: apt.conf.5.xml:983
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -7598,15 +7493,14 @@ msgstr ""
"exemples pour toutes les options existantes."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1019
+#: apt.conf.5.xml:990
#, fuzzy
-#| msgid "&apt-conf;"
msgid "&file-aptconf;"
msgstr "&apt-conf;"
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:995
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
@@ -7629,10 +7523,6 @@ msgstr "Fichier de contrôle des préférences pour APT"
#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:34
#, fuzzy
-#| msgid ""
-#| "The APT preferences file <filename>/etc/apt/preferences</filename> can be "
-#| "used to control which versions of packages will be selected for "
-#| "installation."
msgid ""
"The APT preferences file <filename>/etc/apt/preferences</filename> and the "
"fragment files in the <filename>/etc/apt/preferences.d/</filename> folder "
@@ -8810,7 +8700,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt_preferences.5.xml:617
#, fuzzy
-#| msgid "apt_preferences"
msgid "&file-preferences;"
msgstr "apt_preferences"
diff --git a/doc/po/it.po b/doc/po/it.po
index 37cf5d078..5c5a65595 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2009-11-27 00:05+0100\n"
+"POT-Creation-Date: 2009-12-10 22:04+0100\n"
"PO-Revision-Date: 2003-04-26 23:26+0100\n"
"Last-Translator: Traduzione di Eugenia Franzoni <eugenia@linuxcare.com>\n"
"Language-Team: <debian-l10n-italian@lists.debian.org>\n"
@@ -1404,7 +1404,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122
-#: apt.conf.5.xml:1017 apt_preferences.5.xml:615
+#: apt.conf.5.xml:988 apt_preferences.5.xml:615
msgid "Files"
msgstr ""
@@ -1417,7 +1417,7 @@ msgstr ""
#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569
#: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:994 apt_preferences.5.xml:622
#: sources.list.5.xml:233
msgid "See Also"
msgstr ""
@@ -2696,7 +2696,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462
+#: apt-ftparchive.1.xml:561 apt.conf.5.xml:982 apt_preferences.5.xml:462
#: sources.list.5.xml:193
msgid "Examples"
msgstr ""
@@ -4609,7 +4609,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:264 apt.conf.5.xml:328
+#: apt.conf.5.xml:264 apt.conf.5.xml:321
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method, this applies to all things including connection timeout and data "
@@ -4647,12 +4647,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:286
+#: apt.conf.5.xml:281
msgid "https"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:287
+#: apt.conf.5.xml:282
msgid ""
"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
"options are the same as for <literal>http</literal> method and will also "
@@ -4662,7 +4662,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:286
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -4683,12 +4683,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:311 sources.list.5.xml:150
+#: apt.conf.5.xml:304 sources.list.5.xml:150
msgid "ftp"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:312
+#: apt.conf.5.xml:305
msgid ""
"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@ -4707,7 +4707,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#: apt.conf.5.xml:324
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 "
@@ -4717,7 +4717,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:338
+#: apt.conf.5.xml:331
msgid ""
"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
"envar> environment variable to a http url - see the discussion of the http "
@@ -4726,7 +4726,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:343
+#: apt.conf.5.xml:336
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4736,18 +4736,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:350 sources.list.5.xml:132
+#: apt.conf.5.xml:343 sources.list.5.xml:132
msgid "cdrom"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:356
+#: apt.conf.5.xml:349
#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:344
msgid ""
"CDROM URIs; the only setting for CDROM URIs is the mount point, "
"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@ -4760,12 +4760,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:361
+#: apt.conf.5.xml:354
msgid "gpgv"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:362
+#: apt.conf.5.xml:355
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
@@ -4773,18 +4773,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:360
msgid "CompressionTypes"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:373
+#: apt.conf.5.xml:366
#, no-wrap
msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:368
+#: apt.conf.5.xml:361
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -4796,19 +4796,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:378
+#: apt.conf.5.xml:371
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:381
+#: apt.conf.5.xml:374
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:374
+#: apt.conf.5.xml:367
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 "
@@ -4825,13 +4825,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:385
+#: apt.conf.5.xml:378
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:383
+#: apt.conf.5.xml:376
msgid ""
"Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
"replaceable></literal> will be checked: If this setting exists the method "
@@ -4846,7 +4846,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:383
msgid ""
"While it is possible to add an empty compression type to the order list, but "
"APT in its current version doesn't understand it correctly and will display "
@@ -4910,12 +4910,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:392
msgid "Directories"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:422
+#: apt.conf.5.xml:394
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -4927,7 +4927,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:429
+#: apt.conf.5.xml:401
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4940,7 +4940,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:438
+#: apt.conf.5.xml:410
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4950,7 +4950,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:444
+#: apt.conf.5.xml:416
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 "
@@ -4958,7 +4958,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:448
+#: apt.conf.5.xml:420
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4969,7 +4969,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:456
+#: apt.conf.5.xml:428
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4982,13 +4982,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:469
+#: apt.conf.5.xml:441
#, fuzzy
msgid "APT in DSelect"
msgstr "DSelect"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:471
+#: apt.conf.5.xml:443
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -4996,12 +4996,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:475
+#: apt.conf.5.xml:447
msgid "Clean"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:476
+#: apt.conf.5.xml:448
msgid ""
"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
"and never. always and prompt will remove all packages from the cache after "
@@ -5012,50 +5012,50 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:485
+#: apt.conf.5.xml:457
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the install phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:489
+#: apt.conf.5.xml:461
msgid "Updateoptions"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:462
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the update phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:494
+#: apt.conf.5.xml:466
msgid "PromptAfterUpdate"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:495
+#: apt.conf.5.xml:467
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:501
+#: apt.conf.5.xml:473
msgid "How APT calls dpkg"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:474
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:507
+#: apt.conf.5.xml:479
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 "
@@ -5063,17 +5063,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:484
msgid "Pre-Invoke"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:484
msgid "Post-Invoke"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:513
+#: apt.conf.5.xml:485
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 "
@@ -5082,12 +5082,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:519
+#: apt.conf.5.xml:491
msgid "Pre-Install-Pkgs"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:520
+#: apt.conf.5.xml:492
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 "
@@ -5097,7 +5097,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:526
+#: apt.conf.5.xml:498
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -5107,36 +5107,36 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:533
+#: apt.conf.5.xml:505
msgid "Run-Directory"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:534
+#: apt.conf.5.xml:506
msgid ""
"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
"</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:510
msgid "Build-options"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:511
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:544
+#: apt.conf.5.xml:516
msgid "dpkg trigger usage (and related options)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:545
+#: apt.conf.5.xml:517
msgid ""
"APT can call dpkg in a way so it can make aggressive use of triggers over "
"multiply calls of dpkg. Without further options dpkg will use triggers only "
@@ -5151,7 +5151,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:532
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -5161,7 +5161,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:554
+#: apt.conf.5.xml:526
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 "
@@ -5175,12 +5175,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:538
msgid "DPkg::NoTriggers"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:567
+#: apt.conf.5.xml:539
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 "
@@ -5192,12 +5192,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:574
+#: apt.conf.5.xml:546
msgid "PackageManager::Configure"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:575
+#: apt.conf.5.xml:547
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
@@ -5213,12 +5213,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:557
msgid "DPkg::ConfigurePending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:586
+#: apt.conf.5.xml:558
msgid ""
"If this option is set apt will call <command>dpkg --configure --pending</"
"command> to let dpkg handle all required configurations and triggers. This "
@@ -5229,12 +5229,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:592
+#: apt.conf.5.xml:564
msgid "DPkg::TriggersPending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:593
+#: apt.conf.5.xml:565
msgid ""
"Useful for <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -5244,12 +5244,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:570
msgid "PackageManager::UnpackAll"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:599
+#: apt.conf.5.xml:571
msgid ""
"As the configuration can be deferred to be done at the end by dpkg it can be "
"tried to order the unpack series only by critical needs, e.g. by Pre-"
@@ -5261,12 +5261,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:606
+#: apt.conf.5.xml:578
msgid "OrderList::Score::Immediate"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:586
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -5278,7 +5278,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:579
msgid ""
"Essential packages (and there dependencies) should be configured immediately "
"after unpacking. It will be a good idea to do this quite early in the "
@@ -5292,12 +5292,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:627
+#: apt.conf.5.xml:599
msgid "Periodic and Archives options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:628
+#: apt.conf.5.xml:600
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -5306,12 +5306,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:636
+#: apt.conf.5.xml:608
msgid "Debug options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:638
+#: apt.conf.5.xml:610
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -5322,7 +5322,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:621
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -5330,7 +5330,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:657
+#: apt.conf.5.xml:629
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -5338,7 +5338,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:666
+#: apt.conf.5.xml:638
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -5348,111 +5348,111 @@ 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:674
+#: apt.conf.5.xml:646
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CDROM IDs."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:656
msgid "A full list of debugging options to apt follows."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:689
+#: apt.conf.5.xml:661
msgid "<literal>Debug::Acquire::cdrom</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:665
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:700
+#: apt.conf.5.xml:672
msgid "<literal>Debug::Acquire::ftp</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:704
+#: apt.conf.5.xml:676
msgid "Print information related to downloading packages using FTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:683
msgid "<literal>Debug::Acquire::http</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:687
msgid "Print information related to downloading packages using HTTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:722
+#: apt.conf.5.xml:694
msgid "<literal>Debug::Acquire::https</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:698
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:705
msgid "<literal>Debug::Acquire::gpgv</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:709
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:744
+#: apt.conf.5.xml:716
msgid "<literal>Debug::aptcdrom</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:748
+#: apt.conf.5.xml:720
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:755
+#: apt.conf.5.xml:727
msgid "<literal>Debug::BuildDeps</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:730
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:737
msgid "<literal>Debug::Hashes</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:768
+#: apt.conf.5.xml:740
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:775
+#: apt.conf.5.xml:747
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:778
+#: apt.conf.5.xml:750
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 "
@@ -5460,93 +5460,93 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:786
+#: apt.conf.5.xml:758
msgid "<literal>Debug::NoLocking</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:761
msgid ""
"Disable all file locking. For instance, this will allow two instances of "
"<quote><literal>apt-get update</literal></quote> to run at the same time."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:769
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:773
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:808
+#: apt.conf.5.xml:780
msgid "<literal>Debug::pkgAcquire::Auth</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:811
+#: apt.conf.5.xml:783
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:818
+#: apt.conf.5.xml:790
msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:821
+#: apt.conf.5.xml:793
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:829
+#: apt.conf.5.xml:801
msgid "<literal>Debug::pkgAcquire::RRed</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:833
+#: apt.conf.5.xml:805
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:840
+#: apt.conf.5.xml:812
msgid "<literal>Debug::pkgAcquire::Worker</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:844
+#: apt.conf.5.xml:816
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:851
+#: apt.conf.5.xml:823
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:827
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:862
+#: apt.conf.5.xml:834
msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:837
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -5556,12 +5556,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:876
+#: apt.conf.5.xml:848
msgid "<literal>Debug::pkgDepCache::Marker</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:851
msgid ""
"Generate debug messages describing which package is marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -5578,91 +5578,91 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:898
+#: apt.conf.5.xml:870
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:901
+#: apt.conf.5.xml:873
msgid "Dump the default configuration to standard error on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:908
+#: apt.conf.5.xml:880
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:911
+#: apt.conf.5.xml:883
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:919
+#: apt.conf.5.xml:891
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:922
+#: apt.conf.5.xml:894
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:901
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:933
+#: apt.conf.5.xml:905
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:941
+#: apt.conf.5.xml:913
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:945
+#: apt.conf.5.xml:917
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:952
+#: apt.conf.5.xml:924
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:928
msgid "Output the priority of each package list on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:962
+#: apt.conf.5.xml:934
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:966
+#: apt.conf.5.xml:938
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:974
+#: apt.conf.5.xml:946
msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:977
+#: apt.conf.5.xml:949
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 "
@@ -5670,32 +5670,32 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:985
+#: apt.conf.5.xml:957
msgid "<literal>Debug::sourceList</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:989
+#: apt.conf.5.xml:961
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1012
+#: apt.conf.5.xml:983
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1019
+#: apt.conf.5.xml:990
msgid "&file-aptconf;"
msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:995
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr ""
diff --git a/doc/po/ja.po b/doc/po/ja.po
index ba04b200f..80da7c0a2 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-27 00:05+0100\n"
+"POT-Creation-Date: 2009-12-10 22:04+0100\n"
"PO-Revision-Date: 2009-07-30 22:55+0900\n"
"Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -604,15 +604,6 @@ msgstr ""
#. type: Plain text
#: apt.ent:168
#, fuzzy, no-wrap
-#| msgid ""
-#| "<!-- Boiler plate docinfo section -->\n"
-#| "<!ENTITY apt-docinfo \"\n"
-#| " <refentryinfo>\n"
-#| " <address><email>apt@packages.debian.org</email></address>\n"
-#| " <author><firstname>Jason</firstname> <surname>Gunthorpe</surname></author>\n"
-#| " <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>\n"
-#| " <date>28 October 2008</date>\n"
-#| " <productname>Linux</productname>\n"
msgid ""
"<!-- Boiler plate docinfo section -->\n"
"<!ENTITY apt-docinfo \"\n"
@@ -664,13 +655,6 @@ msgstr ""
#. type: Plain text
#: apt.ent:185
#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY apt-author.jgunthorpe \"\n"
-#| " <author>\n"
-#| " <firstname>Jason</firstname>\n"
-#| " <surname>Gunthorpe</surname>\n"
-#| " </author>\n"
-#| "\">\n"
msgid ""
"<!ENTITY apt-author.jgunthorpe \"\n"
" <author>\n"
@@ -690,13 +674,6 @@ msgstr ""
#. type: Plain text
#: apt.ent:193
#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY apt-author.moconnor \"\n"
-#| " <author>\n"
-#| " <firstname>Mike</firstname>\n"
-#| " <surname>O'Connor</surname>\n"
-#| " </author>\n"
-#| "\">\n"
msgid ""
"<!ENTITY apt-author.moconnor \"\n"
" <author>\n"
@@ -716,12 +693,6 @@ msgstr ""
#. type: Plain text
#: apt.ent:200
#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY apt-author.team \"\n"
-#| " <author>\n"
-#| " <othername>APT team</othername>\n"
-#| " </author>\n"
-#| "\">\n"
msgid ""
"<!ENTITY apt-author.team \"\n"
" <author>\n"
@@ -986,7 +957,6 @@ msgstr ""
#. type: Plain text
#: apt.ent:315
#, fuzzy, no-wrap
-#| msgid "Storage area for package files in transit. Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial)."
msgid ""
" <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
" <listitem><para>Storage area for package files in transit.\n"
@@ -999,7 +969,6 @@ msgstr "取得中パッケージファイル格納エリア。設定項目 - <li
#. type: Plain text
#: apt.ent:325
#, fuzzy, no-wrap
-#| msgid "Version preferences file. This is where you would specify \"pinning\", i.e. a preference to get certain packages from a separate source or from a different version of a distribution. Configuration Item: <literal>Dir::Etc::Preferences</literal>."
msgid ""
"<!ENTITY file-preferences \"\n"
" <varlistentry><term><filename>/etc/apt/preferences</filename></term>\n"
@@ -1049,7 +1018,6 @@ msgstr ""
#. type: Plain text
#: apt.ent:350
#, fuzzy, no-wrap
-#| msgid "Storage area for state information for each package resource specified in &sources-list; Configuration Item: <literal>Dir::State::Lists</literal>."
msgid ""
"<!ENTITY file-statelists \"\n"
" <varlistentry><term><filename>&statedir;/lists/</filename></term>\n"
@@ -1063,7 +1031,6 @@ msgstr "&sources-list; に指定した、パッケージリソースごとの状
#. type: Plain text
#: apt.ent:355
#, fuzzy, no-wrap
-#| msgid "Storage area for state information in transit. Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial)."
msgid ""
" <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
" <listitem><para>Storage area for state information in transit.\n"
@@ -1589,12 +1556,6 @@ msgstr "pkgnames <replaceable>[ prefix ]</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cache.8.xml:229
#, fuzzy
-#| msgid ""
-#| "This command prints the name of each package in the system. The optional "
-#| "argument is a prefix match to filter the name list. The output is "
-#| "suitable for use in a shell tab complete function and the output is "
-#| "generated extremely quickly. This command is best used with the <option>--"
-#| "generate</option> option."
msgid ""
"This command prints the name of each package APT knows. The optional "
"argument is a prefix match to filter the name list. The output is suitable "
@@ -1974,7 +1935,7 @@ msgstr "&apt-commonoptions;"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122
-#: apt.conf.5.xml:1017 apt_preferences.5.xml:615
+#: apt.conf.5.xml:988 apt_preferences.5.xml:615
msgid "Files"
msgstr "ファイル"
@@ -1988,7 +1949,7 @@ msgstr ""
#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569
#: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:994 apt_preferences.5.xml:622
#: sources.list.5.xml:233
msgid "See Also"
msgstr "関連項目"
@@ -2526,9 +2487,6 @@ msgstr ""
#. type: Content of: <refentry><refentryinfo>
#: apt-ftparchive.1.xml:13
#, fuzzy
-#| msgid ""
-#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>2 "
-#| "November 2007</date>"
msgid ""
"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 "
"August 2009</date>"
@@ -2552,25 +2510,6 @@ msgstr "インデックスファイル生成ユーティリティ"
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-ftparchive.1.xml:36
#, fuzzy
-#| msgid ""
-#| "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
-#| "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
-#| "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
-#| "arg> <arg><option>-o=<replaceable>config string</replaceable></option></"
-#| "arg> <arg><option>-c=<replaceable>file</replaceable></option></arg> "
-#| "<group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
-#| "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-#| "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
-#| "replaceable></arg><arg><replaceable>override</"
-#| "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-#| "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></"
-#| "arg></arg> <arg>release <arg choice=\"plain\"><replaceable>path</"
-#| "replaceable></arg></arg> <arg>generate <arg choice=\"plain"
-#| "\"><replaceable>config-file</replaceable></arg> <arg choice=\"plain\" rep="
-#| "\"repeat\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg "
-#| "choice=\"plain\"><replaceable>config-file</replaceable></arg></arg> </"
-#| "group>"
msgid ""
"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
@@ -3738,7 +3677,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462
+#: apt-ftparchive.1.xml:561 apt.conf.5.xml:982 apt_preferences.5.xml:462
#: sources.list.5.xml:193
msgid "Examples"
msgstr "サンプル"
@@ -3795,37 +3734,6 @@ msgstr "APT パッケージ操作ユーティリティ -- コマンドライン
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-get.8.xml:36
#, fuzzy
-#| msgid ""
-#| "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-#| "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
-#| "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> "
-#| "<arg> <option>-t=</option> <group choice='req'> <arg choice='plain'> "
-#| "<replaceable>target_release_name</replaceable> </arg> <arg "
-#| "choice='plain'> <replaceable>target_release_number_expression</"
-#| "replaceable> </arg> <arg choice='plain'> "
-#| "<replaceable>target_release_codename</replaceable> </arg> </group> </arg> "
-#| "<group choice=\"req\"> <arg choice='plain'>update</arg> <arg "
-#| "choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> "
-#| "<arg choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg "
-#| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
-#| "<group choice='req'> <arg choice='plain'> "
-#| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
-#| "choice='plain'> /<replaceable>target_release_name</replaceable> </arg> "
-#| "<arg choice='plain'> /<replaceable>target_release_codename</replaceable> "
-#| "</arg> </group> </arg> </arg> </arg> <arg choice='plain'>remove <arg "
-#| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
-#| "arg> <arg choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
-#| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
-#| "=<replaceable>pkg_version_number</replaceable> </arg> </arg> </arg> <arg "
-#| "choice='plain'>build-dep <arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>check</"
-#| "arg> <arg choice='plain'>clean</arg> <arg choice='plain'>autoclean</arg> "
-#| "<arg choice='plain'>autoremove</arg> <arg choice='plain'> <group "
-#| "choice='req'> <arg choice='plain'>-v</arg> <arg choice='plain'>--version</"
-#| "arg> </group> </arg> <arg choice='plain'> <group choice='req'> <arg "
-#| "choice='plain'>-h</arg> <arg choice='plain'>--help</arg> </group> </arg> "
-#| "</group>"
msgid ""
"<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
"<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
@@ -4162,18 +4070,6 @@ msgstr "source"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:251
#, fuzzy
-#| msgid ""
-#| "<literal>source</literal> causes <command>apt-get</command> to fetch "
-#| "source packages. APT will examine the available packages to decide which "
-#| "source package to fetch. It will then find and download into the current "
-#| "directory the newest available version of that source package. Source "
-#| "packages are tracked separately from binary packages via <literal>deb-"
-#| "src</literal> type lines in the &sources-list; file. This probably will "
-#| "mean that you will not get the same source as the package you have "
-#| "installed or as you could install. If the --compile options is specified "
-#| "then the package will be compiled to a binary .deb using dpkg-"
-#| "buildpackage, if --download-only is specified then the source package "
-#| "will not be unpacked."
msgid ""
"<literal>source</literal> causes <command>apt-get</command> to fetch source "
"packages. APT will examine the available packages to decide which source "
@@ -5177,9 +5073,6 @@ msgstr "&apt-get;, &apt-secure;"
#. type: Content of: <refentry><refentryinfo>
#: apt-mark.8.xml:13
#, fuzzy
-#| msgid ""
-#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>2 "
-#| "November 2007</date>"
msgid ""
"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
"August 2009</date>"
@@ -5203,11 +5096,6 @@ msgstr "パッケージが自動的にインストールされたかどうかの
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-mark.8.xml:36
#, fuzzy
-#| msgid ""
-#| "<command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
-#| "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"req"
-#| "\"><arg>markauto</arg><arg>unmarkauto</arg></group> <arg choice=\"plain\" "
-#| "rep=\"repeat\"><replaceable>package</replaceable></arg>"
msgid ""
" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
"f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
@@ -5235,12 +5123,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt-mark.8.xml:57
#, fuzzy
-#| msgid ""
-#| "When you request that a package is installed, and as a result other "
-#| "packages are installed to satisfy its dependencies, the dependencies are "
-#| "marked as being automatically installed. Once these automatically "
-#| "installed packages are no longer depended on by any manually installed "
-#| "packages, they will be removed."
msgid ""
"When you request that a package is installed, and as a result other packages "
"are installed to satisfy its dependencies, the dependencies are marked as "
@@ -5296,10 +5178,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml:82
#, fuzzy
-#| msgid ""
-#| "<literal>autoremove</literal> is used to remove packages that were "
-#| "automatically installed to satisfy dependencies for some package and that "
-#| "are no more needed."
msgid ""
"<literal>showauto</literal> is used to print a list of automatically "
"installed packages with each package on a new line."
@@ -5310,7 +5188,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-mark.8.xml:93
#, fuzzy
-#| msgid "<option>-f=<filename>FILENAME</filename></option>"
msgid ""
"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
msgstr "<option>-f=<filename>FILENAME</filename></option>"
@@ -5318,7 +5195,6 @@ msgstr "<option>-f=<filename>FILENAME</filename></option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-mark.8.xml:94
#, fuzzy
-#| msgid "<option>--file=<filename>FILENAME</filename></option>"
msgid ""
"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
"option>"
@@ -5328,11 +5204,6 @@ msgstr "<option>--file=<filename>FILENAME</filename></option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml:97
#, fuzzy
-#| msgid ""
-#| "Read/Write package stats from <filename>FILENAME</filename> instead of "
-#| "the default location, which is <filename>extended_status</filename> in "
-#| "the directory defined by the Configuration Item: <literal>Dir::State</"
-#| "literal>."
msgid ""
"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
"filename> instead of the default location, which is "
@@ -5379,7 +5250,6 @@ msgstr "プログラムのバージョン情報を表示します"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-mark.8.xml:124
#, fuzzy
-#| msgid "<filename>/etc/apt/preferences</filename>"
msgid "<filename>/var/lib/apt/extended_states</filename>"
msgstr "<filename>/etc/apt/preferences</filename>"
@@ -5395,7 +5265,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt-mark.8.xml:134
#, fuzzy
-#| msgid "&apt-cache; &apt-conf;"
msgid "&apt-get;,&aptitude;,&apt-conf;"
msgstr "&apt-cache; &apt-conf;"
@@ -5847,11 +5716,6 @@ msgstr ""
#. type: Content of: <refentry><refentryinfo>
#: apt.conf.5.xml:13
#, fuzzy
-#| msgid ""
-#| "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
-#| "firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
-#| "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-"
-#| "email; &apt-product; <date>10 December 2008</date>"
msgid ""
"&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
"firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
@@ -5928,14 +5792,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:56
#, fuzzy
-#| msgid ""
-#| "Syntactically the configuration language is modeled after what the ISC "
-#| "tools such as bind and dhcp use. Lines starting with <literal>//</"
-#| "literal> are treated as comments (ignored), as well as all text between "
-#| "<literal>/*</literal> and <literal>*/</literal>, just like C/C++ "
-#| "comments. Each line is of the form <literal>APT::Get::Assume-Yes \"true"
-#| "\";</literal> The trailing semicolon is required and the quotes are "
-#| "optional. A new scope can be opened with curly braces, like:"
msgid ""
"Syntactically the configuration language is modeled after what the ISC tools "
"such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@ -6028,13 +5884,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:98
#, fuzzy
-#| msgid ""
-#| "Two specials are allowed, <literal>#include</literal> and "
-#| "<literal>#clear</literal> <literal>#include</literal> will include the "
-#| "given file, unless the filename ends in a slash, then the whole directory "
-#| "is included. <literal>#clear</literal> is used to erase a part of the "
-#| "configuration tree. The specified element and all its descendents are "
-#| "erased."
msgid ""
"Two specials are allowed, <literal>#include</literal> (which is deprecated "
"and not supported by alternative implementations) and <literal>#clear</"
@@ -6064,12 +5913,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:111
#, fuzzy
-#| msgid ""
-#| "All of the APT tools take a -o option which allows an arbitrary "
-#| "configuration directive to be specified on the command line. The syntax "
-#| "is a full option name (<literal>APT::Get::Assume-Yes</literal> for "
-#| "instance) followed by an equals sign then the new value of the option. "
-#| "Lists can be appended too by adding a trailing :: to the list name."
msgid ""
"All of the APT tools take a -o option which allows an arbitrary "
"configuration directive to be specified on the command line. The syntax is a "
@@ -6406,13 +6249,6 @@ msgstr "http"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:246
#, fuzzy
-#| msgid ""
-#| "HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
-#| "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. "
-#| "Per host proxies can also be specified by using the form <literal>http::"
-#| "Proxy::&lt;host&gt;</literal> with the special keyword <literal>DIRECT</"
-#| "literal> meaning to use no proxies. The <envar>http_proxy</envar> "
-#| "environment variable will override all settings."
msgid ""
"HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
"standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@ -6455,7 +6291,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:264 apt.conf.5.xml:328
+#: apt.conf.5.xml:264 apt.conf.5.xml:321
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method, this applies to all things including connection timeout and data "
@@ -6514,12 +6350,12 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:286
+#: apt.conf.5.xml:281
msgid "https"
msgstr "https"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:287
+#: apt.conf.5.xml:282
#, fuzzy
#| msgid ""
#| "HTTPS URIs. Cache-control and proxy options are the same as for "
@@ -6537,7 +6373,7 @@ msgstr ""
"していません。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:286
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -6559,26 +6395,14 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:311 sources.list.5.xml:150
+#: apt.conf.5.xml:304 sources.list.5.xml:150
msgid "ftp"
msgstr "ftp"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:312
+#: apt.conf.5.xml:305
#, fuzzy
-#| msgid ""
-#| "FTP URIs; ftp::Proxy is the default proxy server to use. It is in the "
-#| "standard form of <literal>ftp://[[user][:pass]@]host[:port]/</literal> "
-#| "and is overridden by the <envar>ftp_proxy</envar> environment variable. "
-#| "To use a ftp proxy you will have to set the <literal>ftp::ProxyLogin</"
-#| "literal> script in the configuration file. This entry specifies the "
-#| "commands to send to tell the proxy server what to connect to. Please see "
-#| "&configureindex; for an example of how to do this. The substitution "
-#| "variables available are <literal>$(PROXY_USER)</literal> <literal>"
-#| "$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal> <literal>"
-#| "$(SITE_PASS)</literal> <literal>$(SITE)</literal> and <literal>"
-#| "$(SITE_PORT)</literal> Each is taken from it's respective URI component."
msgid ""
"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@ -6608,7 +6432,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#: apt.conf.5.xml:324
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 "
@@ -6624,7 +6448,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:338
+#: apt.conf.5.xml:331
msgid ""
"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
"envar> environment variable to a http url - see the discussion of the http "
@@ -6638,7 +6462,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:343
+#: apt.conf.5.xml:336
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -6655,20 +6479,19 @@ msgstr ""
# type: Content of: <refentry><refnamediv><refname>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:350 sources.list.5.xml:132
+#: apt.conf.5.xml:343 sources.list.5.xml:132
msgid "cdrom"
msgstr "cdrom"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:356
+#: apt.conf.5.xml:349
#, fuzzy, no-wrap
-#| msgid "\"/cdrom/\"::Mount \"foo\";"
msgid "/cdrom/::Mount \"foo\";"
msgstr "\"/cdrom/\"::Mount \"foo\";"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:344
msgid ""
"CDROM URIs; the only setting for CDROM URIs is the mount point, "
"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@ -6689,13 +6512,13 @@ msgstr ""
"す。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:361
+#: apt.conf.5.xml:354
msgid "gpgv"
msgstr "gpgv"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:362
+#: apt.conf.5.xml:355
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
@@ -6706,18 +6529,18 @@ msgstr ""
"す。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:360
msgid "CompressionTypes"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:373
+#: apt.conf.5.xml:366
#, no-wrap
msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:368
+#: apt.conf.5.xml:361
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -6729,19 +6552,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:378
+#: apt.conf.5.xml:371
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:381
+#: apt.conf.5.xml:374
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:374
+#: apt.conf.5.xml:367
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 "
@@ -6758,13 +6581,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:385
+#: apt.conf.5.xml:378
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:383
+#: apt.conf.5.xml:376
msgid ""
"Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
"replaceable></literal> will be checked: If this setting exists the method "
@@ -6779,7 +6602,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:383
msgid ""
"While it is possible to add an empty compression type to the order list, but "
"APT in its current version doesn't understand it correctly and will display "
@@ -6848,13 +6671,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:392
msgid "Directories"
msgstr "ディレクトリ"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:422
+#: apt.conf.5.xml:394
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -6874,7 +6697,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:429
+#: apt.conf.5.xml:401
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -6896,7 +6719,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:438
+#: apt.conf.5.xml:410
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -6911,7 +6734,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:444
+#: apt.conf.5.xml:416
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 "
@@ -6923,15 +6746,8 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:448
+#: apt.conf.5.xml:420
#, fuzzy
-#| msgid ""
-#| "Binary programs are pointed to by <literal>Dir::Bin</literal>. "
-#| "<literal>Dir::Bin::Methods</literal> specifies the location of the method "
-#| "handlers and <literal>gzip</literal>, <literal>dpkg</literal>, "
-#| "<literal>apt-get</literal> <literal>dpkg-source</literal> <literal>dpkg-"
-#| "buildpackage</literal> and <literal>apt-cache</literal> specify the "
-#| "location of the respective programs."
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -6948,7 +6764,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:456
+#: apt.conf.5.xml:428
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -6969,13 +6785,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:469
+#: apt.conf.5.xml:441
msgid "APT in DSelect"
msgstr "DSelect での APT"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:471
+#: apt.conf.5.xml:443
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -6985,13 +6801,13 @@ msgstr ""
"設定項目で、デフォルトの動作を制御します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:475
+#: apt.conf.5.xml:447
msgid "Clean"
msgstr "Clean"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:476
+#: apt.conf.5.xml:448
msgid ""
"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
"and never. always and prompt will remove all packages from the cache after "
@@ -7008,7 +6824,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:485
+#: apt.conf.5.xml:457
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the install phase."
@@ -7018,13 +6834,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:489
+#: apt.conf.5.xml:461
msgid "Updateoptions"
msgstr "Updateoptions"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:462
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the update phase."
@@ -7033,13 +6849,13 @@ msgstr ""
"されます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:494
+#: apt.conf.5.xml:466
msgid "PromptAfterUpdate"
msgstr "PromptAfterUpdate"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:495
+#: apt.conf.5.xml:467
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
@@ -7049,13 +6865,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:501
+#: apt.conf.5.xml:473
msgid "How APT calls dpkg"
msgstr "APT が dpkg を呼ぶ方法"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:474
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
@@ -7065,7 +6881,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:507
+#: apt.conf.5.xml:479
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 "
@@ -7075,18 +6891,18 @@ msgstr ""
"ければなりません。また、各リストは単一の引数として &dpkg; に渡されます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:484
msgid "Pre-Invoke"
msgstr "Pre-Invoke"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:484
msgid "Post-Invoke"
msgstr "Post-Invoke"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:513
+#: apt.conf.5.xml:485
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 "
@@ -7100,13 +6916,13 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:519
+#: apt.conf.5.xml:491
msgid "Pre-Install-Pkgs"
msgstr "Pre-Install-Pkgs"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:520
+#: apt.conf.5.xml:492
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 "
@@ -7122,7 +6938,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:526
+#: apt.conf.5.xml:498
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -7138,13 +6954,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:533
+#: apt.conf.5.xml:505
msgid "Run-Directory"
msgstr "Run-Directory"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:534
+#: apt.conf.5.xml:506
msgid ""
"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
"</filename>."
@@ -7154,13 +6970,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:510
msgid "Build-options"
msgstr "Build-options"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:511
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages, the "
"default is to disable signing and produce all binaries."
@@ -7169,12 +6985,12 @@ msgstr ""
"ます。デフォルトでは署名を無効にし、全バイナリを生成します。"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:544
+#: apt.conf.5.xml:516
msgid "dpkg trigger usage (and related options)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:545
+#: apt.conf.5.xml:517
msgid ""
"APT can call dpkg in a way so it can make aggressive use of triggers over "
"multiply calls of dpkg. Without further options dpkg will use triggers only "
@@ -7189,7 +7005,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:532
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -7199,7 +7015,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:554
+#: apt.conf.5.xml:526
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 "
@@ -7213,12 +7029,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:538
msgid "DPkg::NoTriggers"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:567
+#: apt.conf.5.xml:539
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 "
@@ -7231,14 +7047,13 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:574
+#: apt.conf.5.xml:546
#, fuzzy
-#| msgid "Packages::Compress"
msgid "PackageManager::Configure"
msgstr "Packages::Compress"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:575
+#: apt.conf.5.xml:547
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
@@ -7255,13 +7070,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:557
#, fuzzy
msgid "DPkg::ConfigurePending"
msgstr "ユーザの設定"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:586
+#: apt.conf.5.xml:558
msgid ""
"If this option is set apt will call <command>dpkg --configure --pending</"
"command> to let dpkg handle all required configurations and triggers. This "
@@ -7272,12 +7087,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:592
+#: apt.conf.5.xml:564
msgid "DPkg::TriggersPending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:593
+#: apt.conf.5.xml:565
msgid ""
"Useful for <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -7287,12 +7102,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:570
msgid "PackageManager::UnpackAll"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:599
+#: apt.conf.5.xml:571
msgid ""
"As the configuration can be deferred to be done at the end by dpkg it can be "
"tried to order the unpack series only by critical needs, e.g. by Pre-"
@@ -7304,12 +7119,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:606
+#: apt.conf.5.xml:578
msgid "OrderList::Score::Immediate"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:586
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -7321,7 +7136,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:579
msgid ""
"Essential packages (and there dependencies) should be configured immediately "
"after unpacking. It will be a good idea to do this quite early in the "
@@ -7335,12 +7150,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:627
+#: apt.conf.5.xml:599
msgid "Periodic and Archives options"
msgstr "Periodic オプションと Archives オプション"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:628
+#: apt.conf.5.xml:600
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -7354,12 +7169,12 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:636
+#: apt.conf.5.xml:608
msgid "Debug options"
msgstr "デバッグオプション"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:638
+#: apt.conf.5.xml:610
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -7370,7 +7185,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:621
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -7381,7 +7196,7 @@ msgstr ""
"にします。"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:657
+#: apt.conf.5.xml:629
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -7392,7 +7207,7 @@ msgstr ""
"literal>) を行う場合に使用します。"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:666
+#: apt.conf.5.xml:638
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -7402,66 +7217,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:674
+#: apt.conf.5.xml:646
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CDROM IDs."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:656
msgid "A full list of debugging options to apt follows."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:689
+#: apt.conf.5.xml:661
msgid "<literal>Debug::Acquire::cdrom</literal>"
msgstr "<literal>Debug::Acquire::cdrom</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:665
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
"<literal>cdrom://</literal> ソースへのアクセスに関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:700
+#: apt.conf.5.xml:672
msgid "<literal>Debug::Acquire::ftp</literal>"
msgstr "<literal>Debug::Acquire::ftp</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:704
+#: apt.conf.5.xml:676
msgid "Print information related to downloading packages using FTP."
msgstr "FTP を用いたパッケージのダウンロードに関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:683
msgid "<literal>Debug::Acquire::http</literal>"
msgstr "<literal>Debug::Acquire::http</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:687
msgid "Print information related to downloading packages using HTTP."
msgstr "HTTP を用いたパッケージのダウンロードに関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:722
+#: apt.conf.5.xml:694
msgid "<literal>Debug::Acquire::https</literal>"
msgstr "<literal>Debug::Acquire::https</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:698
msgid "Print information related to downloading packages using HTTPS."
msgstr "HTTPS を用いたパッケージのダウンロードに関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:705
msgid "<literal>Debug::Acquire::gpgv</literal>"
msgstr "<literal>Debug::Acquire::gpgv</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:709
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
@@ -7469,46 +7284,46 @@ msgstr ""
"<literal>gpg</literal> を用いた暗号署名の検証に関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:744
+#: apt.conf.5.xml:716
msgid "<literal>Debug::aptcdrom</literal>"
msgstr "<literal>Debug::aptcdrom</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:748
+#: apt.conf.5.xml:720
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:755
+#: apt.conf.5.xml:727
msgid "<literal>Debug::BuildDeps</literal>"
msgstr "<literal>Debug::BuildDeps</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:730
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:737
msgid "<literal>Debug::Hashes</literal>"
msgstr "<literal>Debug::Hashes</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:768
+#: apt.conf.5.xml:740
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:775
+#: apt.conf.5.xml:747
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr "<literal>Debug::IdentCDROM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:778
+#: apt.conf.5.xml:750
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 "
@@ -7516,93 +7331,93 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:786
+#: apt.conf.5.xml:758
msgid "<literal>Debug::NoLocking</literal>"
msgstr "<literal>Debug::NoLocking</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:761
msgid ""
"Disable all file locking. For instance, this will allow two instances of "
"<quote><literal>apt-get update</literal></quote> to run at the same time."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:769
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr "<literal>Debug::pkgAcquire</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:773
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:808
+#: apt.conf.5.xml:780
msgid "<literal>Debug::pkgAcquire::Auth</literal>"
msgstr "<literal>Debug::pkgAcquire::Auth</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:811
+#: apt.conf.5.xml:783
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:818
+#: apt.conf.5.xml:790
msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
msgstr "<literal>Debug::pkgAcquire::Diffs</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:821
+#: apt.conf.5.xml:793
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:829
+#: apt.conf.5.xml:801
msgid "<literal>Debug::pkgAcquire::RRed</literal>"
msgstr "<literal>Debug::pkgAcquire::RRed</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:833
+#: apt.conf.5.xml:805
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:840
+#: apt.conf.5.xml:812
msgid "<literal>Debug::pkgAcquire::Worker</literal>"
msgstr "<literal>Debug::pkgAcquire::Worker</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:844
+#: apt.conf.5.xml:816
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:851
+#: apt.conf.5.xml:823
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr "<literal>Debug::pkgAutoRemove</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:827
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:862
+#: apt.conf.5.xml:834
msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:837
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -7612,12 +7427,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:876
+#: apt.conf.5.xml:848
msgid "<literal>Debug::pkgDepCache::Marker</literal>"
msgstr "<literal>Debug::pkgDepCache::Marker</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:851
msgid ""
"Generate debug messages describing which package is marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -7634,91 +7449,91 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:898
+#: apt.conf.5.xml:870
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr "<literal>Debug::pkgInitConfig</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:901
+#: apt.conf.5.xml:873
msgid "Dump the default configuration to standard error on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:908
+#: apt.conf.5.xml:880
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr "<literal>Debug::pkgDPkgPM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:911
+#: apt.conf.5.xml:883
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:919
+#: apt.conf.5.xml:891
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:922
+#: apt.conf.5.xml:894
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:901
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr "<literal>Debug::pkgOrderList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:933
+#: apt.conf.5.xml:905
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:941
+#: apt.conf.5.xml:913
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr "<literal>Debug::pkgPackageManager</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:945
+#: apt.conf.5.xml:917
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:952
+#: apt.conf.5.xml:924
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr "<literal>Debug::pkgPolicy</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:928
msgid "Output the priority of each package list on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:962
+#: apt.conf.5.xml:934
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr "<literal>Debug::pkgProblemResolver</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:966
+#: apt.conf.5.xml:938
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:974
+#: apt.conf.5.xml:946
msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:977
+#: apt.conf.5.xml:949
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 "
@@ -7726,12 +7541,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:985
+#: apt.conf.5.xml:957
msgid "<literal>Debug::sourceList</literal>"
msgstr "<literal>Debug::sourceList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:989
+#: apt.conf.5.xml:961
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
@@ -7739,7 +7554,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1012
+#: apt.conf.5.xml:983
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -7749,16 +7564,15 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1019
+#: apt.conf.5.xml:990
#, fuzzy
-#| msgid "&apt-conf;"
msgid "&file-aptconf;"
msgstr "&apt-conf;"
# type: Content of: <refentry><refsect1><para>
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:995
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
@@ -7784,10 +7598,6 @@ msgstr "APT 設定制御ファイル"
#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:34
#, fuzzy
-#| msgid ""
-#| "The APT preferences file <filename>/etc/apt/preferences</filename> can be "
-#| "used to control which versions of packages will be selected for "
-#| "installation."
msgid ""
"The APT preferences file <filename>/etc/apt/preferences</filename> and the "
"fragment files in the <filename>/etc/apt/preferences.d/</filename> folder "
@@ -9022,7 +8832,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt_preferences.5.xml:617
#, fuzzy
-#| msgid "apt_preferences"
msgid "&file-preferences;"
msgstr "apt_preferences"
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 27b7a8a7b..a413bb862 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: apt\n"
-"POT-Creation-Date: 2009-11-27 00:05+0100\n"
+"POT-Creation-Date: 2009-12-10 22:04+0100\n"
"PO-Revision-Date: 2004-02-12 15:06+0100\n"
"Last-Translator: Krzysztof Fiertek <akfedux@megapolis.pl>\n"
"Language-Team: <debian-l10n-polish@lists.debian.org>\n"
@@ -1405,7 +1405,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122
-#: apt.conf.5.xml:1017 apt_preferences.5.xml:615
+#: apt.conf.5.xml:988 apt_preferences.5.xml:615
msgid "Files"
msgstr ""
@@ -1418,7 +1418,7 @@ msgstr ""
#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569
#: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:994 apt_preferences.5.xml:622
#: sources.list.5.xml:233
msgid "See Also"
msgstr ""
@@ -2702,7 +2702,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462
+#: apt-ftparchive.1.xml:561 apt.conf.5.xml:982 apt_preferences.5.xml:462
#: sources.list.5.xml:193
msgid "Examples"
msgstr ""
@@ -4611,7 +4611,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:264 apt.conf.5.xml:328
+#: apt.conf.5.xml:264 apt.conf.5.xml:321
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method, this applies to all things including connection timeout and data "
@@ -4649,12 +4649,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:286
+#: apt.conf.5.xml:281
msgid "https"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:287
+#: apt.conf.5.xml:282
msgid ""
"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
"options are the same as for <literal>http</literal> method and will also "
@@ -4664,7 +4664,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:286
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -4685,12 +4685,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:311 sources.list.5.xml:150
+#: apt.conf.5.xml:304 sources.list.5.xml:150
msgid "ftp"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:312
+#: apt.conf.5.xml:305
msgid ""
"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@ -4709,7 +4709,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#: apt.conf.5.xml:324
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 "
@@ -4719,7 +4719,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:338
+#: apt.conf.5.xml:331
msgid ""
"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
"envar> environment variable to a http url - see the discussion of the http "
@@ -4728,7 +4728,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:343
+#: apt.conf.5.xml:336
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4738,18 +4738,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:350 sources.list.5.xml:132
+#: apt.conf.5.xml:343 sources.list.5.xml:132
msgid "cdrom"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:356
+#: apt.conf.5.xml:349
#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:344
msgid ""
"CDROM URIs; the only setting for CDROM URIs is the mount point, "
"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@ -4762,12 +4762,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:361
+#: apt.conf.5.xml:354
msgid "gpgv"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:362
+#: apt.conf.5.xml:355
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
@@ -4775,18 +4775,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:360
msgid "CompressionTypes"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:373
+#: apt.conf.5.xml:366
#, no-wrap
msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:368
+#: apt.conf.5.xml:361
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -4798,19 +4798,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:378
+#: apt.conf.5.xml:371
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:381
+#: apt.conf.5.xml:374
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:374
+#: apt.conf.5.xml:367
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 "
@@ -4827,13 +4827,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:385
+#: apt.conf.5.xml:378
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:383
+#: apt.conf.5.xml:376
msgid ""
"Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
"replaceable></literal> will be checked: If this setting exists the method "
@@ -4848,7 +4848,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:383
msgid ""
"While it is possible to add an empty compression type to the order list, but "
"APT in its current version doesn't understand it correctly and will display "
@@ -4912,12 +4912,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:392
msgid "Directories"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:422
+#: apt.conf.5.xml:394
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -4929,7 +4929,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:429
+#: apt.conf.5.xml:401
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4942,7 +4942,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:438
+#: apt.conf.5.xml:410
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4952,7 +4952,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:444
+#: apt.conf.5.xml:416
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 "
@@ -4960,7 +4960,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:448
+#: apt.conf.5.xml:420
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4971,7 +4971,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:456
+#: apt.conf.5.xml:428
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4984,12 +4984,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:469
+#: apt.conf.5.xml:441
msgid "APT in DSelect"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:471
+#: apt.conf.5.xml:443
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -4997,12 +4997,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:475
+#: apt.conf.5.xml:447
msgid "Clean"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:476
+#: apt.conf.5.xml:448
msgid ""
"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
"and never. always and prompt will remove all packages from the cache after "
@@ -5013,50 +5013,50 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:485
+#: apt.conf.5.xml:457
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the install phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:489
+#: apt.conf.5.xml:461
msgid "Updateoptions"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:462
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the update phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:494
+#: apt.conf.5.xml:466
msgid "PromptAfterUpdate"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:495
+#: apt.conf.5.xml:467
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:501
+#: apt.conf.5.xml:473
msgid "How APT calls dpkg"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:474
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:507
+#: apt.conf.5.xml:479
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 "
@@ -5064,17 +5064,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:484
msgid "Pre-Invoke"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:484
msgid "Post-Invoke"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:513
+#: apt.conf.5.xml:485
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 "
@@ -5083,12 +5083,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:519
+#: apt.conf.5.xml:491
msgid "Pre-Install-Pkgs"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:520
+#: apt.conf.5.xml:492
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 "
@@ -5098,7 +5098,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:526
+#: apt.conf.5.xml:498
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -5108,36 +5108,36 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:533
+#: apt.conf.5.xml:505
msgid "Run-Directory"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:534
+#: apt.conf.5.xml:506
msgid ""
"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
"</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:510
msgid "Build-options"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:511
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:544
+#: apt.conf.5.xml:516
msgid "dpkg trigger usage (and related options)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:545
+#: apt.conf.5.xml:517
msgid ""
"APT can call dpkg in a way so it can make aggressive use of triggers over "
"multiply calls of dpkg. Without further options dpkg will use triggers only "
@@ -5152,7 +5152,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:532
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -5162,7 +5162,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:554
+#: apt.conf.5.xml:526
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 "
@@ -5176,12 +5176,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:538
msgid "DPkg::NoTriggers"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:567
+#: apt.conf.5.xml:539
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 "
@@ -5193,12 +5193,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:574
+#: apt.conf.5.xml:546
msgid "PackageManager::Configure"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:575
+#: apt.conf.5.xml:547
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
@@ -5214,12 +5214,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:557
msgid "DPkg::ConfigurePending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:586
+#: apt.conf.5.xml:558
msgid ""
"If this option is set apt will call <command>dpkg --configure --pending</"
"command> to let dpkg handle all required configurations and triggers. This "
@@ -5230,12 +5230,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:592
+#: apt.conf.5.xml:564
msgid "DPkg::TriggersPending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:593
+#: apt.conf.5.xml:565
msgid ""
"Useful for <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -5245,12 +5245,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:570
msgid "PackageManager::UnpackAll"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:599
+#: apt.conf.5.xml:571
msgid ""
"As the configuration can be deferred to be done at the end by dpkg it can be "
"tried to order the unpack series only by critical needs, e.g. by Pre-"
@@ -5262,12 +5262,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:606
+#: apt.conf.5.xml:578
msgid "OrderList::Score::Immediate"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:586
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -5279,7 +5279,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:579
msgid ""
"Essential packages (and there dependencies) should be configured immediately "
"after unpacking. It will be a good idea to do this quite early in the "
@@ -5293,12 +5293,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:627
+#: apt.conf.5.xml:599
msgid "Periodic and Archives options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:628
+#: apt.conf.5.xml:600
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -5307,12 +5307,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:636
+#: apt.conf.5.xml:608
msgid "Debug options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:638
+#: apt.conf.5.xml:610
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -5323,7 +5323,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:621
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -5331,7 +5331,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:657
+#: apt.conf.5.xml:629
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -5339,7 +5339,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:666
+#: apt.conf.5.xml:638
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -5349,111 +5349,111 @@ 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:674
+#: apt.conf.5.xml:646
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CDROM IDs."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:656
msgid "A full list of debugging options to apt follows."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:689
+#: apt.conf.5.xml:661
msgid "<literal>Debug::Acquire::cdrom</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:665
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:700
+#: apt.conf.5.xml:672
msgid "<literal>Debug::Acquire::ftp</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:704
+#: apt.conf.5.xml:676
msgid "Print information related to downloading packages using FTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:683
msgid "<literal>Debug::Acquire::http</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:687
msgid "Print information related to downloading packages using HTTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:722
+#: apt.conf.5.xml:694
msgid "<literal>Debug::Acquire::https</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:698
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:705
msgid "<literal>Debug::Acquire::gpgv</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:709
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:744
+#: apt.conf.5.xml:716
msgid "<literal>Debug::aptcdrom</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:748
+#: apt.conf.5.xml:720
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:755
+#: apt.conf.5.xml:727
msgid "<literal>Debug::BuildDeps</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:730
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:737
msgid "<literal>Debug::Hashes</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:768
+#: apt.conf.5.xml:740
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:775
+#: apt.conf.5.xml:747
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:778
+#: apt.conf.5.xml:750
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 "
@@ -5461,93 +5461,93 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:786
+#: apt.conf.5.xml:758
msgid "<literal>Debug::NoLocking</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:761
msgid ""
"Disable all file locking. For instance, this will allow two instances of "
"<quote><literal>apt-get update</literal></quote> to run at the same time."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:769
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:773
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:808
+#: apt.conf.5.xml:780
msgid "<literal>Debug::pkgAcquire::Auth</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:811
+#: apt.conf.5.xml:783
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:818
+#: apt.conf.5.xml:790
msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:821
+#: apt.conf.5.xml:793
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:829
+#: apt.conf.5.xml:801
msgid "<literal>Debug::pkgAcquire::RRed</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:833
+#: apt.conf.5.xml:805
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:840
+#: apt.conf.5.xml:812
msgid "<literal>Debug::pkgAcquire::Worker</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:844
+#: apt.conf.5.xml:816
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:851
+#: apt.conf.5.xml:823
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:827
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:862
+#: apt.conf.5.xml:834
msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:837
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -5557,12 +5557,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:876
+#: apt.conf.5.xml:848
msgid "<literal>Debug::pkgDepCache::Marker</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:851
msgid ""
"Generate debug messages describing which package is marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -5579,91 +5579,91 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:898
+#: apt.conf.5.xml:870
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:901
+#: apt.conf.5.xml:873
msgid "Dump the default configuration to standard error on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:908
+#: apt.conf.5.xml:880
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:911
+#: apt.conf.5.xml:883
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:919
+#: apt.conf.5.xml:891
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:922
+#: apt.conf.5.xml:894
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:901
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:933
+#: apt.conf.5.xml:905
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:941
+#: apt.conf.5.xml:913
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:945
+#: apt.conf.5.xml:917
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:952
+#: apt.conf.5.xml:924
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:928
msgid "Output the priority of each package list on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:962
+#: apt.conf.5.xml:934
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:966
+#: apt.conf.5.xml:938
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:974
+#: apt.conf.5.xml:946
msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:977
+#: apt.conf.5.xml:949
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 "
@@ -5671,32 +5671,32 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:985
+#: apt.conf.5.xml:957
msgid "<literal>Debug::sourceList</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:989
+#: apt.conf.5.xml:961
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1012
+#: apt.conf.5.xml:983
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1019
+#: apt.conf.5.xml:990
msgid "&file-aptconf;"
msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:995
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr ""
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index ea410fc4d..f24b9dfd5 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: apt\n"
-"POT-Creation-Date: 2009-11-27 00:05+0100\n"
+"POT-Creation-Date: 2009-12-10 22:04+0100\n"
"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"
@@ -1450,7 +1450,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122
-#: apt.conf.5.xml:1017 apt_preferences.5.xml:615
+#: apt.conf.5.xml:988 apt_preferences.5.xml:615
msgid "Files"
msgstr ""
@@ -1463,7 +1463,7 @@ msgstr ""
#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569
#: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:994 apt_preferences.5.xml:622
#: sources.list.5.xml:233
#, fuzzy
msgid "See Also"
@@ -2749,7 +2749,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462
+#: apt-ftparchive.1.xml:561 apt.conf.5.xml:982 apt_preferences.5.xml:462
#: sources.list.5.xml:193
#, fuzzy
msgid "Examples"
@@ -4660,7 +4660,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:264 apt.conf.5.xml:328
+#: apt.conf.5.xml:264 apt.conf.5.xml:321
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method, this applies to all things including connection timeout and data "
@@ -4698,12 +4698,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:286
+#: apt.conf.5.xml:281
msgid "https"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:287
+#: apt.conf.5.xml:282
msgid ""
"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
"options are the same as for <literal>http</literal> method and will also "
@@ -4713,7 +4713,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:286
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -4734,12 +4734,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:311 sources.list.5.xml:150
+#: apt.conf.5.xml:304 sources.list.5.xml:150
msgid "ftp"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:312
+#: apt.conf.5.xml:305
msgid ""
"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@ -4758,7 +4758,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#: apt.conf.5.xml:324
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 "
@@ -4768,7 +4768,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:338
+#: apt.conf.5.xml:331
msgid ""
"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
"envar> environment variable to a http url - see the discussion of the http "
@@ -4777,7 +4777,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:343
+#: apt.conf.5.xml:336
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4787,18 +4787,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:350 sources.list.5.xml:132
+#: apt.conf.5.xml:343 sources.list.5.xml:132
msgid "cdrom"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:356
+#: apt.conf.5.xml:349
#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:344
msgid ""
"CDROM URIs; the only setting for CDROM URIs is the mount point, "
"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@ -4811,12 +4811,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:361
+#: apt.conf.5.xml:354
msgid "gpgv"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:362
+#: apt.conf.5.xml:355
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
@@ -4824,18 +4824,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:360
msgid "CompressionTypes"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:373
+#: apt.conf.5.xml:366
#, no-wrap
msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:368
+#: apt.conf.5.xml:361
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -4847,19 +4847,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:378
+#: apt.conf.5.xml:371
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:381
+#: apt.conf.5.xml:374
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:374
+#: apt.conf.5.xml:367
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 "
@@ -4876,13 +4876,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:385
+#: apt.conf.5.xml:378
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:383
+#: apt.conf.5.xml:376
msgid ""
"Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
"replaceable></literal> will be checked: If this setting exists the method "
@@ -4897,7 +4897,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:383
msgid ""
"While it is possible to add an empty compression type to the order list, but "
"APT in its current version doesn't understand it correctly and will display "
@@ -4961,12 +4961,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:392
msgid "Directories"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:422
+#: apt.conf.5.xml:394
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -4978,7 +4978,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:429
+#: apt.conf.5.xml:401
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4991,7 +4991,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:438
+#: apt.conf.5.xml:410
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -5001,7 +5001,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:444
+#: apt.conf.5.xml:416
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 "
@@ -5009,7 +5009,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:448
+#: apt.conf.5.xml:420
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -5020,7 +5020,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:456
+#: apt.conf.5.xml:428
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -5033,12 +5033,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:469
+#: apt.conf.5.xml:441
msgid "APT in DSelect"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:471
+#: apt.conf.5.xml:443
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -5046,12 +5046,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:475
+#: apt.conf.5.xml:447
msgid "Clean"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:476
+#: apt.conf.5.xml:448
msgid ""
"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
"and never. always and prompt will remove all packages from the cache after "
@@ -5062,50 +5062,50 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:485
+#: apt.conf.5.xml:457
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the install phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:489
+#: apt.conf.5.xml:461
msgid "Updateoptions"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:462
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the update phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:494
+#: apt.conf.5.xml:466
msgid "PromptAfterUpdate"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:495
+#: apt.conf.5.xml:467
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:501
+#: apt.conf.5.xml:473
msgid "How APT calls dpkg"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:474
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:507
+#: apt.conf.5.xml:479
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 "
@@ -5113,17 +5113,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:484
msgid "Pre-Invoke"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:484
msgid "Post-Invoke"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:513
+#: apt.conf.5.xml:485
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 "
@@ -5132,12 +5132,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:519
+#: apt.conf.5.xml:491
msgid "Pre-Install-Pkgs"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:520
+#: apt.conf.5.xml:492
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 "
@@ -5147,7 +5147,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:526
+#: apt.conf.5.xml:498
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -5157,36 +5157,36 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:533
+#: apt.conf.5.xml:505
msgid "Run-Directory"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:534
+#: apt.conf.5.xml:506
msgid ""
"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
"</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:510
msgid "Build-options"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:511
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:544
+#: apt.conf.5.xml:516
msgid "dpkg trigger usage (and related options)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:545
+#: apt.conf.5.xml:517
msgid ""
"APT can call dpkg in a way so it can make aggressive use of triggers over "
"multiply calls of dpkg. Without further options dpkg will use triggers only "
@@ -5201,7 +5201,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:532
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -5211,7 +5211,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:554
+#: apt.conf.5.xml:526
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 "
@@ -5225,12 +5225,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:538
msgid "DPkg::NoTriggers"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:567
+#: apt.conf.5.xml:539
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 "
@@ -5242,12 +5242,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:574
+#: apt.conf.5.xml:546
msgid "PackageManager::Configure"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:575
+#: apt.conf.5.xml:547
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
@@ -5263,12 +5263,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:557
msgid "DPkg::ConfigurePending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:586
+#: apt.conf.5.xml:558
msgid ""
"If this option is set apt will call <command>dpkg --configure --pending</"
"command> to let dpkg handle all required configurations and triggers. This "
@@ -5279,12 +5279,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:592
+#: apt.conf.5.xml:564
msgid "DPkg::TriggersPending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:593
+#: apt.conf.5.xml:565
msgid ""
"Useful for <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -5294,12 +5294,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:570
msgid "PackageManager::UnpackAll"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:599
+#: apt.conf.5.xml:571
msgid ""
"As the configuration can be deferred to be done at the end by dpkg it can be "
"tried to order the unpack series only by critical needs, e.g. by Pre-"
@@ -5311,12 +5311,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:606
+#: apt.conf.5.xml:578
msgid "OrderList::Score::Immediate"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:586
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -5328,7 +5328,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:579
msgid ""
"Essential packages (and there dependencies) should be configured immediately "
"after unpacking. It will be a good idea to do this quite early in the "
@@ -5342,12 +5342,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:627
+#: apt.conf.5.xml:599
msgid "Periodic and Archives options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:628
+#: apt.conf.5.xml:600
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -5356,12 +5356,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:636
+#: apt.conf.5.xml:608
msgid "Debug options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:638
+#: apt.conf.5.xml:610
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -5372,7 +5372,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:621
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -5380,7 +5380,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:657
+#: apt.conf.5.xml:629
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -5388,7 +5388,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:666
+#: apt.conf.5.xml:638
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -5398,120 +5398,120 @@ 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:674
+#: apt.conf.5.xml:646
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CDROM IDs."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:656
msgid "A full list of debugging options to apt follows."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:689
+#: apt.conf.5.xml:661
#, fuzzy
msgid "<literal>Debug::Acquire::cdrom</literal>"
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:665
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:700
+#: apt.conf.5.xml:672
#, fuzzy
msgid "<literal>Debug::Acquire::ftp</literal>"
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:704
+#: apt.conf.5.xml:676
msgid "Print information related to downloading packages using FTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:683
#, fuzzy
msgid "<literal>Debug::Acquire::http</literal>"
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:687
msgid "Print information related to downloading packages using HTTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:722
+#: apt.conf.5.xml:694
#, fuzzy
msgid "<literal>Debug::Acquire::https</literal>"
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:698
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:705
#, fuzzy
msgid "<literal>Debug::Acquire::gpgv</literal>"
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:709
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:744
+#: apt.conf.5.xml:716
#, fuzzy
msgid "<literal>Debug::aptcdrom</literal>"
msgstr "a linha <literal>Version:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:748
+#: apt.conf.5.xml:720
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:755
+#: apt.conf.5.xml:727
#, fuzzy
msgid "<literal>Debug::BuildDeps</literal>"
msgstr "a linha <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:730
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:737
#, fuzzy
msgid "<literal>Debug::Hashes</literal>"
msgstr "a linha <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:768
+#: apt.conf.5.xml:740
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:775
+#: apt.conf.5.xml:747
#, fuzzy
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr "a linha <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:778
+#: apt.conf.5.xml:750
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 "
@@ -5519,99 +5519,99 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:786
+#: apt.conf.5.xml:758
#, fuzzy
msgid "<literal>Debug::NoLocking</literal>"
msgstr "a linha <literal>Origin:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:761
msgid ""
"Disable all file locking. For instance, this will allow two instances of "
"<quote><literal>apt-get update</literal></quote> to run at the same time."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:769
#, fuzzy
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:773
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:808
+#: apt.conf.5.xml:780
#, fuzzy
msgid "<literal>Debug::pkgAcquire::Auth</literal>"
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:811
+#: apt.conf.5.xml:783
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:818
+#: apt.conf.5.xml:790
#, fuzzy
msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:821
+#: apt.conf.5.xml:793
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:829
+#: apt.conf.5.xml:801
#, fuzzy
msgid "<literal>Debug::pkgAcquire::RRed</literal>"
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:833
+#: apt.conf.5.xml:805
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:840
+#: apt.conf.5.xml:812
#, fuzzy
msgid "<literal>Debug::pkgAcquire::Worker</literal>"
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:844
+#: apt.conf.5.xml:816
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:851
+#: apt.conf.5.xml:823
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:827
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:862
+#: apt.conf.5.xml:834
msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:837
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -5621,12 +5621,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:876
+#: apt.conf.5.xml:848
msgid "<literal>Debug::pkgDepCache::Marker</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:851
msgid ""
"Generate debug messages describing which package is marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -5643,96 +5643,96 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:898
+#: apt.conf.5.xml:870
#, fuzzy
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr "a linha <literal>Version:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:901
+#: apt.conf.5.xml:873
msgid "Dump the default configuration to standard error on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:908
+#: apt.conf.5.xml:880
#, fuzzy
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr "a linha <literal>Package:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:911
+#: apt.conf.5.xml:883
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:919
+#: apt.conf.5.xml:891
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:922
+#: apt.conf.5.xml:894
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:901
#, fuzzy
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr "a linha <literal>Origin:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:933
+#: apt.conf.5.xml:905
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:941
+#: apt.conf.5.xml:913
#, fuzzy
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr "a linha <literal>Package:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:945
+#: apt.conf.5.xml:917
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:952
+#: apt.conf.5.xml:924
#, fuzzy
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr "a linha <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:928
msgid "Output the priority of each package list on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:962
+#: apt.conf.5.xml:934
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:966
+#: apt.conf.5.xml:938
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:974
+#: apt.conf.5.xml:946
msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:977
+#: apt.conf.5.xml:949
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 "
@@ -5740,33 +5740,33 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:985
+#: apt.conf.5.xml:957
#, fuzzy
msgid "<literal>Debug::sourceList</literal>"
msgstr "a linha <literal>Version:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:989
+#: apt.conf.5.xml:961
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1012
+#: apt.conf.5.xml:983
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1019
+#: apt.conf.5.xml:990
msgid "&file-aptconf;"
msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:995
#, fuzzy
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
diff --git a/methods/ftp.cc b/methods/ftp.cc
index c91600ad5..3e1725823 100644
--- a/methods/ftp.cc
+++ b/methods/ftp.cc
@@ -19,6 +19,7 @@
#include <apt-pkg/acquire-method.h>
#include <apt-pkg/error.h>
#include <apt-pkg/hashes.h>
+#include <apt-pkg/netrc.h>
#include <sys/stat.h>
#include <sys/time.h>
@@ -982,7 +983,9 @@ bool FtpMethod::Fetch(FetchItem *Itm)
FetchResult Res;
Res.Filename = Itm->DestFile;
Res.IMSHit = false;
-
+
+ maybe_add_auth (Get, _config->FindFile("Dir::Etc::netrc"));
+
// Connect to the server
if (Server == 0 || Server->Comp(Get) == false)
{
diff --git a/methods/http.cc b/methods/http.cc
index 8fcff0b5d..2dae87a02 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -29,6 +29,7 @@
#include <apt-pkg/acquire-method.h>
#include <apt-pkg/error.h>
#include <apt-pkg/hashes.h>
+#include <apt-pkg/netrc.h>
#include <sys/stat.h>
#include <sys/time.h>
@@ -42,6 +43,7 @@
#include <map>
#include <apti18n.h>
+
// Internet stuff
#include <netdb.h>
@@ -49,7 +51,6 @@
#include "connect.h"
#include "rfc2553emu.h"
#include "http.h"
-
/*}}}*/
using namespace std;
@@ -724,10 +725,12 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out)
Req += string("Proxy-Authorization: Basic ") +
Base64Encode(Proxy.User + ":" + Proxy.Password) + "\r\n";
+ maybe_add_auth (Uri, _config->FindFile("Dir::Etc::netrc"));
if (Uri.User.empty() == false || Uri.Password.empty() == false)
+ {
Req += string("Authorization: Basic ") +
Base64Encode(Uri.User + ":" + Uri.Password) + "\r\n";
-
+ }
Req += "User-Agent: " + _config->Find("Acquire::http::User-Agent",
"Debian APT-HTTP/1.3 ("VERSION")") + "\r\n\r\n";
diff --git a/methods/https.cc b/methods/https.cc
index 4daa04e32..726f53c44 100644
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -14,6 +14,7 @@
#include <apt-pkg/acquire-method.h>
#include <apt-pkg/error.h>
#include <apt-pkg/hashes.h>
+#include <apt-pkg/netrc.h>
#include <sys/stat.h>
#include <sys/time.h>
@@ -110,8 +111,10 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
curl_easy_reset(curl);
SetupProxy();
+ maybe_add_auth (Uri, _config->FindFile("Dir::Etc::netrc"));
+
// callbacks
- curl_easy_setopt(curl, CURLOPT_URL, Itm->Uri.c_str());
+ curl_easy_setopt(curl, CURLOPT_URL, static_cast<string>(Uri).c_str());
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, this);
curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, progress_callback);
@@ -119,7 +122,6 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
curl_easy_setopt(curl, CURLOPT_NOPROGRESS, false);
curl_easy_setopt(curl, CURLOPT_FAILONERROR, true);
curl_easy_setopt(curl, CURLOPT_FILETIME, true);
- curl_easy_setopt(curl, CURLOPT_NETRC, CURL_NETRC_OPTIONAL);
// SSL parameters are set by default to the common (non mirror-specific) value
// if available (or a default one) and gets overload by mirror-specific ones.
@@ -207,6 +209,9 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
_config->FindI("Acquire::http::Timeout",120));
curl_easy_setopt(curl, CURLOPT_TIMEOUT, timeout);
curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, timeout);
+ //set really low lowspeed timeout (see #497983)
+ curl_easy_setopt(curl, CURLOPT_LOW_SPEED_LIMIT, DL_MIN_SPEED);
+ curl_easy_setopt(curl, CURLOPT_LOW_SPEED_TIME, timeout);
// set redirect options and default to 10 redirects
bool AllowRedirect = _config->FindB("Acquire::https::AllowRedirect",
diff --git a/methods/https.h b/methods/https.h
index 2c33d95ee..3f0c416b6 100644
--- a/methods/https.h
+++ b/methods/https.h
@@ -24,6 +24,8 @@ class HttpsMethod;
class HttpsMethod : public pkgAcqMethod
{
+ // minimum speed in bytes/se that triggers download timeout handling
+ static const int DL_MIN_SPEED = 10;
virtual bool Fetch(FetchItem *);
static size_t write_data(void *buffer, size_t size, size_t nmemb, void *userp);
diff --git a/po/apt-all.pot b/po/apt-all.pot
index b6610a191..4ccf7413d 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-28 02:10+0100\n"
+"POT-Creation-Date: 2009-12-10 23:01+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -151,7 +151,7 @@ msgstr ""
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2665 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr ""
@@ -342,7 +342,7 @@ msgstr ""
#: ftparchive/cachedb.cc:72
msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
@@ -549,7 +549,7 @@ msgstr ""
msgid "Y"
msgstr ""
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -708,11 +708,11 @@ msgstr ""
msgid "Internal error, Ordering didn't finish"
msgstr ""
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
msgid "Unable to lock the download directory"
msgstr ""
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr ""
@@ -741,8 +741,8 @@ msgstr ""
msgid "After this operation, %sB disk space will be freed.\n"
msgstr ""
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Couldn't determine free space in %s"
msgstr ""
@@ -776,7 +776,7 @@ msgstr ""
msgid "Do you want to continue [Y/n]? "
msgstr ""
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
@@ -785,7 +785,7 @@ msgstr ""
msgid "Some files failed to download"
msgstr ""
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
msgid "Download complete and in download only mode"
msgstr ""
@@ -878,49 +878,49 @@ msgid "Selected version %s (%s) for %s\n"
msgstr ""
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1307
+#: cmdline/apt-get.cc:1313
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1342
#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1395
msgid "The update command takes no arguments"
msgstr ""
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1408
msgid "Unable to lock the list directory"
msgstr ""
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1464
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1513
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr ""
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1515
#, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr ""
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1516
msgid "Use 'apt-get autoremove' to remove them."
msgstr ""
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1521
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -936,49 +936,49 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
msgid "The following information may help to resolve the situation:"
msgstr ""
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1528
msgid "Internal Error, AutoRemover broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1547
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1602
#, c-format
msgid "Couldn't find task %s"
msgstr ""
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1740
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1771
#, c-format
msgid "%s set to manually installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1784
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1787
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1799
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"
@@ -986,152 +986,152 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1817
msgid "Broken packages"
msgstr ""
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1846
msgid "The following extra packages will be installed:"
msgstr ""
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1935
msgid "Suggested packages:"
msgstr ""
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1936
msgid "Recommended packages:"
msgstr ""
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1965
msgid "Calculating upgrade... "
msgstr ""
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr ""
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1973
msgid "Done"
msgstr ""
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
msgid "Internal error, problem resolver broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2148
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2262
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2268
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2271
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2308
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2336
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2348
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2349
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2366
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2385
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2401
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2429
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2449
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2501
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2554
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
msgstr ""
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2590
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2617
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2633
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2638
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2670
msgid "Supported modules:"
msgstr ""
-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:2711
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1175,7 +1175,7 @@ msgid ""
" This APT has Super Cow Powers.\n"
msgstr ""
-#: cmdline/apt-get.cc:2867
+#: cmdline/apt-get.cc:2879
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1408,7 +1408,7 @@ msgstr ""
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
@@ -1583,147 +1583,147 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr ""
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr ""
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr ""
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr ""
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
msgstr ""
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
msgstr ""
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr ""
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr ""
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr ""
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr ""
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr ""
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
msgstr ""
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr ""
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr ""
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr ""
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
msgstr ""
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr ""
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr ""
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr ""
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr ""
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr ""
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr ""
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr ""
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr ""
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr ""
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr ""
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr ""
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr ""
@@ -1831,80 +1831,80 @@ msgstr ""
msgid "Read error from %s process"
msgstr ""
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr ""
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr ""
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr ""
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr ""
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr ""
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr ""
-#: methods/http.cc:788
+#: methods/http.cc:791
msgid "Select failed"
msgstr ""
-#: methods/http.cc:793
+#: methods/http.cc:796
msgid "Connection timed out"
msgstr ""
-#: methods/http.cc:816
+#: methods/http.cc:819
msgid "Error writing to output file"
msgstr ""
-#: methods/http.cc:847
+#: methods/http.cc:850
msgid "Error writing to file"
msgstr ""
-#: methods/http.cc:875
+#: methods/http.cc:878
msgid "Error writing to the file"
msgstr ""
-#: methods/http.cc:889
+#: methods/http.cc:892
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:891
+#: methods/http.cc:894
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
msgid "Failed to truncate file"
msgstr ""
-#: methods/http.cc:1147
+#: methods/http.cc:1150
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1167 methods/http.cc:1222
msgid "Connection failed"
msgstr ""
-#: methods/http.cc:1311
+#: methods/http.cc:1314
msgid "Internal error"
msgstr ""
@@ -2316,14 +2316,14 @@ msgstr ""
msgid "Malformed line %u in source list %s (vendor id)"
msgstr ""
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
#, 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:437
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2331,7 +2331,7 @@ msgid ""
"you really want to do it, activate the APT::Force-LoopBreak option."
msgstr ""
-#: apt-pkg/packagemanager.cc:475
+#: apt-pkg/packagemanager.cc:478
#, c-format
msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
@@ -2402,12 +2402,12 @@ msgstr ""
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr ""
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr ""
@@ -2699,76 +2699,96 @@ msgstr ""
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
+#: apt-pkg/indexcopy.cc:530
+#, c-format
+msgid "Skipping nonexistent file %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, c-format
+msgid "Hash mismatch for: %s"
+msgstr ""
+
#: apt-pkg/deb/dpkgpm.cc:49
#, c-format
msgid "Installing %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Configuring %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removing %s"
msgstr ""
#: apt-pkg/deb/dpkgpm.cc:52
#, c-format
+msgid "Completely removing %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:53
+#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, c-format
msgid "Directory '%s' missing"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Preparing %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, c-format
msgid "Unpacking %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Preparing to configure %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, c-format
msgid "Installed %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, c-format
msgid "Removed %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Preparing to completely remove %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, c-format
msgid "Completely removed %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:908
msgid "Running dpkg"
msgstr ""
diff --git a/po/it.po b/po/it.po
index bf37c4dc1..753347ad0 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.23.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
+"POT-Creation-Date: 2009-12-10 16:49+0100\n"
"PO-Revision-Date: 2009-11-11 21:10+0100\n"
"Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
@@ -153,7 +153,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s per %s compilato il %s %s\n"
@@ -532,26 +532,26 @@ msgstr "*** Collegamento di %s a %s non riuscito"
msgid " DeLink limit of %sB hit.\n"
msgstr " Raggiunto il limite di Delink di %sB.\n"
-#: ftparchive/writer.cc:388
+#: ftparchive/writer.cc:387
msgid "Archive had no package field"
msgstr "L'archivio non ha un campo \"package\""
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#: ftparchive/writer.cc:395 ftparchive/writer.cc:610
#, c-format
msgid " %s has no override entry\n"
msgstr " %s non ha un campo override\n"
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#: ftparchive/writer.cc:440 ftparchive/writer.cc:698
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " il responsabile di %s è %s non %s\n"
-#: ftparchive/writer.cc:637
+#: ftparchive/writer.cc:620
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s non ha un campo source override\n"
-#: ftparchive/writer.cc:641
+#: ftparchive/writer.cc:624
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s non ha neppure un campo binario override\n"
@@ -655,7 +655,7 @@ msgstr "Rinomina di %s in %s non riuscita"
msgid "Y"
msgstr "S"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720
#, c-format
msgid "Regex compilation error - %s"
msgstr "Errore di compilazione dell'espressione regolare - %s"
@@ -802,7 +802,7 @@ msgstr "Installare questi pacchetti senza verificarli [s/N]? "
msgid "Some packages could not be authenticated"
msgstr "Alcuni pacchetti non possono essere autenticati"
-#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886
msgid "There are problems and -y was used without --force-yes"
msgstr "Si sono verificati dei problemi ed è stata usata -y senza --force-yes"
@@ -821,11 +821,11 @@ msgstr ""
msgid "Internal error, Ordering didn't finish"
msgstr "Errore interno, l'ordinamento non è stato terminato"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095
msgid "Unable to lock the download directory"
msgstr "Impossibile bloccare la directory di scaricamento"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Impossibile leggere l'elenco dei sorgenti."
@@ -855,28 +855,27 @@ msgstr "Dopo quest'operazione, verranno occupati %sB di spazio su disco.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Dopo quest'operazione, verranno liberati %sB di spazio su disco.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Impossibile determinare lo spazio libero su %s"
-#: cmdline/apt-get.cc:880
+#: cmdline/apt-get.cc:876
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Spazio libero in %s insufficiente."
-#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
"È stata specificata la modalità \"Trivial Only\", ma questa non è "
"un'operazione banale."
-#: cmdline/apt-get.cc:898
+#: cmdline/apt-get.cc:894
msgid "Yes, do as I say!"
msgstr "Sì, esegui come da richiesta."
-#: cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:896
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -887,28 +886,28 @@ msgstr ""
"Per continuare scrivere la frase \"%s\"\n"
" ?] "
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925
+#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921
msgid "Abort."
msgstr "Interrotto."
-#: cmdline/apt-get.cc:921
+#: cmdline/apt-get.cc:917
msgid "Do you want to continue [Y/n]? "
msgstr "Continuare [S/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Impossibile recuperare %s %s\n"
-#: cmdline/apt-get.cc:1011
+#: cmdline/apt-get.cc:1007
msgid "Some files failed to download"
msgstr "Scaricamento di alcuni file non riuscito"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298
msgid "Download complete and in download only mode"
msgstr "Scaricamento completato e in modalità solo scaricamento"
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1014
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -916,48 +915,48 @@ msgstr ""
"Impossibile recuperare alcuni pacchetti. Potrebbe essere utile eseguire "
"\"apt-get update\" o provare l'opzione \"--fix-missing\"."
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1018
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing su supporti estraibili non è ancora supportato"
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1023
msgid "Unable to correct missing packages."
msgstr "Impossibile correggere i pacchetti mancanti."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1024
msgid "Aborting install."
msgstr "Interruzione dell'installazione."
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1082
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Nota, viene selezionato %s al posto di %s\n"
-#: cmdline/apt-get.cc:1097
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"Viene saltato %s poiché è già installato e l'aggiornamento non è impostato.\n"
-#: cmdline/apt-get.cc:1115
+#: cmdline/apt-get.cc:1111
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Il pacchetto %s non è installato e quindi non è stato rimosso\n"
-#: cmdline/apt-get.cc:1126
+#: cmdline/apt-get.cc:1122
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Il pacchetto %s è un pacchetto virtuale fornito da:\n"
-#: cmdline/apt-get.cc:1138
+#: cmdline/apt-get.cc:1134
msgid " [Installed]"
msgstr " [Installato]"
-#: cmdline/apt-get.cc:1143
+#: cmdline/apt-get.cc:1139
msgid "You should explicitly select one to install."
msgstr "È necessario sceglierne uno da installare."
-#: cmdline/apt-get.cc:1148
+#: cmdline/apt-get.cc:1144
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -968,72 +967,61 @@ msgstr ""
"pacchetto. Questo significa che il pacchetto manca, è diventato obsoleto\n"
"oppure è disponibile solo all'interno di un'altra sorgente\n"
-#: cmdline/apt-get.cc:1167
+#: cmdline/apt-get.cc:1163
msgid "However the following packages replace it:"
msgstr "Tuttavia questi pacchetti lo sostituiscono:"
-#: cmdline/apt-get.cc:1170
+#: cmdline/apt-get.cc:1166
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Il pacchetto %s non ha candidati da installare"
-#: cmdline/apt-get.cc:1190
+#: cmdline/apt-get.cc:1186
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "La reinstallazione di %s non è possibile, non può essere scaricato.\n"
-#: cmdline/apt-get.cc:1198
+#: cmdline/apt-get.cc:1194
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s è già alla versione più recente.\n"
# (ndt) dovrebbe essere inteso il file Release
-#: cmdline/apt-get.cc:1227
+#: cmdline/apt-get.cc:1223
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Release \"%s\" per \"%s\" non trovato."
# (ndt) dovrebbe essere inteso il Version
-#: cmdline/apt-get.cc:1229
+#: cmdline/apt-get.cc:1225
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Version \"%s\" per \"%s\" non trovato"
-#: cmdline/apt-get.cc:1235
+#: cmdline/apt-get.cc:1231
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Versione %s (%s) selezionata per %s\n"
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1348
#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr "Nessun pacchetto sorgente \"%s\", selezionato \"%s\" al suo posto\n"
-#: cmdline/apt-get.cc:1307
-#, c-format
-msgid "Ignore unavailable target release '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1332
-#, fuzzy, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Impossibile eseguire stat sull'elenco dei pacchetti sorgente %s"
-
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1385
msgid "The update command takes no arguments"
msgstr "Il comando update non accetta argomenti"
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1398
msgid "Unable to lock the list directory"
msgstr "Impossibile bloccare la directory"
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1454
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
"Non si è autorizzati a rimuovere nulla, impossibile avviare AutoRemover"
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1503
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
@@ -1041,18 +1029,18 @@ msgstr ""
"I seguenti pacchetti sono stati installati automaticamente e non sono più "
"richiesti:"
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1505
#, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr ""
"%lu pacchetti sono stati installati automaticamente e non sono più "
"richiesti.\n"
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1506
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Usare \"apt-get autoremove\" per rimuoverli."
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1511
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1070,44 +1058,44 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804
msgid "The following information may help to resolve the situation:"
msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione: "
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1518
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Errore interno, AutoRemover ha rovinato qualche cosa"
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1537
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Errore interno, AllUpgrade ha rovinato qualche cosa"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1592
#, c-format
msgid "Couldn't find task %s"
msgstr "Impossibile trovare il task %s"
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossibile trovare il pacchetto %s"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1730
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota, si sta selezionando %s per l'espressione regolare \"%s\"\n"
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1761
#, c-format
msgid "%s set to manually installed.\n"
msgstr "È stato impostato %s per l'installazione manuale.\n"
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1774
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"È utile eseguire \"apt-get -f install\" per correggere questi problemi:"
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1777
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1115,7 +1103,7 @@ msgstr ""
"Dipendenze non soddisfatte. Provare \"apt-get -f install\" senza pacchetti "
"(o specificare una soluzione)."
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1789
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"
@@ -1127,118 +1115,118 @@ msgstr ""
"usando una distribuzione in sviluppo, che alcuni pacchetti richiesti\n"
"non sono ancora stati creati o sono stati rimossi da Incoming."
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1807
msgid "Broken packages"
msgstr "Pacchetto danneggiato"
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1836
msgid "The following extra packages will be installed:"
msgstr "I seguenti pacchetti saranno inoltre installati:"
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1925
msgid "Suggested packages:"
msgstr "Pacchetti suggeriti:"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1926
msgid "Recommended packages:"
msgstr "Pacchetti raccomandati:"
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1955
msgid "Calculating upgrade... "
msgstr "Calcolo dell'aggiornamento... "
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1958 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Non riuscito"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1963
msgid "Done"
msgstr "Eseguito"
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038
msgid "Internal error, problem resolver broke stuff"
msgstr "Errore interno, \"problem resolver\" ha rovinato qualcosa"
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2138
msgid "Must specify at least one package to fetch source for"
msgstr ""
"È necessario specificare almeno un pacchetto di cui recuperare il sorgente"
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Impossibile trovare un pacchetto sorgente per %s"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2217
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Il pacchetto \"%s\" già scaricato viene saltato\n"
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2248
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Lo spazio libero in %s è insufficiente"
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2254
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "È necessario recuperare %sB/%sB di sorgenti.\n"
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2257
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "È necessario recuperare %sB di sorgenti\n"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2263
#, c-format
msgid "Fetch source %s\n"
msgstr "Recupero sorgente %s\n"
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2294
msgid "Failed to fetch some archives."
msgstr "Recupero di alcuni archivi non riuscito."
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2322
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Estrazione del pacchetto sorgente già estratto in %s saltata\n"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2334
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Comando di estrazione \"%s\" non riuscito.\n"
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2335
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Verificare che il pacchetto \"dpkg-dev\" sia installato.\n"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2352
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Comando \"%s\" di generazione non riuscito.\n"
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2371
msgid "Child process failed"
msgstr "Creazione processo figlio non riuscita"
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2387
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"È necessario specificare almeno un pacchetto di cui controllare le "
"dipendenze di generazione"
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2415
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Impossibile ottenere informazioni di dipendenza di generazione per %s"
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2435
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s non ha dipendenze di generazione.\n"
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2487
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1247,7 +1235,7 @@ msgstr ""
"%s dipendenze per %s non possono essere soddisfatte perché il pacchetto %s "
"non può essere trovato"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2540
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1256,32 +1244,32 @@ msgstr ""
"%s dipendenze per %s non possono essere soddisfatte perché nessuna versione "
"del pacchetto %s può soddisfare le richieste di versione"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2576
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"La dipendenza %s per %s non è stata soddisfatta: il pacchetto installato %s "
"è troppo nuovo"
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2603
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "La dipendenza %s per %s non è stata soddisfatta: %s"
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2619
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Le dipendenze di generazione per %s non sono state soddisfatte."
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2624
msgid "Failed to process build dependencies"
msgstr "Elaborazione delle dipendenze di generazione non riuscita"
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2656
msgid "Supported modules:"
msgstr "Moduli supportati:"
-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:2697
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1367,7 +1355,7 @@ msgstr ""
"apt-get(8), sources.list(5) e apt.conf(5).\n"
" Questo APT ha i poteri della Super Mucca.\n"
-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:2864
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1626,7 +1614,7 @@ msgstr "Il file %s/%s sovrascrive quello nel pacchetto %s"
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
@@ -1794,11 +1782,11 @@ msgid "File not found"
msgstr "File non trovato"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
msgstr "Esecuzione di stat non riuscita"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
msgid "Failed to set modification time"
msgstr "Impostazione della data di modifica non riuscita"
@@ -1807,34 +1795,34 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr "URI non valido, gli URI locali non devono iniziare con //"
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr "Accesso in corso"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr "Impossibile determinare il nome del nodo"
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr "Impossibile determinare il nome locale"
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "Il server ha rifiutato la connessione e riporta: %s"
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr "USER non riuscito, il server riporta: %s"
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr "PASS non riuscito, il server riporta: %s"
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
@@ -1842,115 +1830,115 @@ msgstr ""
"È stato specificato un server proxy, ma nessuno script di accesso: Acquire::"
"ftp::ProxyLogin è vuoto."
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr ""
"Comando dello script di accesso \"%s\" non riuscito, il server riporta: %s"
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "TYPE non riuscito, il server riporta: %s"
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "Connessione scaduta"
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr "Il server ha chiuso la connessione"
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr "Errore di lettura"
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr "Una risposta ha superato le dimensioni del buffer."
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr "Protocollo danneggiato"
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
msgstr "Errore di scrittura"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr "Impossibile creare un socket"
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr "Impossibile connettersi al socket dati, connessione terminata"
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr "Impossibile connettere socket passivo."
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
msgstr "Impossibile ottenere un socket in ascolto con getaddrinfo()"
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr "Impossibile eseguire bind() su un socket"
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr "Impossibile eseguire listen() su un socket"
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr "Impossibile determinare il nome del socket"
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr "Impossibile inviare il comando PORT"
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "Famiglia di indirizzamento %u (AF_*) sconosciuta"
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "EPRT non riuscito, il server riporta: %s"
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr "Connessione al socket dati terminata"
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr "Impossibile accettare connessioni"
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Si è verificato un problema nel creare l'hash del file"
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "Impossibile recuperare il file, il server riporta: \"%s\""
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr "Socket dati terminato"
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "Trasferimento dati non riuscito, il server riporta: \"%s\""
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr "Interrogazione"
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr "Impossibile invocare "
@@ -2002,8 +1990,8 @@ msgid "Temporary failure resolving '%s'"
msgstr "Risoluzione di \"%s\" temporaneamente non riuscita"
#: methods/connect.cc:193
-#, fuzzy, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
+#, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i)"
msgstr ""
"Si è verificato qualcosa di anormale nella risoluzione di \"%s:%s\" (%i)"
@@ -2065,80 +2053,80 @@ msgstr "Impossibile aprire una pipe per %s"
msgid "Read error from %s process"
msgstr "Errore di lettura dal processo %s"
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr "In attesa degli header"
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Ricevuta una singola riga header su %u caratteri"
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr "Riga header non corretta"
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr "Il server HTTP ha inviato un header di risposta non valido"
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Il server HTTP ha inviato un header Content-Length non valido"
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Il server HTTP ha inviato un header Content-Range non valido"
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr "Questo server HTTP ha un supporto del range non corretto"
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr "Formato della data sconosciuto"
-#: methods/http.cc:788
+#: methods/http.cc:790
msgid "Select failed"
msgstr "Select non riuscita"
-#: methods/http.cc:793
+#: methods/http.cc:795
msgid "Connection timed out"
msgstr "Connessione terminata"
-#: methods/http.cc:816
+#: methods/http.cc:818
msgid "Error writing to output file"
msgstr "Errore nello scrivere sul file di output"
-#: methods/http.cc:847
+#: methods/http.cc:849
msgid "Error writing to file"
msgstr "Errore nello scrivere su file"
-#: methods/http.cc:875
+#: methods/http.cc:877
msgid "Error writing to the file"
msgstr "Errore nello scrivere sul file"
-#: methods/http.cc:889
+#: methods/http.cc:891
msgid "Error reading from server. Remote end closed connection"
msgstr "Errore nel leggere dal server. Il lato remoto ha chiuso la connessione"
-#: methods/http.cc:891
+#: methods/http.cc:893
msgid "Error reading from server"
msgstr "Errore nel leggere dal server"
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
msgid "Failed to truncate file"
msgstr "Troncamento del file non riuscito"
-#: methods/http.cc:1147
+#: methods/http.cc:1149
msgid "Bad header data"
msgstr "Header dati non corretto"
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1166 methods/http.cc:1221
msgid "Connection failed"
msgstr "Connessione non riuscita"
-#: methods/http.cc:1311
+#: methods/http.cc:1313
msgid "Internal error"
msgstr "Errore interno"
@@ -2146,12 +2134,12 @@ msgstr "Errore interno"
msgid "Can't mmap an empty file"
msgstr "Impossibile eseguire mmap su un file vuoto"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Impossibile eseguire mmap di %lu byte"
-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:234
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2160,13 +2148,6 @@ msgstr ""
"Mmap dinamica esaurita. Aumentare la dimensione di APT::Cache-Limit. Il "
"valore attuale è: %lu (man 5 apt.conf)."
-#: apt-pkg/contrib/mmap.cc:347
-#, c-format
-msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
-msgstr ""
-
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2557,14 +2538,7 @@ msgstr "Tipo \"%s\" non riconosciuto alla riga %u nel file %s"
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "La riga %u nel file %s non è corretta (vendor id)"
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
-#, 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:437
+#: apt-pkg/packagemanager.cc:439
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2576,13 +2550,6 @@ msgstr ""
"situazione critica, ma se si vuole realmente procedere, attivare l'opzione "
"APT::Force-LoopBreak."
-#: apt-pkg/packagemanager.cc:475
-#, c-format
-msgid ""
-"Could not perform immediate configuration on already unpacked '%s'.Please "
-"see man 5 apt.conf under APT::Immediate-Configure for details."
-msgstr ""
-
#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
@@ -2654,12 +2621,12 @@ msgstr "Il metodo %s non si è avviato correttamente"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Inserire il disco chiamato \"%s\" nell'unità \"%s\" e premere Invio."
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Il sistema di pacchetti \"%s\" non è supportato"
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr "Impossibile determinare un tipo di sistema appropriato di pacchetti"
@@ -2802,20 +2769,20 @@ msgstr "Errore di I/O nel salvare la cache sorgente"
msgid "rename failed, %s (%s -> %s)."
msgstr "rename() non riuscita: %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:395
msgid "MD5Sum mismatch"
msgstr "MD5sum non corrispondente"
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
msgid "Hash Sum mismatch"
msgstr "Somma hash non corrispondente"
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1106
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
"Non è disponibile alcuna chiave pubblica per i seguenti ID di chiavi:\n"
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1216
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2824,7 +2791,7 @@ msgstr ""
"Impossibile trovare un file per il pacchetto %s. Potrebbe essere necessario "
"sistemare manualmente questo pacchetto (a causa dell'architettura mancante)."
-#: apt-pkg/acquire-item.cc:1283
+#: apt-pkg/acquire-item.cc:1275
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2833,7 +2800,7 @@ msgstr ""
"Impossibile trovare un file per il pacchetto %s. Potrebbe essere necessario "
"sistemare manualmente questo pacchetto."
-#: apt-pkg/acquire-item.cc:1324
+#: apt-pkg/acquire-item.cc:1316
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2841,7 +2808,7 @@ msgstr ""
"L'indice dei file è danneggiato. Manca il campo \"Filename:\" per il "
"pacchetto %s."
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:1403
msgid "Size mismatch"
msgstr "Le dimensioni non corrispondono"
@@ -2977,78 +2944,98 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
"Scritti %i record con %i file mancanti e %i file senza corrispondenze\n"
+#: apt-pkg/indexcopy.cc:530
+#, fuzzy, c-format
+msgid "Skipping nonexistent file %s"
+msgstr "Apertura file di configurazione %s"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, fuzzy, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Somma hash non corrispondente"
+
#: apt-pkg/deb/dpkgpm.cc:49
#, c-format
msgid "Installing %s"
msgstr "Installazione di %s"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Configuring %s"
msgstr "Configurazione di %s"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removing %s"
msgstr "Rimozione di %s"
#: apt-pkg/deb/dpkgpm.cc:52
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "Pacchetto %s rimosso completamente"
+
+#: apt-pkg/deb/dpkgpm.cc:53
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Esecuzione comando di post installazione %s"
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, c-format
msgid "Directory '%s' missing"
msgstr "Directory \"%s\" mancante"
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Preparing %s"
msgstr "Preparazione di %s"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, c-format
msgid "Unpacking %s"
msgstr "Estrazione di %s"
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Preparing to configure %s"
msgstr "Preparazione alla configurazione di %s"
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, c-format
msgid "Installed %s"
msgstr "Pacchetto %s installato"
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr "Preparazione alla rimozione di %s"
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, c-format
msgid "Removed %s"
msgstr "Pacchetto %s rimosso"
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Preparazione alla rimozione completa di %s"
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, c-format
msgid "Completely removed %s"
msgstr "Pacchetto %s rimosso completamente"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Impossibile scrivere il registro, openpty() non riuscita (forse /dev/pts non "
"è montato)\n"
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:908
msgid "Running dpkg"
msgstr "Esecuzione di dpkg"
@@ -3080,26 +3067,10 @@ msgstr ""
msgid "Not locked"
msgstr "Non bloccato"
-#: methods/rred.cc:465
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:470
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
+#: methods/rred.cc:219
+msgid "Could not patch file"
+msgstr "Impossibile applicare la patch al file"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Connessione chiusa prematuramente"
-
-#~ msgid "No source package '%s' picking '%s' instead\n"
-#~ msgstr "Nessun pacchetto sorgente \"%s\", selezionato \"%s\" al suo posto\n"
-
-#~ msgid "Could not patch file"
-#~ msgstr "Impossibile applicare la patch al file"
diff --git a/po/sk.po b/po/sk.po
index 088293d63..58910ff25 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
-"PO-Revision-Date: 2009-07-21 12:45+0100\n"
+"POT-Creation-Date: 2009-12-10 16:49+0100\n"
+"PO-Revision-Date: 2009-12-03 09:20+0100\n"
"Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
"MIME-Version: 1.0\n"
@@ -155,7 +155,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s pre %s skompilovaný %s %s\n"
@@ -235,9 +235,8 @@ msgstr ""
"Viac informácií nájdete v manuálových stránkach apt-cache(8) a apt.conf(5).\n"
#: cmdline/apt-cdrom.cc:77
-#, fuzzy
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
-msgstr "Zadajte názov tohto disku, napríklad „Debian 2.1r1 Disk 1“"
+msgstr "Prosím, zadajte názov tohto disku, napríklad „Debian 5.0.3 Disk 1“"
#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
@@ -528,26 +527,26 @@ msgstr "*** Nepodarilo sa zlinkovať %s s %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " Bol dosiahnutý odlinkovací limit %sB.\n"
-#: ftparchive/writer.cc:388
+#: ftparchive/writer.cc:387
msgid "Archive had no package field"
msgstr "Archív neobsahuje pole „package“"
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#: ftparchive/writer.cc:395 ftparchive/writer.cc:610
#, c-format
msgid " %s has no override entry\n"
msgstr " %s nemá žiadnu položku override\n"
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#: ftparchive/writer.cc:440 ftparchive/writer.cc:698
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " správcom %s je %s, nie %s\n"
-#: ftparchive/writer.cc:637
+#: ftparchive/writer.cc:620
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s nemá žiadnu položku „source override“\n"
-#: ftparchive/writer.cc:641
+#: ftparchive/writer.cc:624
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s nemá žiadnu položku „binary override“\n"
@@ -651,7 +650,7 @@ msgstr "Premenovanie %s na %s zlyhalo"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720
#, c-format
msgid "Regex compilation error - %s"
msgstr "Chyba pri preklade regulárneho výrazu - %s"
@@ -796,7 +795,7 @@ msgstr "Nainštalovať tieto nekontrolované balíky [y/N]? "
msgid "Some packages could not be authenticated"
msgstr "Nedala sa zistiť vierohodnosť niektorých balíkov"
-#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886
msgid "There are problems and -y was used without --force-yes"
msgstr "Nastali problémy a -y bolo použité bez --force-yes"
@@ -812,11 +811,11 @@ msgstr "Je potrebné odstránenie balíka, ale funkcia Odstrániť je vypnutá."
msgid "Internal error, Ordering didn't finish"
msgstr "Vnútorná chyba, Triedenie sa neukončilo"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095
msgid "Unable to lock the download directory"
msgstr "Adresár pre sťahovanie sa nedá zamknúť"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr "Nedá sa načítať zoznam zdrojov."
@@ -847,26 +846,25 @@ msgstr "Po tejto operácii sa na disku použije ďalších %sB.\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Po tejto operácii sa na disku uvoľní %sB.\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Na %s sa nedá zistiť veľkosť voľného miesta"
-#: cmdline/apt-get.cc:880
+#: cmdline/apt-get.cc:876
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Na %s nemáte dostatok voľného miesta."
-#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Zadané „iba triviálne“, ale toto nie je triviálna operácia."
-#: cmdline/apt-get.cc:898
+#: cmdline/apt-get.cc:894
msgid "Yes, do as I say!"
msgstr "Áno, urob to, čo vravím!"
-#: cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:896
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -877,28 +875,28 @@ msgstr ""
"Ak chcete pokračovať, opíšte frázu „%s“\n"
" ?]"
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925
+#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921
msgid "Abort."
msgstr "Prerušené."
-#: cmdline/apt-get.cc:921
+#: cmdline/apt-get.cc:917
msgid "Do you want to continue [Y/n]? "
msgstr "Chcete pokračovať [Y/n]? "
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Zlyhalo stiahnutie %s %s\n"
-#: cmdline/apt-get.cc:1011
+#: cmdline/apt-get.cc:1007
msgid "Some files failed to download"
msgstr "Niektoré súbory sa nedajú stiahnuť"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298
msgid "Download complete and in download only mode"
msgstr "Sťahovanie ukončené v režime „iba stiahnuť“"
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1014
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -906,47 +904,47 @@ msgstr ""
"Niektoré archívy sa nedajú stiahnuť. Skúste spustiť apt-get update alebo --"
"fix-missing"
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1018
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing a výmena nosiča nie sú momentálne podporované"
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1023
msgid "Unable to correct missing packages."
msgstr "Chýbajúce balíky sa nedajú opraviť."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1024
msgid "Aborting install."
msgstr "Inštalácia sa prerušuje."
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1082
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Poznámka: %s sa vyberá namiesto %s\n"
-#: cmdline/apt-get.cc:1097
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Preskakuje sa %s, pretože je už nainštalovaný.\n"
-#: cmdline/apt-get.cc:1115
+#: cmdline/apt-get.cc:1111
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Balík %s nie je nainštalovaný, nedá sa teda odstrániť\n"
-#: cmdline/apt-get.cc:1126
+#: cmdline/apt-get.cc:1122
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Balík %s je virtuálny balík poskytovaný balíkmi:\n"
-#: cmdline/apt-get.cc:1138
+#: cmdline/apt-get.cc:1134
msgid " [Installed]"
msgstr "[Inštalovaný]"
-#: cmdline/apt-get.cc:1143
+#: cmdline/apt-get.cc:1139
msgid "You should explicitly select one to install."
msgstr "Mali by ste explicitne vybrať jeden na inštaláciu."
-#: cmdline/apt-get.cc:1148
+#: cmdline/apt-get.cc:1144
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -956,86 +954,75 @@ msgstr ""
"Balík %s nie je dostupný, ale odkazuje naň iný balík. Možno to znamená,\n"
"že balík chýba, bol zrušený alebo je dostupný iba z iného zdroja\n"
-#: cmdline/apt-get.cc:1167
+#: cmdline/apt-get.cc:1163
msgid "However the following packages replace it:"
msgstr "Avšak nahrádzajú ho nasledovné balíky:"
-#: cmdline/apt-get.cc:1170
+#: cmdline/apt-get.cc:1166
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Balík %s nemá kandidáta na inštaláciu"
-#: cmdline/apt-get.cc:1190
+#: cmdline/apt-get.cc:1186
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Nie je možná reinštalácia %s, pretože sa nedá stiahnuť.\n"
-#: cmdline/apt-get.cc:1198
+#: cmdline/apt-get.cc:1194
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s je už najnovšej verzie.\n"
-#: cmdline/apt-get.cc:1227
+#: cmdline/apt-get.cc:1223
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Nebolo nájdené vydanie „%s“ pre „%s“"
-#: cmdline/apt-get.cc:1229
+#: cmdline/apt-get.cc:1225
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Nebola nájdená verzia „%s“ pre „%s“"
-#: cmdline/apt-get.cc:1235
+#: cmdline/apt-get.cc:1231
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Zvolená verzia %s (%s) pre %s\n"
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1307
+#: cmdline/apt-get.cc:1348
#, c-format
-msgid "Ignore unavailable target release '%s' of package '%s'"
-msgstr ""
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr "Zdrojový balík „%s“ neexistuje, namiesto neho sa použije „%s“\n"
-#: cmdline/apt-get.cc:1332
-#, fuzzy, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Nedá sa vyhodnotiť zoznam zdrojových balíkov %s"
-
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1385
msgid "The update command takes no arguments"
msgstr "Príkaz update neprijíma žiadne argumenty"
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1398
msgid "Unable to lock the list directory"
msgstr "Adresár zoznamov sa nedá zamknúť"
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1454
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Nemajú sa odstraňovať veci, nespustí sa AutoRemover"
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1503
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr ""
"Nasledovné balíky boli nainštalované automaticky a už viac nie sú potrebné:"
-#: cmdline/apt-get.cc:1503
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:1505
+#, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr ""
-"Nasledovné balíky boli nainštalované automaticky a už viac nie sú potrebné:"
+"%lu balíkov bolo nainštalovaných automaticky a už viac nie sú potrebné.\n"
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1506
msgid "Use 'apt-get autoremove' to remove them."
msgstr "Na ich odstránenie použite „apt-get autoremove“."
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1511
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1053,43 +1040,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804
msgid "The following information may help to resolve the situation:"
msgstr "Nasledovné informácie vám možno pomôžu vyriešiť túto situáciu:"
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1518
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Vnútorná chyba, AutoRemover niečo pokazil"
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1537
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Vnútorná chyba, AllUpgrade pokazil veci"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1592
#, c-format
msgid "Couldn't find task %s"
msgstr "Nebolo možné nájsť úlohu %s"
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743
#, c-format
msgid "Couldn't find package %s"
msgstr "Balík %s sa nedá nájsť"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1730
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Poznámka: vyberá sa %s pre regulárny výraz „%s“\n"
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1761
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s je nastavený na manuálnu inštaláciu.\n"
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1774
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Na opravu nasledovných môžete spustiť „apt-get -f install“:"
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1777
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1097,7 +1084,7 @@ msgstr ""
"Nesplnené závislosti. Skúste spustiť „apt-get -f install“ bez balíkov (alebo "
"navrhnite riešenie)."
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1789
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"
@@ -1109,124 +1096,124 @@ msgstr ""
"požadované balíky ešte neboli vytvorené alebo presunuté z fronty\n"
"Novoprichádzajúcich (Incoming) balíkov."
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1807
msgid "Broken packages"
msgstr "Poškodené balíky"
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1836
msgid "The following extra packages will be installed:"
msgstr "Nainštalujú sa nasledovné extra balíky:"
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1925
msgid "Suggested packages:"
msgstr "Navrhované balíky:"
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1926
msgid "Recommended packages:"
msgstr "Odporúčané balíky:"
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1955
msgid "Calculating upgrade... "
msgstr "Prepočítava sa aktualizácia... "
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1958 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "Chyba"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1963
msgid "Done"
msgstr "Hotovo"
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038
msgid "Internal error, problem resolver broke stuff"
msgstr "Vnútorná chyba, „problem resolver“ niečo pokazil"
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2138
msgid "Must specify at least one package to fetch source for"
msgstr "Musíte zadať aspoň jeden balík, pre ktorý sa stiahnu zdrojové texty"
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Nedá sa nájsť zdrojový balík pre %s"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2217
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Preskakuje sa už stiahnutý súbor „%s“\n"
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2248
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Na %s nemáte dostatok voľného miesta"
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2254
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Je potrebné stiahnuť %sB/%sB zdrojových archívov.\n"
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2257
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Je potrebné stiahnuť %sB zdrojových archívov.\n"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2263
#, c-format
msgid "Fetch source %s\n"
msgstr "Stiahnuť zdroj %s\n"
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2294
msgid "Failed to fetch some archives."
msgstr "Zlyhalo stiahnutie niektorých archívov."
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2322
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Preskakuje sa rozbalenie už rozbaleného zdroja v %s\n"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2334
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Príkaz na rozbalenie „%s“ zlyhal.\n"
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2335
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Skontrolujte, či je nainštalovaný balík „dpkg-dev“.\n"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2352
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Príkaz na zostavenie „%s“ zlyhal.\n"
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2371
msgid "Child process failed"
msgstr "Proces potomka zlyhal"
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2387
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Musíte zadať aspoň jeden balík, pre ktorý sa budú overovať závislosti na "
"zostavenie"
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2415
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Nedajú sa získať závislosti na zostavenie %s"
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2435
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nemá žiadne závislosti na zostavenie.\n"
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2487
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%s závislosť pre %s sa nemôže splniť, pretože sa nedá nájsť balík %s"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2540
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1235,31 +1222,31 @@ msgstr ""
"%s závislosť pre %s sa nedá splniť, pretože sa nedá nájsť verzia balíka %s, "
"ktorá zodpovedá požiadavke na verziu"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2576
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Zlyhalo splnenie %s závislosti pre %s: Inštalovaný balík %s je príliš nový"
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2603
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Zlyhalo splnenie %s závislosti pre %s: %s"
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2619
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Závislosti na zostavenie %s sa nedajú splniť."
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2624
msgid "Failed to process build dependencies"
msgstr "Spracovanie závislostí na zostavenie zlyhalo"
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2656
msgid "Supported modules:"
msgstr "Podporované moduly:"
-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:2697
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1343,7 +1330,7 @@ msgstr ""
"a apt.conf(5).\n"
" Tento APT má schopnosti posvätnej kravy.\n"
-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:2864
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1434,14 +1421,13 @@ msgid "Do you want to erase any previously downloaded .deb files?"
msgstr "Chcete odstrániť všetky doteraz stiahnuté .deb súbory?"
#: dselect/install:101
-#, fuzzy
msgid "Some errors occurred while unpacking. Packages that were installed"
-msgstr "Pri rozbaľovaní došlo k nejakým chybám. Teraz sa nastavia"
+msgstr ""
+"Pri rozbaľovaní došlo k nejakým chybám. Balíky, ktoré boli nainštalované"
#: dselect/install:102
-#, fuzzy
msgid "will be configured. This may result in duplicate errors"
-msgstr "balíky, ktoré sa nainštalovali. Môže to spôsobiť chybové správy"
+msgstr "budú nakonfigurované. Môže to spôsobiť opakované chybové správy"
#: dselect/install:103
msgid "or errors caused by missing dependencies. This is OK, only the errors"
@@ -1487,9 +1473,9 @@ msgid "Error reading archive member header"
msgstr "Chyba pri čítaní záhlavia prvku archívu"
#: apt-inst/contrib/arfile.cc:90
-#, fuzzy, c-format
+#, c-format
msgid "Invalid archive member header %s"
-msgstr "Neplatné záhlavie prvku archívu"
+msgstr "Neplatná hlavička prvku archívu %s"
#: apt-inst/contrib/arfile.cc:102
msgid "Invalid archive member header"
@@ -1596,7 +1582,7 @@ msgstr "Súbor %s/%s prepisuje ten z balíka %s"
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
@@ -1763,11 +1749,11 @@ msgid "File not found"
msgstr "Súbor sa nenašiel"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
msgstr "Vyhodnotenie zlyhalo"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
msgid "Failed to set modification time"
msgstr "Zlyhalo nastavenie času zmeny"
@@ -1776,34 +1762,34 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr "Neplatné URI, lokálne URI nesmie začínať s //"
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr "Prihlasovanie"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr "Nedá sa zistiť názov druhej strany"
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr "Nedá sa zistiť lokálny názov"
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
msgstr "Server zamietol naše spojenie s chybou: %s"
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr "Zlyhalo zadanie používateľa, server odpovedal: %s"
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr "Zlyhalo zadanie hesla, server odpovedal: %s"
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
@@ -1811,114 +1797,114 @@ msgstr ""
"Bol zadaný proxy server, ale nie prihlasovací skript. Acquire::ftp::"
"ProxyLogin je prázdny."
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr "Príkaz „%s“ prihlasovacieho skriptu zlyhal, server odpovedal: %s"
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "Zlyhalo zadanie typu, server odpovedal: %s"
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "Uplynul čas spojenia"
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr "Server ukončil spojenie"
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr "Chyba pri čítaní"
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr "Odpoveď preplnila zásobník."
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr "Narušenie protokolu"
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
msgstr "Chyba pri zápise"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr "Nedá sa vytvoriť socket"
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr "Nedá sa pripojiť dátový socket, uplynul čas spojenia"
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr "Nedá sa pripojiť pasívny socket."
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
msgstr "getaddrinfo nezískal počúvajúci socket"
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr "Nedá sa nadviazať socket"
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr "Na sockete sa nedá počúvať"
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr "Názov socketu sa nedá zistiť"
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr "Príkaz PORT sa nedá odoslať"
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "Neznáma rodina adries %u (AF_*)"
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "Zlyhalo zadanie EPRT, server odpovedal: %s"
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr "Uplynulo spojenie dátového socketu"
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr "Spojenie sa nedá prijať"
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problém s hašovaním súboru"
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "Súbor sa nedá stiahnuť, server odpovedal „%s“"
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr "Uplynula doba dátového socketu"
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "Prenos dát zlyhal, server odpovedal „%s“"
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr "Dotaz"
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr "Nedá sa vyvolať "
@@ -1970,14 +1956,14 @@ msgid "Temporary failure resolving '%s'"
msgstr "Dočasné zlyhanie pri preklade „%s“"
#: methods/connect.cc:193
-#, fuzzy, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
+#, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i)"
msgstr "Niečo veľmi zlé sa prihodilo pri preklade „%s:%s“ (%i)"
#: methods/connect.cc:240
-#, fuzzy, c-format
+#, c-format
msgid "Unable to connect to %s:%s:"
-msgstr "Nedá sa pripojiť k %s %s:"
+msgstr "Nedá sa pripojiť k %s:%s:"
#: methods/gpgv.cc:71
#, c-format
@@ -2030,80 +2016,80 @@ msgstr "Nedá sa otvoriť rúra pre %s"
msgid "Read error from %s process"
msgstr "Chyba pri čítaní z procesu %s"
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr "Čaká sa na hlavičky"
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Získal sa jeden riadok hlavičky cez %u znakov"
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
msgstr "Chybná hlavička"
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
msgstr "HTTP server poslal neplatnú hlavičku odpovede"
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP server poslal neplatnú hlavičku Content-Length"
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP server poslal neplatnú hlavičku Content-Range"
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr "Tento HTTP server má poškodenú podporu rozsahov"
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr "Neznámy formát dátumu"
-#: methods/http.cc:788
+#: methods/http.cc:790
msgid "Select failed"
msgstr "Výber zlyhal"
-#: methods/http.cc:793
+#: methods/http.cc:795
msgid "Connection timed out"
msgstr "Uplynul čas spojenia"
-#: methods/http.cc:816
+#: methods/http.cc:818
msgid "Error writing to output file"
msgstr "Chyba zápisu do výstupného súboru"
-#: methods/http.cc:847
+#: methods/http.cc:849
msgid "Error writing to file"
msgstr "Chyba zápisu do súboru"
-#: methods/http.cc:875
+#: methods/http.cc:877
msgid "Error writing to the file"
msgstr "Chyba zápisu do tohto súboru"
-#: methods/http.cc:889
+#: methods/http.cc:891
msgid "Error reading from server. Remote end closed connection"
msgstr "Chyba pri čítaní zo servera. Druhá strana ukončila spojenie"
-#: methods/http.cc:891
+#: methods/http.cc:893
msgid "Error reading from server"
msgstr "Chyba pri čítaní zo servera"
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
msgid "Failed to truncate file"
msgstr "Nepodarilo sa skrátiť súbor"
-#: methods/http.cc:1147
+#: methods/http.cc:1149
msgid "Bad header data"
msgstr "Zlé dátové záhlavie"
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1166 methods/http.cc:1221
msgid "Connection failed"
msgstr "Spojenie zlyhalo"
-#: methods/http.cc:1311
+#: methods/http.cc:1313
msgid "Internal error"
msgstr "Vnútorná chyba"
@@ -2111,12 +2097,12 @@ msgstr "Vnútorná chyba"
msgid "Can't mmap an empty file"
msgstr "Nedá sa vykonať mmap prázdneho súboru"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Nedá sa urobiť mmap %lu bajtov"
-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:234
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2125,13 +2111,6 @@ msgstr ""
"Nedostatok miesta pre dynamický MMap. Prosím, zväčšite veľkosť APT::Cache-"
"Limit. Aktuálna hodnota: %lu. (man 5 apt.conf)"
-#: apt-pkg/contrib/mmap.cc:347
-#, c-format
-msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
-msgstr ""
-
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
@@ -2314,9 +2293,9 @@ msgid "Sub-process %s received a segmentation fault."
msgstr "Podproces %s obdržal chybu segmentácie."
#: apt-pkg/contrib/fileutl.cc:458
-#, fuzzy, c-format
+#, c-format
msgid "Sub-process %s received signal %u."
-msgstr "Podproces %s obdržal chybu segmentácie."
+msgstr "Podproces %s dostal signál %u."
#: apt-pkg/contrib/fileutl.cc:462
#, c-format
@@ -2518,14 +2497,7 @@ msgstr "Typ „%s“ je neznámy na riadku %u v zozname zdrojov %s"
msgid "Malformed line %u in source list %s (vendor id)"
msgstr "Skomolený riadok %u v zozname zdrojov %s (id výrobcu)"
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
-#, 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:437
+#: apt-pkg/packagemanager.cc:439
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2536,13 +2508,6 @@ msgstr ""
"kvôli slučke v Conflicts/Pre-Depends. Často je to nevhodné, ale ak to chcete "
"naozaj urobiť, aktivujte možnosť APT::Force-LoopBreak."
-#: apt-pkg/packagemanager.cc:475
-#, c-format
-msgid ""
-"Could not perform immediate configuration on already unpacked '%s'.Please "
-"see man 5 apt.conf under APT::Immediate-Configure for details."
-msgstr ""
-
#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
@@ -2611,12 +2576,12 @@ msgstr "Spôsob %s nebol správne spustený"
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr "Vložte disk nazvaný „%s“ do mechaniky „%s“ a stlačte Enter."
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Systém balíkov „%s“ nie je podporovaný"
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr "Nedá sa určiť vhodný typ systému balíkov"
@@ -2638,9 +2603,9 @@ msgid "You may want to run apt-get update to correct these problems"
msgstr "Na opravu týchto problémov môžete skúsiť spustiť apt-get update"
#: apt-pkg/policy.cc:347
-#, fuzzy, c-format
+#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "Neplatný záznam v súbore „preferences“, žiadne záhlavie balíka"
+msgstr "Neplatný záznam v súbore nastavení %s, chýba hlavička Package"
#: apt-pkg/policy.cc:369
#, c-format
@@ -2751,19 +2716,19 @@ msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäti"
msgid "rename failed, %s (%s -> %s)."
msgstr "premenovanie zlyhalo, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:395
msgid "MD5Sum mismatch"
msgstr "Nezhoda kontrolných MD5 súčtov"
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
msgid "Hash Sum mismatch"
msgstr "Nezhoda kontrolných haš súčtov"
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1106
msgid "There is no public key available for the following key IDs:\n"
msgstr "Nie sú dostupné žiadne verejné kľúče ku kľúčom s nasledovnými ID:\n"
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1216
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2772,7 +2737,7 @@ msgstr ""
"Nedá sa nájsť súbor s balíkom %s. To by mohlo znamenať, že tento balík je "
"potrebné opraviť manuálne (kvôli chýbajúcej architektúre)."
-#: apt-pkg/acquire-item.cc:1283
+#: apt-pkg/acquire-item.cc:1275
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2781,30 +2746,30 @@ msgstr ""
"Nedá sa nájsť súbor s balíkom %s. Asi budete musieť opraviť tento balík "
"manuálne."
-#: apt-pkg/acquire-item.cc:1324
+#: apt-pkg/acquire-item.cc:1316
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "Indexové súbory balíka sú narušené. Chýba pole Filename: pre balík %s."
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:1403
msgid "Size mismatch"
msgstr "Veľkosti sa nezhodujú"
#: apt-pkg/indexrecords.cc:40
-#, fuzzy, c-format
+#, c-format
msgid "Unable to parse Release file %s"
-msgstr "Súbor %s sa nedá spracovať (1)"
+msgstr "Nedá spracovať súbor Release %s"
#: apt-pkg/indexrecords.cc:47
-#, fuzzy, c-format
+#, c-format
msgid "No sections in Release file %s"
-msgstr "Poznámka: %s sa vyberá namiesto %s\n"
+msgstr "Žiadne sekcie v Release súbore %s"
#: apt-pkg/indexrecords.cc:81
#, c-format
msgid "No Hash entry in Release file %s"
-msgstr ""
+msgstr "Chýba položka Hash v súbore Release %s"
#: apt-pkg/vendorlist.cc:66
#, c-format
@@ -2869,6 +2834,8 @@ msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
msgstr ""
+"Nepodarilo sa nájsť žiadne súbory balíkov, možno toto nie je disk s Debianom "
+"alebo je pre nesprávnu architektúru?"
#: apt-pkg/cdrom.cc:710
#, c-format
@@ -2920,127 +2887,133 @@ msgstr "Zapísaných %i záznamov s %i chybnými súbormi\n"
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Zapísaných %i záznamov s %i chýbajúcimi a %i chybnými súbormi\n"
+#: apt-pkg/indexcopy.cc:530
+#, fuzzy, c-format
+msgid "Skipping nonexistent file %s"
+msgstr "Otvára sa konfiguračný súbor %s"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, fuzzy, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Nezhoda kontrolných haš súčtov"
+
#: apt-pkg/deb/dpkgpm.cc:49
#, c-format
msgid "Installing %s"
msgstr "Inštaluje sa %s"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Configuring %s"
msgstr "Nastavuje sa %s"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removing %s"
msgstr "Odstraňuje sa %s"
#: apt-pkg/deb/dpkgpm.cc:52
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "Balík „%s“ je úplne odstránený"
+
+#: apt-pkg/deb/dpkgpm.cc:53
#, c-format
msgid "Running post-installation trigger %s"
msgstr "Vykonáva sa spúšťač post-installation %s"
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, c-format
msgid "Directory '%s' missing"
msgstr "Adresár „%s“ chýba"
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Preparing %s"
msgstr "Pripravuje sa %s"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, c-format
msgid "Unpacking %s"
msgstr "Rozbaľuje sa %s"
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Preparing to configure %s"
msgstr "Pripravuje sa nastavenie %s"
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, c-format
msgid "Installed %s"
msgstr "Nainštalovaný balík %s"
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr "Pripravuje sa odstránenie %s"
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, c-format
msgid "Removed %s"
msgstr "Odstránený balík %s"
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Preparing to completely remove %s"
msgstr "Pripravuje sa úplné odstránenie %s"
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, c-format
msgid "Completely removed %s"
msgstr "Balík „%s“ je úplne odstránený"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
"Nedá sa zapísať záznam, volanie openpty() zlyhalo (/dev/pts nie je "
"pripojený?)\n"
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:908
msgid "Running dpkg"
-msgstr ""
+msgstr "Spúšťa sa dpkg"
#: apt-pkg/deb/debsystem.cc:70
#, c-format
msgid ""
"Unable to lock the administration directory (%s), is another process using "
"it?"
-msgstr ""
+msgstr "Nedá sa zamknúť adresár na správu (%s), používa ho iný proces?"
#: apt-pkg/deb/debsystem.cc:73
-#, fuzzy, c-format
+#, c-format
msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Adresár zoznamov sa nedá zamknúť"
+msgstr "Nedá sa zamknúť adresár na správu (%s), ste root?"
#: apt-pkg/deb/debsystem.cc:82
msgid ""
"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
"the problem. "
msgstr ""
+"dpkg bol prerušený, musíte ručne opraviť problém spustením „dpkg --configure "
+"-a“. "
#: apt-pkg/deb/debsystem.cc:100
msgid "Not locked"
msgstr "Nie je zamknuté"
-#: methods/rred.cc:465
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:470
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
+#: methods/rred.cc:219
+msgid "Could not patch file"
+msgstr "Nedá sa upraviť súbor"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Spojenie bolo predčasne ukončené"
-#~ msgid "No source package '%s' picking '%s' instead\n"
-#~ msgstr "Zdrojový balík „%s“ neexistuje, namiesto neho sa použije „%s“\n"
-
-#~ msgid "Could not patch file"
-#~ msgstr "Nedá sa upraviť súbor"
-
#~ msgid "%4i %s\n"
#~ msgstr "%4i %s\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 742c5cbe8..8daf9e203 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3,14 +3,15 @@
# Deng Xiyue <manphiz-guest@users.alioth.debian.org>, 2007, 2008.
# Tchaikov <tchaikov@sjtu.org>, 2005, 2007.
# Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004, 2006.
+# Aron Xu <happyaron.xu@gmail.com>, 2009.
#
msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-27 00:15+0100\n"
-"PO-Revision-Date: 2009-06-01 15:54+0800\n"
-"Last-Translator: Deng Xiyue <manphiz-guest@users.alioth.debian.org>\n"
+"POT-Creation-Date: 2009-12-10 16:49+0100\n"
+"PO-Revision-Date: 2009-12-02 01:00+0800\n"
+"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
"Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -50,7 +51,7 @@ msgstr " 混合虚拟软件包："
#: cmdline/apt-cache.cc:289
msgid " Missing: "
-msgstr " 缺漏的："
+msgstr " 缺失："
#: cmdline/apt-cache.cc:291
msgid "Total distinct versions: "
@@ -95,7 +96,7 @@ msgstr "总占用空间："
#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1221
#, c-format
msgid "Package file %s is out of sync."
-msgstr "软件包文件 %s 尚未同步(sync)。"
+msgstr "软件包文件 %s 尚未同步。"
#: cmdline/apt-cache.cc:1297
msgid "You must give exactly one pattern"
@@ -103,7 +104,7 @@ msgstr "您必须明确地给出一个表达式"
#: cmdline/apt-cache.cc:1451
msgid "No packages found"
-msgstr "没有发现吻合的软件包"
+msgstr "没有发现匹配的软件包"
#: cmdline/apt-cache.cc:1528
msgid "Package files:"
@@ -111,12 +112,12 @@ msgstr "软件包文件："
#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
msgid "Cache is out of sync, can't x-ref a package file"
-msgstr "缓存尚未同步(sync)，无法交差引证(x-ref)一个软件包文件"
+msgstr "缓存尚未同步，无法交差引证(x-ref)一个软件包文件"
#. Show any packages have explicit pins
#: cmdline/apt-cache.cc:1549
msgid "Pinned packages:"
-msgstr "被锁定(pinned)的软件包："
+msgstr "被锁定的软件包："
#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
msgid "(not found)"
@@ -134,11 +135,11 @@ msgstr "(无)"
#. Candidate Version
#: cmdline/apt-cache.cc:1589
msgid " Candidate: "
-msgstr " 候选的软件包："
+msgstr " 候选软件包："
#: cmdline/apt-cache.cc:1599
msgid " Package pin: "
-msgstr " 软件包锁(Pin)："
+msgstr " 软件包锁："
#. Show the priority tables
#: cmdline/apt-cache.cc:1608
@@ -152,10 +153,10 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
-msgstr "%s %s for %s 编译于 %s %s\n"
+msgstr "%s %s，用于 %s 构架，编译于 %s %s\n"
#: cmdline/apt-cache.cc:1725
msgid ""
@@ -196,25 +197,25 @@ msgid ""
"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgstr ""
"用法： apt-cache [选项] 命令\n"
-" apt-cache [选项] add 文件甲 [文件乙 ...]\n"
-" apt-cache [选项] showpkg 软件包甲 [软件包乙 ...]\n"
-" apt-cache [选项] showsrc 软件包甲 [软件包乙 ...]\n"
+"　　　 apt-cache [选项] add 文件1 [文件2 ...]\n"
+"　　　 apt-cache [选项] showpkg 软件包1 [软件包2 ...]\n"
+"　　　 apt-cache [选项] showsrc 软件包1 [软件包2 ...]\n"
"\n"
"apt-cache 是一个底层的工具，我们用它来操纵 APT 的二进制\n"
"缓存文件，也用来在那些文件中查询相关信息\n"
"\n"
"命令：\n"
-" add - 往源缓存加入一个软件包文件\n"
-" gencaches - 一并生成软件包和源代码包的缓存\n"
+" add - 向源缓存加入一个软件包文件\n"
+" gencaches - 同时生成软件包和源代码包的缓存\n"
" showpkg - 显示某个软件包的全面信息\n"
" showsrc - 显示源文件的各项记录\n"
-" stats - 显示一些基本的统计信息\n"
+" stats - 显示基本的统计信息\n"
" dump - 简要显示整个缓存文件的内容\n"
" dumpavail - 把所有有效的包文件列表打印到标准输出\n"
" unmet - 显示所有未满足的依赖关系\n"
" search - 根据正则表达式搜索软件包列表\n"
" show - 以便于阅读的格式介绍该软件包\n"
-" depends - 原原本本地显示该软件包的依赖信息\n"
+" depends - 显示该软件包的依赖关系信息\n"
" rdepends - 显示所有依赖于该软件包的软件包名字\n"
" pkgnames - 列出所有软件包的名字\n"
" dotty - 生成可用 GraphViz 处理的软件包关系图\n"
@@ -232,17 +233,16 @@ msgstr ""
"若要了解更多信息，您还可以查阅 apt-cache(8) 和 apt.conf(5) 参考手册。\n"
#: cmdline/apt-cdrom.cc:77
-#, fuzzy
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
-msgstr "请给这张光盘起个名字，比如说“Debian 2.1r1 Disk 1”"
+msgstr "请给这张盘片起个名字，比如“Debian 5.0.3 Disk 1”"
#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
-msgstr "请把光盘碟片插入驱动器再按回车键"
+msgstr "请把盘片插入驱动器再按回车键"
#: cmdline/apt-cdrom.cc:114
msgid "Repeat this process for the rest of the CDs in your set."
-msgstr "请对您的光盘套件中的其它光盘重复相同的操作。"
+msgstr "请对您的盘片套件中的其它盘片重复相同的操作。"
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
@@ -265,7 +265,7 @@ msgid ""
msgstr ""
"用法：apt-config [选项] 命令\n"
"\n"
-"apt-config 是一个用于读取 APT 配置文件的简单工具\n"
+"apt-config 是一个用于读取APT 配置文件的简单工具\n"
"\n"
"命令：\n"
" shell - Shell 模式\n"
@@ -312,11 +312,11 @@ msgstr "无法写入 %s"
#: cmdline/apt-extracttemplates.cc:310
msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "无法获得 debconf 的版本。您安装了 debconf 吗?"
+msgstr "无法获得 debconf 的版本。您安装了 debconf 吗？"
#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338
msgid "Package extension list is too long"
-msgstr "软件包的扩展列表超长"
+msgstr "软件包的扩展列表太长"
#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180
#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253
@@ -327,16 +327,16 @@ msgstr "处理目录 %s 时出错"
#: ftparchive/apt-ftparchive.cc:251
msgid "Source extension list is too long"
-msgstr "源扩展列表超长"
+msgstr "源扩展列表太长"
#: ftparchive/apt-ftparchive.cc:368
msgid "Error writing header to contents file"
-msgstr "将 header 写到 contents 文件时出错"
+msgstr "将头写入到目录文件时出错"
#: ftparchive/apt-ftparchive.cc:398
#, c-format
msgid "Error processing contents %s"
-msgstr "处理 Contents %s 时出错"
+msgstr "处理目录 %s 时出错"
#: ftparchive/apt-ftparchive.cc:553
msgid ""
@@ -430,38 +430,38 @@ msgstr "软件包文件组“%s”中缺少一些文件"
#: ftparchive/cachedb.cc:43
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
-msgstr "缓存数据库被损坏了，该数据库文件的文件名已改成 %s.old"
+msgstr "数据库被损坏，该数据库文件的文件名已改成 %s.old"
#: ftparchive/cachedb.cc:61
#, c-format
msgid "DB is old, attempting to upgrade %s"
-msgstr "DB 已过时，现试图进行升级 %s"
+msgstr "数据库已过期，现尝试进行升级 %s"
#: ftparchive/cachedb.cc:72
msgid ""
"DB format is invalid. If you upgraded from a older version of apt, please "
"remove and re-create the database."
msgstr ""
-"DB 格式是无效的。如果你是从一个老版本的 apt 升级而来，请删除数据库并重建它。"
+"数据库格式无效。如果您是从一个老版本的 apt 升级而来，请删除数据库并重建它。"
#: ftparchive/cachedb.cc:77
#, c-format
msgid "Unable to open DB file %s: %s"
-msgstr "无法打开 DB 文件 %s：%s"
+msgstr "无法打开数据库文件 %s：%s"
#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190
#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117
#, c-format
msgid "Failed to stat %s"
-msgstr "无法读取 %s 的状态"
+msgstr "无法获得 %s 的状态"
#: ftparchive/cachedb.cc:238
msgid "Archive has no control record"
-msgstr "存档没有包含控制字段"
+msgstr "归档文件没有包含控制字段"
#: ftparchive/cachedb.cc:444
msgid "Unable to get a cursor"
-msgstr "无法获得游标(cursor)"
+msgstr "无法获得游标"
#: ftparchive/writer.cc:76
#, c-format
@@ -471,7 +471,7 @@ msgstr "警告：无法读取目录 %s\n"
#: ftparchive/writer.cc:81
#, c-format
msgid "W: Unable to stat %s\n"
-msgstr "警告：无法对 %s 进行统计\n"
+msgstr "警告：无法获得 %s 的状态\n"
#: ftparchive/writer.cc:132
msgid "E: "
@@ -488,7 +488,7 @@ msgstr "错误：处理文件时出错 "
#: ftparchive/writer.cc:158 ftparchive/writer.cc:188
#, c-format
msgid "Failed to resolve %s"
-msgstr "无法解析路径 %s"
+msgstr "无法解析 %s"
#: ftparchive/writer.cc:170
msgid "Tree walking failed"
@@ -512,7 +512,7 @@ msgstr "无法读取符号链接 %s"
#: ftparchive/writer.cc:266
#, c-format
msgid "Failed to unlink %s"
-msgstr "无法 unlink %s"
+msgstr "无法使用 unlink 删除 %s"
#: ftparchive/writer.cc:273
#, c-format
@@ -524,26 +524,26 @@ msgstr "*** 无法将 %s 链接到 %s"
msgid " DeLink limit of %sB hit.\n"
msgstr " 达到了 DeLink 的上限 %sB。\n"
-#: ftparchive/writer.cc:388
+#: ftparchive/writer.cc:387
msgid "Archive had no package field"
-msgstr "存档没有包含软件包(package)字段"
+msgstr "归档文件没有包含 package 字段"
-#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
+#: ftparchive/writer.cc:395 ftparchive/writer.cc:610
#, c-format
msgid " %s has no override entry\n"
msgstr " %s 中没有 override 项\n"
-#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
+#: ftparchive/writer.cc:440 ftparchive/writer.cc:698
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s 的维护者 %s 并非 %s\n"
-#: ftparchive/writer.cc:637
+#: ftparchive/writer.cc:620
#, c-format
msgid " %s has no source override entry\n"
msgstr " %s 没有源代码的 override 项\n"
-#: ftparchive/writer.cc:641
+#: ftparchive/writer.cc:624
#, c-format
msgid " %s has no binary override entry either\n"
msgstr " %s 中没有二进制文件的 override 项\n"
@@ -555,7 +555,7 @@ msgstr "内部错误，无法定位包内文件 %s"
#: ftparchive/contents.cc:358 ftparchive/contents.cc:389
msgid "realloc - Failed to allocate memory"
-msgstr "realloc - 无法再分配内存"
+msgstr "realloc - 分配内存失败"
#: ftparchive/override.cc:34 ftparchive/override.cc:142
#, c-format
@@ -611,11 +611,11 @@ msgstr "压缩子进程"
#: ftparchive/multicompress.cc:235
#, c-format
msgid "Internal error, failed to create %s"
-msgstr "内部错误，无法建立 %s"
+msgstr "内部错误，无法创建 %s"
#: ftparchive/multicompress.cc:286
msgid "Failed to create subprocess IPC"
-msgstr "无法建立子进程的 IPC 管道"
+msgstr "无法创建子进程的 IPC 管道"
#: ftparchive/multicompress.cc:321
msgid "Failed to exec compressor "
@@ -631,12 +631,12 @@ msgstr "无法对子进程或文件进行读写"
#: ftparchive/multicompress.cc:455
msgid "Failed to read while computing MD5"
-msgstr "在计算 MD5 校验和时，无法读取数据"
+msgstr "在计算 MD5 校验和时无法读取数据"
#: ftparchive/multicompress.cc:472
#, c-format
msgid "Problem unlinking %s"
-msgstr "在 unlink %s 时出错"
+msgstr "在使用 unlink 删除 %s 时出错"
#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185
#, c-format
@@ -647,19 +647,19 @@ msgstr "无法将 %s 重命名为 %s"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720
#, c-format
msgid "Regex compilation error - %s"
msgstr "编译正则表达式时出错 - %s"
#: cmdline/apt-get.cc:244
msgid "The following packages have unmet dependencies:"
-msgstr "下列的软件包有不能满足的依赖关系："
+msgstr "下列软件包有未满足的依赖关系："
#: cmdline/apt-get.cc:334
#, c-format
msgid "but %s is installed"
-msgstr "但是 %s 已经安装了"
+msgstr "但是 %s 已经安装"
#: cmdline/apt-get.cc:336
#, c-format
@@ -668,11 +668,11 @@ msgstr "但是 %s 正要被安装"
#: cmdline/apt-get.cc:343
msgid "but it is not installable"
-msgstr "但却无法安装它"
+msgstr "但无法安装它"
#: cmdline/apt-get.cc:345
msgid "but it is a virtual package"
-msgstr "但是它只是个虚拟软件包"
+msgstr "但是它是虚拟软件包"
#: cmdline/apt-get.cc:348
msgid "but it is not installed"
@@ -696,11 +696,11 @@ msgstr "下列软件包将被【卸载】："
#: cmdline/apt-get.cc:430
msgid "The following packages have been kept back:"
-msgstr "下列的软件包的版本将保持不变："
+msgstr "下列软件包的版本将保持不变："
#: cmdline/apt-get.cc:451
msgid "The following packages will be upgraded:"
-msgstr "下列的软件包将被升级："
+msgstr "下列软件包将被升级："
#: cmdline/apt-get.cc:472
msgid "The following packages will be DOWNGRADED:"
@@ -720,18 +720,18 @@ msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
-"【警告】：下列的基础软件包将被卸载。\n"
+"【警告】：下列基础软件包将被卸载。\n"
"请勿尝试，除非您确实知道您在做什么！"
#: cmdline/apt-get.cc:584
#, c-format
msgid "%lu upgraded, %lu newly installed, "
-msgstr "共升级了 %lu 个软件包，新安装了 %lu 个软件包，"
+msgstr "升级了 %lu 个软件包，新安装了 %lu 个软件包，"
#: cmdline/apt-get.cc:588
#, c-format
msgid "%lu reinstalled, "
-msgstr "共重新安装了 %lu 个软件包，"
+msgstr "重新安装了 %lu 个软件包，"
#: cmdline/apt-get.cc:590
#, c-format
@@ -741,7 +741,7 @@ msgstr "降级了 %lu 个软件包，"
#: cmdline/apt-get.cc:592
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "要卸载 %lu 个软件包，有 %lu 个软件未被升级。\n"
+msgstr "要卸载 %lu 个软件包，有 %lu 个软件包未被升级。\n"
#: cmdline/apt-get.cc:596
#, c-format
@@ -770,7 +770,7 @@ msgstr " 完成"
#: cmdline/apt-get.cc:684
msgid "You might want to run `apt-get -f install' to correct these."
-msgstr "您也许需要运行“apt-get -f install”来纠正上面的错误。"
+msgstr "您也许需要运行“apt-get -f install”来修正上面的错误。"
#: cmdline/apt-get.cc:687
msgid "Unmet dependencies. Try using -f."
@@ -778,7 +778,7 @@ msgstr "不能满足依赖关系。不妨试一下 -f 选项。"
#: cmdline/apt-get.cc:712
msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "【警告】：下列的软件包不能通过验证！"
+msgstr "【警告】：下列软件包不能通过验证！"
#: cmdline/apt-get.cc:716
msgid "Authentication warning overridden.\n"
@@ -786,13 +786,13 @@ msgstr "忽略了认证警告。\n"
#: cmdline/apt-get.cc:723
msgid "Install these packages without verification [y/N]? "
-msgstr "不经验证就安装这些软件包么？[y/N] "
+msgstr "不经验证就安装这些软件包吗？[y/N] "
#: cmdline/apt-get.cc:725
msgid "Some packages could not be authenticated"
msgstr "有些软件包不能通过验证"
-#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886
msgid "There are problems and -y was used without --force-yes"
msgstr "碰到了一些问题，您使用了 -y 选项，但是没有用 --force-yes"
@@ -808,18 +808,18 @@ msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止
msgid "Internal error, Ordering didn't finish"
msgstr "内部错误，Ordering 未能完成"
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095
msgid "Unable to lock the download directory"
-msgstr "无法对下载目录加锁"
+msgstr "无法锁定下载目录"
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
-msgstr "无法读取安装源列表。"
+msgstr "无法读取源列表。"
#: cmdline/apt-get.cc:836
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
-msgstr "怪了……文件大小不符，发信给 apt@packages.debian.org 吧"
+msgstr "怪了……文件大小不符，请发信给 apt@packages.debian.org 吧"
#: cmdline/apt-get.cc:841
#, c-format
@@ -841,26 +841,25 @@ msgstr "解压缩后会消耗掉 %sB 的额外空间。\n"
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "解压缩后将会空出 %sB 的空间。\n"
-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
-#: cmdline/apt-get.cc:2240
+#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238
#, c-format
msgid "Couldn't determine free space in %s"
-msgstr "无法获知您在 %s 上的空余空间"
+msgstr "无法获知您在 %s 上的可用空间"
-#: cmdline/apt-get.cc:880
+#: cmdline/apt-get.cc:876
#, c-format
msgid "You don't have enough free space in %s."
-msgstr "您在 %s 中没有足够的空余空间。"
+msgstr "您在 %s 上没有足够的可用空间。"
-#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912
msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "虽然您指定了 Trivial Only，但这不是个日常(trivial)操作。"
+msgstr "虽然您指定了仅执行常规操作，但这不是个常规操作。"
-#: cmdline/apt-get.cc:898
+#: cmdline/apt-get.cc:894
msgid "Yes, do as I say!"
-msgstr "Yes, do as I say!"
+msgstr "是，按我说的做！"
-#: cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:896
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -871,28 +870,28 @@ msgstr ""
"若还想继续的话，就输入下面的短句“%s”\n"
" ?] "
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925
+#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921
msgid "Abort."
msgstr "中止执行。"
-#: cmdline/apt-get.cc:921
+#: cmdline/apt-get.cc:917
msgid "Do you want to continue [Y/n]? "
msgstr "您希望继续执行吗？[Y/n]"
-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "无法下载 %s %s\n"
-#: cmdline/apt-get.cc:1011
+#: cmdline/apt-get.cc:1007
msgid "Some files failed to download"
-msgstr "有一些文件下载失败"
+msgstr "有一些文件无法下载"
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298
msgid "Download complete and in download only mode"
msgstr "下载完毕，目前是“仅下载”模式"
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1014
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -900,47 +899,47 @@ msgstr ""
"有几个软件包无法下载，您可以运行 apt-get update 或者加上 --fix-missing 的选项"
"再试试？"
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1018
msgid "--fix-missing and media swapping is not currently supported"
-msgstr "目前还不支持 --fix-missing 和介质交换(media swapping)"
+msgstr "目前还不支持 --fix-missing 和介质交换"
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1023
msgid "Unable to correct missing packages."
msgstr "无法更正缺少的软件包。"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1024
msgid "Aborting install."
-msgstr "放弃安装。"
+msgstr "中止安装。"
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1082
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "注意，选取 %s 而非 %s\n"
-#: cmdline/apt-get.cc:1097
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "忽略了 %s，它已经被安装而且没有指定要升级。\n"
-#: cmdline/apt-get.cc:1115
+#: cmdline/apt-get.cc:1111
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "软件包 %s 还未安装，因而不会被卸载\n"
-#: cmdline/apt-get.cc:1126
+#: cmdline/apt-get.cc:1122
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "软件包 %s 是一个由下面的软件包提供的虚拟软件包：\n"
-#: cmdline/apt-get.cc:1138
+#: cmdline/apt-get.cc:1134
msgid " [Installed]"
msgstr " [已安装]"
-#: cmdline/apt-get.cc:1143
+#: cmdline/apt-get.cc:1139
msgid "You should explicitly select one to install."
msgstr "请您明确地选择一个来进行安装。"
-#: cmdline/apt-get.cc:1148
+#: cmdline/apt-get.cc:1144
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -951,88 +950,77 @@ msgstr ""
"这可能意味着这个缺失的软件包可能已被废弃，\n"
"或者只能在其他发布源中找到\n"
-#: cmdline/apt-get.cc:1167
+#: cmdline/apt-get.cc:1163
msgid "However the following packages replace it:"
-msgstr "可是下列的软件包取代了它："
+msgstr "可是下列软件包取代了它："
-#: cmdline/apt-get.cc:1170
+#: cmdline/apt-get.cc:1166
#, c-format
msgid "Package %s has no installation candidate"
msgstr "软件包 %s 还没有可供安装的候选者"
-#: cmdline/apt-get.cc:1190
+#: cmdline/apt-get.cc:1186
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "不能重新安装 %s，因为无法下载它。\n"
-#: cmdline/apt-get.cc:1198
+#: cmdline/apt-get.cc:1194
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s 已经是最新的版本了。\n"
-#: cmdline/apt-get.cc:1227
+#: cmdline/apt-get.cc:1223
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "未找到“%2$s”的“%1$s”发布版本"
-#: cmdline/apt-get.cc:1229
+#: cmdline/apt-get.cc:1225
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "未找到“%2$s”的“%1$s”版本"
-#: cmdline/apt-get.cc:1235
+#: cmdline/apt-get.cc:1231
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "选定了版本为 %s (%s) 的 %s\n"
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#: cmdline/apt-get.cc:1348
#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1307
-#, c-format
-msgid "Ignore unavailable target release '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1332
-#, fuzzy, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "无法获取源软件包列表 %s 的状态"
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr "没有源代码包“%s”，使用“%s”代替\n"
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1385
msgid "The update command takes no arguments"
-msgstr " update 命令是不需任何参数的"
+msgstr " update 命令不需要参数"
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1398
msgid "Unable to lock the list directory"
msgstr "无法对状态列表目录加锁"
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1454
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "我们不应该进行删除，无法启动自动删除器"
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1503
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
-msgstr "下列软件包是自动安装的并且现在不再被使用了："
+msgstr "下列软件包是自动安装的并且现在不需要了："
-#: cmdline/apt-get.cc:1503
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:1505
+#, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
-msgstr "下列软件包是自动安装的并且现在不再被使用了："
+msgstr "%lu 个自动安装的的软件包现在不需要了\n"
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1506
msgid "Use 'apt-get autoremove' to remove them."
msgstr "使用'apt-get autoremove'来删除它们"
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1511
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
-msgstr "似乎自动删除器毁掉了一些软件，这不应该发生。请向 apt 提交错误报告。"
+msgstr "似乎自动删除工具损坏了一些软件，这不应该发生。请向 apt 提交错误报告。"
#.
#. if (Packages == 1)
@@ -1044,43 +1032,43 @@ msgstr "似乎自动删除器毁掉了一些软件，这不应该发生。请向
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804
msgid "The following information may help to resolve the situation:"
-msgstr "下列的信息可能会对解决问题有所帮助："
+msgstr "下列信息可能会对解决问题有所帮助："
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1518
msgid "Internal Error, AutoRemover broke stuff"
-msgstr "内部错误，自动删除器坏事了"
+msgstr "内部错误，自动删除工具坏事了"
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1537
msgid "Internal error, AllUpgrade broke stuff"
-msgstr "内部错误，全部升级坏事了"
+msgstr "内部错误，全部升级工具坏事了"
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1592
#, c-format
msgid "Couldn't find task %s"
msgstr "无法找到任务 %s"
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743
#, c-format
msgid "Couldn't find package %s"
msgstr "无法找到软件包 %s"
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1730
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "注意，根据正则表达式“%2$s”选中了 %1$s\n"
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1761
#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s 被设置为手动安装。\n"
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1774
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "您可能需要运行“apt-get -f install”来纠正下列错误："
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1777
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1088,133 +1076,133 @@ msgstr ""
"有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可"
"以指定一个解决办法)。"
-#: cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1789
msgid ""
"Some packages could not be installed. This may mean that you have\n"
"requested an impossible situation or if you are using the unstable\n"
"distribution that some required packages have not yet been created\n"
"or been moved out of Incoming."
msgstr ""
-"有一些软件包无法被安装。如果您用的是不稳定(unstable)发行版，这也许是\n"
+"有一些软件包无法被安装。如果您用的是 unstable 发行版，这也许是\n"
"因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
-"包尚未被创建或是它们还在新到(incoming)目录中。"
+"包尚未被创建或是它们已被从新到(Incoming)目录移出。"
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1807
msgid "Broken packages"
-msgstr "无法安装的软件包"
+msgstr "破损的软件包"
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1836
msgid "The following extra packages will be installed:"
msgstr "将会安装下列额外的软件包："
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1925
msgid "Suggested packages:"
msgstr "建议安装的软件包："
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1926
msgid "Recommended packages:"
msgstr "推荐安装的软件包："
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1955
msgid "Calculating upgrade... "
-msgstr "正在筹划升级... "
+msgstr "正在对升级进行计算... "
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1958 methods/ftp.cc:708 methods/connect.cc:112
msgid "Failed"
msgstr "失败"
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1963
msgid "Done"
msgstr "完成"
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038
msgid "Internal error, problem resolver broke stuff"
-msgstr "内部错误，问题解决器坏事了"
+msgstr "内部错误，问题解决工具坏事了"
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2138
msgid "Must specify at least one package to fetch source for"
msgstr "要下载源代码，必须指定至少一个对应的软件包"
-#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410
#, c-format
msgid "Unable to find a source package for %s"
msgstr "无法找到与 %s 对应的源代码包"
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2217
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "忽略已下载过的文件“%s”\n"
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2248
#, c-format
msgid "You don't have enough free space in %s"
-msgstr "您在 %s 上没有足够的空余空间"
+msgstr "您在 %s 上没有足够的可用空间"
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2254
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "需要下载 %sB/%sB 的源代码包。\n"
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2257
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "需要下载 %sB 的源代码包。\n"
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2263
#, c-format
msgid "Fetch source %s\n"
msgstr "下载源代码 %s\n"
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2294
msgid "Failed to fetch some archives."
msgstr "有一些包文件无法下载。"
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2322
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "对于已经被解包到 %s 目录的源代码包就不再解开了\n"
+msgstr "忽略已经被解包到 %s 目录的源代码包\n"
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2334
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "运行解包的命令“%s”出错。\n"
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2335
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2352
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "执行构造软件包命令“%s”失败。\n"
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2371
msgid "Child process failed"
msgstr "子进程出错"
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2387
msgid "Must specify at least one package to check builddeps for"
-msgstr "要检查生成软件包的构建依赖关系(builddeps)，必须指定至少一个软件包"
+msgstr "要检查生成软件包的构建依赖关系，必须指定至少一个软件包"
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2415
#, c-format
msgid "Unable to get build-dependency information for %s"
-msgstr "无法获得 %s 的构建依赖关系(build-dependency)信息"
+msgstr "无法获得 %s 的构建依赖关系信息"
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2435
#, c-format
msgid "%s has no build depends.\n"
msgstr " %s 没有构建依赖关系信息。\n"
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2487
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系"
-#: cmdline/apt-get.cc:2542
+#: cmdline/apt-get.cc:2540
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1223,31 +1211,30 @@ msgstr ""
"由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 %1"
"$s 依赖关系"
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2576
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：已安装的软件包 %3$s 太新了"
+msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：已安装的软件包 %3$s 太新"
-#: cmdline/apt-get.cc:2605
+#: cmdline/apt-get.cc:2603
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s"
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2619
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2624
msgid "Failed to process build dependencies"
msgstr "无法处理构建依赖关系"
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2656
msgid "Supported modules:"
-msgstr "被支持模块："
+msgstr "支持的模块："
-#: cmdline/apt-get.cc:2699
-#, fuzzy
+#: cmdline/apt-get.cc:2697
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1291,8 +1278,8 @@ msgid ""
" This APT has Super Cow Powers.\n"
msgstr ""
"用法： apt-get [选项] 命令\n"
-" apt-get [选项] install|remove 软件包1 [软件包2 ...]\n"
-" apt-get [选项] source 软件包1 [软件包2 ...]\n"
+"　　　 apt-get [选项] install|remove 软件包1 [软件包2 ...]\n"
+"　　　 apt-get [选项] source 软件包1 [软件包2 ...]\n"
"\n"
"apt-get 提供了一个用于下载和安装软件包的简易命令行界面。\n"
"最常用命令是 update 和 install。\n"
@@ -1319,8 +1306,8 @@ msgstr ""
" -d 仅仅下载 - 【不】安装或解开包文件\n"
" -s 不作实际操作。只是依次模拟执行命令\n"
" -y 对所有询问都回答是(Yes)，同时不作任何提示\n"
-" -f 当出现破损的依赖关系时，程序将试图修正系统\n"
-" -m 当有包文件无法找到时，程序仍试图继续执行\n"
+" -f 当出现破损的依赖关系时，程序将尝试修正系统\n"
+" -m 当有包文件无法找到时，程序仍尝试继续执行\n"
" -u 显示已升级的软件包列表\n"
" -b 在下载完源码包后，编译生成相应的软件包\n"
" -V 显示详尽的版本号\n"
@@ -1328,15 +1315,18 @@ msgstr ""
" -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
"请查阅 apt-get(8)、sources.list(5) 和 apt.conf(5)的参考手册\n"
"以获取更多信息和选项。\n"
-" 本 APT 有着超级牛力。\n"
+" 本 APT 具有超级牛力。\n"
-#: cmdline/apt-get.cc:2866
+#: cmdline/apt-get.cc:2864
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
" Keep also in mind that locking is deactivated,\n"
" so don't depend on the relevance to the real current situation!"
msgstr ""
+"注意：这只是模拟！\n"
+"　　　apt-get 需要 root 特权进行实际的执行。\n"
+"　　　同时请记住此时并未锁定，所以请勿完全相信当前的情况！"
#: cmdline/acqprogress.cc:55
msgid "Hit "
@@ -1373,7 +1363,7 @@ msgid ""
msgstr ""
"更换介质：请把标有\n"
"“%s”\n"
-"的碟片插入驱动器“%s”再按回车键\n"
+"的盘片插入驱动器“%s”再按回车键\n"
#: cmdline/apt-sortpkgs.cc:86
msgid "Unknown package record!"
@@ -1417,14 +1407,12 @@ msgid "Do you want to erase any previously downloaded .deb files?"
msgstr "您想要删除之前下载的所有 .deb 文件吗？"
#: dselect/install:101
-#, fuzzy
msgid "Some errors occurred while unpacking. Packages that were installed"
-msgstr "在解包时发生了一些错误。我正准备配置"
+msgstr "在解包时发生了一些错误。已经安装的软件包"
#: dselect/install:102
-#, fuzzy
msgid "will be configured. This may result in duplicate errors"
-msgstr "已经安装的软件包。这个操作可能会导致出现重复的错误"
+msgstr "将被配置。这个操作可能会导致出现重复的错误"
#: dselect/install:103
msgid "or errors caused by missing dependencies. This is OK, only the errors"
@@ -1437,7 +1425,7 @@ msgstr "这个提示之前的错误消息才值得您注意。请更正它们，
#: dselect/update:30
msgid "Merging available information"
-msgstr "正在合并现有信息"
+msgstr "正在合并可用信息"
#: apt-inst/contrib/extracttar.cc:114
msgid "Failed to create pipes"
@@ -1453,7 +1441,7 @@ msgstr "包文件已被损坏"
#: apt-inst/contrib/extracttar.cc:193
msgid "Tar checksum failed, archive corrupted"
-msgstr "tar 的校验码不符，包文件已被损坏"
+msgstr "Tar 的校验和不符，文件已损坏"
#: apt-inst/contrib/extracttar.cc:296
#, c-format
@@ -1462,28 +1450,28 @@ msgstr "未知的 TAR 数据头类型 %u，成员 %s"
#: apt-inst/contrib/arfile.cc:70
msgid "Invalid archive signature"
-msgstr "无效的打包文件特征号(signature)"
+msgstr "无效的归档签名"
#: apt-inst/contrib/arfile.cc:78
msgid "Error reading archive member header"
-msgstr "读取打包文件中的成员文件头出错"
+msgstr "读取归档成员文件头出错"
#: apt-inst/contrib/arfile.cc:90
-#, fuzzy, c-format
+#, c-format
msgid "Invalid archive member header %s"
-msgstr "打包文件中成员文件头无效"
+msgstr "归档文件中成员文件头 %s 无效"
#: apt-inst/contrib/arfile.cc:102
msgid "Invalid archive member header"
-msgstr "打包文件中成员文件头无效"
+msgstr "归档文件中成员文件头无效"
#: apt-inst/contrib/arfile.cc:128
msgid "Archive is too short"
-msgstr "存档太短了"
+msgstr "归档文件太短"
#: apt-inst/contrib/arfile.cc:132
msgid "Failed to read the archive headers"
-msgstr "无法读取打包文件的数据头"
+msgstr "无法读取归档文件的数据头"
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
@@ -1491,11 +1479,11 @@ msgstr "把 DropNode 用在了仍在链表中的节点上"
#: apt-inst/filelist.cc:412
msgid "Failed to locate the hash element!"
-msgstr "无法分配散列表项！"
+msgstr "无法定位哈希表元素！"
#: apt-inst/filelist.cc:459
msgid "Failed to allocate diversion"
-msgstr "无法分配转移项(diversion)"
+msgstr "无法分配转移项"
#: apt-inst/filelist.cc:464
msgid "Internal error in AddDiversion"
@@ -1504,12 +1492,12 @@ msgstr "内部错误，出现在 AddDiversion"
#: apt-inst/filelist.cc:477
#, c-format
msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "试图覆盖一个转移项(diversion)，%s -> %s 即 %s/%s"
+msgstr "尝试覆盖一个转移项，%s -> %s 和 %s/%s"
#: apt-inst/filelist.cc:506
#, c-format
msgid "Double add of diversion %s -> %s"
-msgstr "添加了两个转移项(diversion) %s-> %s"
+msgstr "添加了两个转移项 %s-> %s"
#: apt-inst/filelist.cc:549
#, c-format
@@ -1529,7 +1517,7 @@ msgstr "无法关闭文件 %s"
#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
#, c-format
msgid "The path %s is too long"
-msgstr "路径名 %s 过长"
+msgstr "路径名 %s 太长"
#: apt-inst/extract.cc:124
#, c-format
@@ -1539,16 +1527,16 @@ msgstr "%s 被解包了不只一次"
#: apt-inst/extract.cc:134
#, c-format
msgid "The directory %s is diverted"
-msgstr "目录 %s 已被转移(diverted)"
+msgstr "目录 %s 已被转移"
#: apt-inst/extract.cc:144
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "该软件包正尝试写入转移对象(diversion target) %s/%s"
+msgstr "该软件包正尝试写入转移对象 %s/%s"
#: apt-inst/extract.cc:154 apt-inst/extract.cc:297
msgid "The diversion path is too long"
-msgstr "该转移路径(diversion path)过长"
+msgstr "该转移路径太长"
#: apt-inst/extract.cc:240
#, c-format
@@ -1557,11 +1545,11 @@ msgstr "目录 %s 要被一个非目录的文件替换"
#: apt-inst/extract.cc:280
msgid "Failed to locate node in its hash bucket"
-msgstr "无法在其散列桶(hash bucket)中分配节点"
+msgstr "无法在其散列桶中分配节点"
#: apt-inst/extract.cc:284
msgid "The path is too long"
-msgstr "路径名过长"
+msgstr "路径名太长"
#: apt-inst/extract.cc:414
#, c-format
@@ -1578,7 +1566,7 @@ msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件"
#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
#, c-format
msgid "Unable to read %s"
@@ -1636,8 +1624,8 @@ msgid ""
"then make it empty and immediately re-install the same version of the "
"package!"
msgstr ""
-"无法打开列表文件“%sinfo/%s”。如果您不能恢复这个文件，那么就清空该文件，再马上"
-"重新安装相同版本的这个软件包！"
+"无法打开列表文件“%sinfo/%s”。如果您不能恢复这个文件，那么就清空该文件并马上重"
+"新安装相同版本的这个软件包！"
#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
#, c-format
@@ -1651,11 +1639,11 @@ msgstr "获得一个节点时出现内部错误"
#: apt-inst/deb/dpkgdb.cc:305
#, c-format
msgid "Failed to open the diversions file %sdiversions"
-msgstr "无法打开转移配置文件(diversions file) %sdiversions"
+msgstr "无法打开转移配置文件 %sdiversions"
#: apt-inst/deb/dpkgdb.cc:320
msgid "The diversion file is corrupted"
-msgstr "该转移配置文件(diversion file)被损坏了"
+msgstr "该转移配置文件被损坏了"
#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
#: apt-inst/deb/dpkgdb.cc:337
@@ -1665,7 +1653,7 @@ msgstr "转移配置文件中有一行是无效的：%s"
#: apt-inst/deb/dpkgdb.cc:358
msgid "Internal error adding a diversion"
-msgstr "添加 diversion 时出现内部错误"
+msgstr "添加转移配置时出现内部错误"
#: apt-inst/deb/dpkgdb.cc:379
msgid "The pkg cache must be initialized first"
@@ -1684,7 +1672,7 @@ msgstr "状态文件中有错误的 ConfFile 段。位于偏移位置 %lu"
#: apt-inst/deb/dpkgdb.cc:466
#, c-format
msgid "Error parsing MD5. Offset %lu"
-msgstr "无法解析 MD5 码。文件内偏移量为 %lu"
+msgstr "解析 MD5 出错。文件内偏移量为 %lu"
#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43
#, c-format
@@ -1707,7 +1695,7 @@ msgstr "内部错误，无法定位包内文件"
#: apt-inst/deb/debfile.cc:173
msgid "Failed to locate a valid control file"
-msgstr "无法在打包文件中找到有效的主控文件"
+msgstr "无法在归档文件中找到有效的主控文件"
#: apt-inst/deb/debfile.cc:258
msgid "Unparsable control file"
@@ -1716,19 +1704,19 @@ msgstr "不能解析的主控文件"
#: methods/cdrom.cc:200
#, c-format
msgid "Unable to read the cdrom database %s"
-msgstr "无法读取光盘数据库 %s"
+msgstr "无法读取盘片数据库 %s"
#: methods/cdrom.cc:209
msgid ""
"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
"cannot be used to add new CD-ROMs"
msgstr ""
-"请使用 apt-cdrom，通过它就可以让 APT 能识别该光盘。apt-get upgdate 不能被用来"
-"加入新的光盘。"
+"请使用 apt-cdrom，通过它就可以让 APT 能识别该盘片。apt-get upgdate 不能被用来"
+"加入新的盘片。"
#: methods/cdrom.cc:219
msgid "Wrong CD-ROM"
-msgstr "错误的光盘"
+msgstr "错误的 CD-ROM"
#: methods/cdrom.cc:245
#, c-format
@@ -1737,18 +1725,18 @@ msgstr "无法卸载现在挂载于 %s 的 CD-ROM，它可能正在使用中。"
#: methods/cdrom.cc:250
msgid "Disk not found."
-msgstr "找不到光盘。"
+msgstr "找不到盘片。"
#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "无法找到该文件"
#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/rred.cc:234 methods/rred.cc:243
msgid "Failed to stat"
msgstr "无法读取状态"
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
msgid "Failed to set modification time"
msgstr "无法设置文件的修改日期"
@@ -1757,148 +1745,148 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr "无效的 URI，本地的 URI 不能以 // 开头"
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
msgid "Logging in"
msgstr "正在登录"
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr "无法获知对方主机名"
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
msgid "Unable to determine the local name"
msgstr "无法获知本地主机名"
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
-msgstr "服务器拒绝了我们的连接，它响应道：%s"
+msgstr "服务器拒绝了我们的连接，响应信息为：%s"
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
-msgstr "USER 指令出错，服务器响应道：%s"
+msgstr "USER 指令出错，服务器响应信息为：%s"
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
-msgstr "PASS 指令出错，服务器响应道：%s"
+msgstr "PASS 指令出错，服务器响应信息为：%s"
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
msgstr ""
"您指定了代理服务器，但是没有登陆脚本，Acquire::ftp::ProxyLogin 设置为空。"
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
-msgstr "登录脚本命令“%s”出错，服务器响应道：%s"
+msgstr "登录脚本命令“%s”出错，服务器响应信息为：%s"
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
#, c-format
msgid "TYPE failed, server said: %s"
-msgstr "TYPE 指令出错，服务器响应道：%s"
+msgstr "TYPE 指令出错，服务器响应信息为：%s"
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
msgstr "连接超时"
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
msgid "Server closed the connection"
msgstr "服务器关闭了连接"
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
msgid "Read error"
msgstr "读错误"
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
msgstr "回应超出了缓存区大小。"
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
msgstr "协议有误"
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
msgid "Write error"
-msgstr "写文件出错"
+msgstr "写出错"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
-msgstr "不能创建套接字"
+msgstr "无法创建套接字"
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
msgid "Could not connect data socket, connection timed out"
msgstr "无法连接上数据套接字，连接超时"
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr "无法连接被动模式的套接字。"
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
msgid "getaddrinfo was unable to get a listening socket"
-msgstr "getaddrinfo 无法得到侦听套接字"
+msgstr "getaddrinfo 无法得到监听套接字"
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr "无法绑定套接字"
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
msgid "Could not listen on the socket"
-msgstr "无法在套接字上侦听"
+msgstr "无法在套接字上监听"
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr "无法确定套接字的名字"
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr "无法发出 PORT 指令"
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "无法识别的地址族 %u (AF_*)"
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
-msgstr "EPRT 指令出错，服务器响应道：%s"
+msgstr "EPRT 指令出错，服务器响应信息为：%s"
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr "数据套接字连接超时"
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr "无法接受连接"
-#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
msgid "Problem hashing file"
-msgstr "把文件加入散列表时出错"
+msgstr "把文件加入哈希表时出错"
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
#, c-format
msgid "Unable to fetch file, server said '%s'"
-msgstr "无法获取文件，服务器响应道“%s”"
+msgstr "无法获取文件，服务器响应信息为“%s”"
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
msgid "Data socket timed out"
msgstr "数据套接字超时"
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
#, c-format
msgid "Data transfer failed, server said '%s'"
-msgstr "数据传送出错，服务器响应道“%s”"
+msgstr "数据传送出错，服务器响应信息为“%s”"
#. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
msgid "Query"
msgstr "查询"
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr "无法调用 "
@@ -1950,28 +1938,28 @@ msgid "Temporary failure resolving '%s'"
msgstr "暂时不能解析域名“%s”"
#: methods/connect.cc:193
-#, fuzzy, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr "解析“%s:%s”时，出现了某些故障 (%i)"
+#, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i)"
+msgstr "解析“%s:%s”时，出现了某些故障(%i)"
#: methods/connect.cc:240
-#, fuzzy, c-format
+#, c-format
msgid "Unable to connect to %s:%s:"
-msgstr "不能连接上 %s %s："
+msgstr "不能连接到 %s：%s："
#: methods/gpgv.cc:71
#, c-format
msgid "Couldn't access keyring: '%s'"
-msgstr "无法访问密匙：“%s”"
+msgstr "无法访问密钥环：“%s”"
#: methods/gpgv.cc:107
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr "错误：Acquire::gpgv::Options 的参数列表超长。结束运行。"
+msgstr "错误：Acquire::gpgv::Options 的参数列表太长。结束运行。"
#: methods/gpgv.cc:223
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
-msgstr "内部错误：签名正确无误，但是无法确认密钥的指纹(key fingerprint)？！"
+msgstr "内部错误：签名正确无误，但是无法确认密钥指纹？！"
#: methods/gpgv.cc:228
msgid "At least one invalid signature was encountered."
@@ -1980,7 +1968,7 @@ msgstr "至少发现一个无效的签名。"
#: methods/gpgv.cc:232
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
-msgstr "无法运行\"%s\"以验证签名(您安装了 gpgv 么？)"
+msgstr "无法运行“%s”以验证签名(您安装了 gpgv 吗？)"
#: methods/gpgv.cc:237
msgid "Unknown error executing gpgv"
@@ -1994,7 +1982,7 @@ msgstr "下列签名无效：\n"
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
-msgstr "由于没有公钥，下列签名无法进行验证：\n"
+msgstr "由于没有公钥，无法验证下列签名：\n"
#: methods/gzip.cc:64
#, c-format
@@ -2006,80 +1994,80 @@ msgstr "无法为 %s 开启管道"
msgid "Read error from %s process"
msgstr "从 %s 进程读取数据出错"
-#: methods/http.cc:384
+#: methods/http.cc:385
msgid "Waiting for headers"
msgstr "正在等待报头"
-#: methods/http.cc:530
+#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
-msgstr "受到了一行报头条目，它的长度超过了 %u 个字符"
+msgstr "接收到一行报头行，它的长度超过了 %u 个字符"
-#: methods/http.cc:538
+#: methods/http.cc:539
msgid "Bad header line"
-msgstr "错误的报头条目"
+msgstr "错误的报头行"
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
-msgstr "该 http 服务器发送了一个无效的应答报头"
+msgstr "该 HTTP 服务器发送了一个无效的应答报头"
-#: methods/http.cc:593
+#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
-msgstr "该 http 服务器发送了一个无效的 Content-Length 报头"
+msgstr "该 HTTP 服务器发送了一个无效的 Content-Length 报头"
-#: methods/http.cc:608
+#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
-msgstr "该 http 服务器发送了一个无效的 Content-Range 报头"
+msgstr "该 HTTP 服务器发送了一个无效的 Content-Range 报头"
-#: methods/http.cc:610
+#: methods/http.cc:611
msgid "This HTTP server has broken range support"
-msgstr "该 http 服务器的 range 支持不正常"
+msgstr "该 HTTP 服务器的 range 支持不正常"
-#: methods/http.cc:634
+#: methods/http.cc:635
msgid "Unknown date format"
msgstr "无法识别的日期格式"
-#: methods/http.cc:788
+#: methods/http.cc:790
msgid "Select failed"
msgstr "select 调用出错"
-#: methods/http.cc:793
+#: methods/http.cc:795
msgid "Connection timed out"
-msgstr "连接服务器超时"
+msgstr "连接超时"
-#: methods/http.cc:816
+#: methods/http.cc:818
msgid "Error writing to output file"
msgstr "写输出文件时出错"
-#: methods/http.cc:847
+#: methods/http.cc:849
msgid "Error writing to file"
-msgstr "写文件时出错"
+msgstr "写入文件出错"
-#: methods/http.cc:875
+#: methods/http.cc:877
msgid "Error writing to the file"
-msgstr "写文件时出错"
+msgstr "写入文件出错"
-#: methods/http.cc:889
+#: methods/http.cc:891
msgid "Error reading from server. Remote end closed connection"
msgstr "从服务器读取数据时出错，对方关闭了连接"
-#: methods/http.cc:891
+#: methods/http.cc:893
msgid "Error reading from server"
msgstr "从服务器读取数据出错"
-#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
msgid "Failed to truncate file"
-msgstr "截断文件失败"
+msgstr "无法截断文件"
-#: methods/http.cc:1147
+#: methods/http.cc:1149
msgid "Bad header data"
msgstr "错误的报头数据"
-#: methods/http.cc:1164 methods/http.cc:1219
+#: methods/http.cc:1166 methods/http.cc:1221
msgid "Connection failed"
msgstr "连接失败"
-#: methods/http.cc:1311
+#: methods/http.cc:1313
msgid "Internal error"
msgstr "内部错误"
@@ -2087,55 +2075,48 @@ msgstr "内部错误"
msgid "Can't mmap an empty file"
msgstr "无法 mmap 一个空文件"
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "无法 mmap %lu 字节的数据"
-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:234
#, c-format
msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-"动态 MMap 没有空间了。请增大 APT::Cache-Limit 的大侠。当前值：%lu。(man 5 "
+"动态 MMap 没有空间了。请增大 APT::Cache-Limit 的大小。当前值：%lu。(man 5 "
"apt.conf)"
-#: apt-pkg/contrib/mmap.cc:347
-#, c-format
-msgid ""
-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
-msgstr ""
-
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:346
#, c-format
msgid "%lid %lih %limin %lis"
-msgstr ""
+msgstr "%li天 %li小时 %li分 %li秒"
#. h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:353
#, c-format
msgid "%lih %limin %lis"
-msgstr ""
+msgstr "%li小时 %li分 %li秒"
#. min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:360
#, c-format
msgid "%limin %lis"
-msgstr ""
+msgstr "%li分 %li秒"
#. s means seconds
#: apt-pkg/contrib/strutl.cc:365
#, c-format
msgid "%lis"
-msgstr ""
+msgstr "%li秒"
#: apt-pkg/contrib/strutl.cc:1040
#, c-format
msgid "Selection %s not found"
-msgstr "没有发现您的所选 %s"
+msgstr "找不到您选则的 %s"
#: apt-pkg/contrib/configuration.cc:458
#, c-format
@@ -2190,7 +2171,7 @@ msgstr "语法错误 %s:%u: 文件尾部有多余的无意义的数据"
#: apt-pkg/contrib/progress.cc:153
#, c-format
msgid "%c%s... Error!"
-msgstr "%c%s... 有错误!"
+msgstr "%c%s... 有错误！"
#: apt-pkg/contrib/progress.cc:155
#, c-format
@@ -2200,7 +2181,7 @@ msgstr "%c%s... 完成"
#: apt-pkg/contrib/cmndline.cc:77
#, c-format
msgid "Command line option '%c' [from %s] is not known."
-msgstr "未知的命令行选项“%c”[来自 %s]"
+msgstr "未知的命令行选项“%c” [来自 %s]"
#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
#: apt-pkg/contrib/cmndline.cc:119
@@ -2211,7 +2192,7 @@ msgstr "无法识别命令行选项 %s"
#: apt-pkg/contrib/cmndline.cc:124
#, c-format
msgid "Command line option %s is not boolean"
-msgstr "命令行选项 %s 不是个布尔值"
+msgstr "命令行选项 %s 不是布尔值"
#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184
#, c-format
@@ -2231,7 +2212,7 @@ msgstr "选项 %s 要求有一个整数作为参数，而不是“%s”"
#: apt-pkg/contrib/cmndline.cc:265
#, c-format
msgid "Option '%s' is too long"
-msgstr "选项“%s”超长"
+msgstr "选项“%s”太长"
#: apt-pkg/contrib/cmndline.cc:298
#, c-format
@@ -2256,12 +2237,12 @@ msgstr "无法切换工作目录到 %s"
#: apt-pkg/contrib/cdromutl.cc:195
msgid "Failed to stat the cdrom"
-msgstr "无法读取光盘的状态"
+msgstr "无法读取盘片的状态"
#: apt-pkg/contrib/fileutl.cc:149
#, c-format
msgid "Not using locking for read only lock file %s"
-msgstr "由于文件系统为只读，因而无法使用文件锁%s"
+msgstr "由于文件系统为只读，因而无法使用文件锁 %s"
#: apt-pkg/contrib/fileutl.cc:154
#, c-format
@@ -2289,9 +2270,9 @@ msgid "Sub-process %s received a segmentation fault."
msgstr "子进程 %s 发生了段错误"
#: apt-pkg/contrib/fileutl.cc:458
-#, fuzzy, c-format
+#, c-format
msgid "Sub-process %s received signal %u."
-msgstr "子进程 %s 发生了段错误"
+msgstr "子进程 %s 收到信号 %u。"
#: apt-pkg/contrib/fileutl.cc:462
#, c-format
@@ -2301,7 +2282,7 @@ msgstr "子进程 %s 返回了一个错误号 (%u)"
#: apt-pkg/contrib/fileutl.cc:464
#, c-format
msgid "Sub-process %s exited unexpectedly"
-msgstr "子进程 %s 异常退出了"
+msgstr "子进程 %s 异常退出"
#: apt-pkg/contrib/fileutl.cc:508
#, c-format
@@ -2311,24 +2292,24 @@ msgstr "无法打开文件 %s"
#: apt-pkg/contrib/fileutl.cc:564
#, c-format
msgid "read, still have %lu to read but none left"
-msgstr "读文件时出错，还剩 %lu 字节没有读出"
+msgstr "读取文件出错，还剩 %lu 字节没有读出"
#: apt-pkg/contrib/fileutl.cc:594
#, c-format
msgid "write, still have %lu to write but couldn't"
-msgstr "写文件时出错，还剩 %lu 字节没有保存"
+msgstr "写入文件出错，还剩 %lu 字节没有保存"
#: apt-pkg/contrib/fileutl.cc:669
msgid "Problem closing the file"
-msgstr "关闭文件时出错"
+msgstr "关闭文件出错"
#: apt-pkg/contrib/fileutl.cc:675
msgid "Problem unlinking the file"
-msgstr "用 unlink 删除文件时出错"
+msgstr "用 unlink 删除文件出错"
#: apt-pkg/contrib/fileutl.cc:686
msgid "Problem syncing the file"
-msgstr "同步文件时出错"
+msgstr "同步文件出错"
#: apt-pkg/pkgcache.cc:133
msgid "Empty package cache"
@@ -2336,7 +2317,7 @@ msgstr "软件包缓存区是空的"
#: apt-pkg/pkgcache.cc:139
msgid "The package cache file is corrupted"
-msgstr "软件包缓存区文件损坏了"
+msgstr "软件包缓存文件损坏了"
#: apt-pkg/pkgcache.cc:144
msgid "The package cache file is an incompatible version"
@@ -2345,11 +2326,11 @@ msgstr "软件包缓存区文件的版本不兼容"
#: apt-pkg/pkgcache.cc:149
#, c-format
msgid "This APT does not support the versioning system '%s'"
-msgstr "本程序目前不支持“%s”这个版本控制系统"
+msgstr "本程序目前不支持“%s”版本系统"
#: apt-pkg/pkgcache.cc:154
msgid "The package cache was built for a different architecture"
-msgstr "软件包缓存区是为其它架构的主机构造的"
+msgstr "软件包缓存区是为其它架构的硬件构建的"
#: apt-pkg/pkgcache.cc:225
msgid "Depends"
@@ -2385,7 +2366,7 @@ msgstr "破坏"
#: apt-pkg/pkgcache.cc:227
msgid "Enhances"
-msgstr ""
+msgstr "增强"
#: apt-pkg/pkgcache.cc:238
msgid "important"
@@ -2393,7 +2374,7 @@ msgstr "重要"
#: apt-pkg/pkgcache.cc:238
msgid "required"
-msgstr "必要"
+msgstr "必需"
#: apt-pkg/pkgcache.cc:238
msgid "standard"
@@ -2446,27 +2427,27 @@ msgstr "无法解析软件包文件 %s (2)"
#: apt-pkg/sourcelist.cc:90
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误 (URI)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误(URI)"
#: apt-pkg/sourcelist.cc:92
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (dist)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版)"
#: apt-pkg/sourcelist.cc:95
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (URI parse)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)"
#: apt-pkg/sourcelist.cc:101
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (Ablolute dist)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(独立发行版)"
#: apt-pkg/sourcelist.cc:108
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (dist parse)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版解析)"
#: apt-pkg/sourcelist.cc:206
#, c-format
@@ -2476,31 +2457,24 @@ msgstr "正在打开 %s"
#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
-msgstr "软件包来源档 %2$s 的第 %1$u 行超长了。"
+msgstr "源列表 %2$s 的第 %1$u 行太长了。"
#: apt-pkg/sourcelist.cc:243
#, c-format
msgid "Malformed line %u in source list %s (type)"
-msgstr "在安装源列表中 %2$s 中第 %1$u 行的格式有误 (type)"
+msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)"
#: apt-pkg/sourcelist.cc:247
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "无法识别在安装源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”"
+msgstr "无法识别在源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”"
#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
-msgstr "在安装源列表中 %2$s 中第 %1$u 行的格式有误 (vendor id)"
-
-#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
+msgstr "在源列表中 %2$s 中第 %1$u 行的格式有误(供应商 ID)"
-#: apt-pkg/packagemanager.cc:437
+#: apt-pkg/packagemanager.cc:439
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2511,13 +2485,6 @@ msgstr ""
"少的软件包 %s。通常并不建议这样做，但是如果您确实希望如此，可以打开 APT::"
"Force-LoopBreak 选项。"
-#: apt-pkg/packagemanager.cc:475
-#, c-format
-msgid ""
-"Could not perform immediate configuration on already unpacked '%s'.Please "
-"see man 5 apt.conf under APT::Immediate-Configure for details."
-msgstr ""
-
#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
@@ -2553,12 +2520,12 @@ msgstr ""
#: apt-pkg/acquire.cc:60
#, c-format
msgid "Lists directory %spartial is missing."
-msgstr "软件包列表的目录 %spartial 不见了。"
+msgstr "软件包列表的目录 %spartial 缺失。"
#: apt-pkg/acquire.cc:64
#, c-format
msgid "Archive directory %spartial is missing."
-msgstr "找不到“%spartial”这个目录。"
+msgstr "找不到“%spartial”目录。"
#. only show the ETA if it makes sense
#. two days
@@ -2585,14 +2552,14 @@ msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
#: apt-pkg/acquire-worker.cc:413
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "请把标有 “%s” 的碟片插入驱动器“%s”再按回车键。"
+msgstr "请把标有“%s”的盘片插入驱动器“%s”再按回车键。"
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "不支持“%s”打包系统"
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr "无法确定适合的打包系统类型"
@@ -2603,7 +2570,7 @@ msgstr "无法读取 %s 的状态。"
#: apt-pkg/srcrecords.cc:44
msgid "You must put some 'source' URIs in your sources.list"
-msgstr "您必须在您的 sources.list 写入一些“软件包源”的 URI"
+msgstr "您必须在您的 sources.list 写入一些“软件源”的 URI"
#: apt-pkg/cachefile.cc:71
msgid "The package lists or status file could not be parsed or opened."
@@ -2614,14 +2581,14 @@ msgid "You may want to run apt-get update to correct these problems"
msgstr "您可能需要运行 apt-get update 来解决这些问题"
#: apt-pkg/policy.cc:347
-#, fuzzy, c-format
+#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "偏好设定(preferences)文件中发现有无效的记录，无 Package 字段头"
+msgstr "首选项文件 %s 中发现有无效的记录，无 Package 字段头"
#: apt-pkg/policy.cc:369
#, c-format
msgid "Did not understand pin type %s"
-msgstr "无法识别锁定的类型(pin type) %s"
+msgstr "无法识别锁定的类型 %s"
#: apt-pkg/policy.cc:377
msgid "No priority (or zero) specified for pin"
@@ -2678,19 +2645,19 @@ msgstr "处理 %s (NewFileDesc2)时出错"
#: apt-pkg/pkgcachegen.cc:264
msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "糟了，软件包的数量了超出本程序的处理能力。"
+msgstr "哇，软件包数量超出了本 APT 的处理能力。"
#: apt-pkg/pkgcachegen.cc:267
msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "糟了，软件包版本的数量了超出本程序的处理能力。"
+msgstr "哇，软件包版本数量超出了本 APT 的处理能力。"
#: apt-pkg/pkgcachegen.cc:270
msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "糟了，软件包说明的数量了超出本程序的处理能力。"
+msgstr "哇，软件包说明数量超出了本 APT 的处理能力。"
#: apt-pkg/pkgcachegen.cc:273
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "糟了，依赖关系的数量超出了本程序的处理能力。"
+msgstr "哇，依赖关系数量超出了本 APT 的处理能力。"
#: apt-pkg/pkgcachegen.cc:301
#, c-format
@@ -2718,26 +2685,26 @@ msgstr "正在收集文件所提供的软件包"
#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
msgid "IO Error saving source cache"
-msgstr "无法写入来源缓存文件"
+msgstr "无法读取或写入软件源缓存"
#: apt-pkg/acquire-item.cc:128
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "无法重命名文件，%s (%s -> %s)。"
-#: apt-pkg/acquire-item.cc:396
+#: apt-pkg/acquire-item.cc:395
msgid "MD5Sum mismatch"
msgstr "MD5 校验和不符"
-#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
msgid "Hash Sum mismatch"
msgstr "Hash 校验和不符"
-#: apt-pkg/acquire-item.cc:1114
+#: apt-pkg/acquire-item.cc:1106
msgid "There is no public key available for the following key IDs:\n"
-msgstr "以下 key ID 没有可用的公钥：\n"
+msgstr "以下 ID 的密钥没有可用的公钥：\n"
-#: apt-pkg/acquire-item.cc:1224
+#: apt-pkg/acquire-item.cc:1216
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2746,7 +2713,7 @@ msgstr ""
"我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
"包。(缘于架构缺失)"
-#: apt-pkg/acquire-item.cc:1283
+#: apt-pkg/acquire-item.cc:1275
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2754,30 +2721,30 @@ msgid ""
msgstr ""
"我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。"
-#: apt-pkg/acquire-item.cc:1324
+#: apt-pkg/acquire-item.cc:1316
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:1403
msgid "Size mismatch"
msgstr "大小不符"
#: apt-pkg/indexrecords.cc:40
-#, fuzzy, c-format
+#, c-format
msgid "Unable to parse Release file %s"
-msgstr "无法解析软件包文件 %s (1)"
+msgstr "无法解析软件包仓库 Release 文件 %s"
#: apt-pkg/indexrecords.cc:47
-#, fuzzy, c-format
+#, c-format
msgid "No sections in Release file %s"
-msgstr "注意，选取 %s 而非 %s\n"
+msgstr "软件包仓库 Release 文件 %s 内无组件章节信息"
#: apt-pkg/indexrecords.cc:81
#, c-format
msgid "No Hash entry in Release file %s"
-msgstr ""
+msgstr "软件包仓库 Release 文件 %s 内无哈希条目"
#: apt-pkg/vendorlist.cc:66
#, c-format
@@ -2800,7 +2767,7 @@ msgstr "正在鉴别.. "
#: apt-pkg/cdrom.cc:559
#, c-format
msgid "Stored label: %s\n"
-msgstr "已存档的标签：%s\n"
+msgstr "已归档文件的标签：%s\n"
#: apt-pkg/cdrom.cc:566 apt-pkg/cdrom.cc:836
msgid "Unmounting CD-ROM...\n"
@@ -2826,7 +2793,7 @@ msgstr "正在挂载 CD-ROM 文件系统……\n"
#: apt-pkg/cdrom.cc:633
msgid "Scanning disc for index files..\n"
-msgstr "正在光盘中查找索引文件..\n"
+msgstr "正在盘片中查找索引文件..\n"
#: apt-pkg/cdrom.cc:673
#, c-format
@@ -2842,6 +2809,8 @@ msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
msgstr ""
+"无法确定任何包文件的位置，可能这不是一张 Debian 盘片或者是选择了错误的硬件构"
+"架。"
#: apt-pkg/cdrom.cc:710
#, c-format
@@ -2850,7 +2819,7 @@ msgstr "找到标签 '%s'\n"
#: apt-pkg/cdrom.cc:739
msgid "That is not a valid name, try again.\n"
-msgstr "这不是一个有效的名字，请再次命名。\n"
+msgstr "这不是一个有效的名字，请重试。\n"
#: apt-pkg/cdrom.cc:755
#, c-format
@@ -2858,7 +2827,7 @@ msgid ""
"This disc is called: \n"
"'%s'\n"
msgstr ""
-"这张光盘现在的名字是：\n"
+"这张盘片现在的名字是：\n"
"“%s”\n"
#: apt-pkg/cdrom.cc:759
@@ -2867,11 +2836,11 @@ msgstr "正在复制软件包列表……"
#: apt-pkg/cdrom.cc:785
msgid "Writing new source list\n"
-msgstr "正在写入新的软件包源列表\n"
+msgstr "正在写入新的源列表\n"
#: apt-pkg/cdrom.cc:794
msgid "Source list entries for this disc are:\n"
-msgstr "对应于该光盘的软件包源设置项是：\n"
+msgstr "对应于该盘片的软件源设置项是：\n"
#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
#, c-format
@@ -2886,129 +2855,136 @@ msgstr "已写入 %i 条记录，并有 %i 个文件缺失。\n"
#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
-msgstr "已写入 %i 条记录，并有 %i 个文件不吻合\n"
+msgstr "已写入 %i 条记录，并有 %i 个文件不匹配\n"
#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不吻合\n"
+msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不匹配\n"
+
+#: apt-pkg/indexcopy.cc:530
+#, fuzzy, c-format
+msgid "Skipping nonexistent file %s"
+msgstr "正在打开配置文件 %s"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, fuzzy, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Hash 校验和不符"
#: apt-pkg/deb/dpkgpm.cc:49
#, c-format
msgid "Installing %s"
msgstr "正在安装 %s"
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Configuring %s"
msgstr "正在配置 %s"
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removing %s"
msgstr "正在删除 %s"
#: apt-pkg/deb/dpkgpm.cc:52
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "完全删除了 %s"
+
+#: apt-pkg/deb/dpkgpm.cc:53
#, c-format
msgid "Running post-installation trigger %s"
msgstr "执行安装后执行的触发器 %s"
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
#, c-format
msgid "Directory '%s' missing"
msgstr "目录 %s 不见了"
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Preparing %s"
msgstr "正在准备 %s"
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
#, c-format
msgid "Unpacking %s"
msgstr "正在解压缩 %s"
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Preparing to configure %s"
msgstr "正在准备配置 %s"
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
#, c-format
msgid "Installed %s"
msgstr "已安装 %s"
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Preparing for removal of %s"
msgstr "正在准备 %s 的删除操作"
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
#, c-format
msgid "Removed %s"
msgstr "已删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
#, c-format
msgid "Preparing to completely remove %s"
msgstr "正在准备完全删除 %s"
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
#, c-format
msgid "Completely removed %s"
msgstr "完全删除了 %s"
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
-msgstr "无法写入日志。 openpty() 失败 (/dev/pts 没有 mount 上？)\n"
+msgstr "无法写入日志。 openpty() 失败(没有挂载 /dev/pts ？)\n"
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:908
msgid "Running dpkg"
-msgstr ""
+msgstr "正在运行 dpkg"
#: apt-pkg/deb/debsystem.cc:70
#, c-format
msgid ""
"Unable to lock the administration directory (%s), is another process using "
"it?"
-msgstr ""
+msgstr "无法锁定管理目录(%s)，是否有其他进程正占用它？"
#: apt-pkg/deb/debsystem.cc:73
-#, fuzzy, c-format
+#, c-format
msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "无法对状态列表目录加锁"
+msgstr "无法对状态列表目录加锁(%s)，请查看您是否正以 root 用户运行？"
#: apt-pkg/deb/debsystem.cc:82
msgid ""
"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
"the problem. "
-msgstr ""
+msgstr "dpkg 被中断，您必须手工运行 'dpkg --configure -a' 解决此问题。"
#: apt-pkg/deb/debsystem.cc:100
msgid "Not locked"
-msgstr ""
-
-#: methods/rred.cc:465
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
+msgstr "未锁定"
-#: methods/rred.cc:470
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
+#: methods/rred.cc:219
+msgid "Could not patch file"
+msgstr "无法打开补丁文件"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "连接被永久关闭"
-#~ msgid "Could not patch file"
-#~ msgstr "无法打开补丁文件"
-
#~ msgid "%4i %s\n"
#~ msgstr "%4i %s\n"
@@ -3027,7 +3003,7 @@ msgstr "连接被永久关闭"
#~ "您最好提交一个针对这个软件包的故障报告。"
#~ msgid "Line %d too long (max %lu)"
-#~ msgstr "第 %d 行超长了(长度限制为 %lu)。"
+#~ msgstr "第 %d 行太长了(长度限制为 %lu)。"
#~ msgid "After unpacking %sB of additional disk space will be used.\n"
#~ msgstr "解压缩后会消耗掉 %sB 的额外空间。\n"
@@ -3039,7 +3015,7 @@ msgstr "连接被永久关闭"
#~ msgstr "%s 已设置为手动安装。\n"
#~ msgid "Line %d too long (max %d)"
-#~ msgstr "第 %d 行超长了(长度限制为 %d)"
+#~ msgstr "第 %d 行太长了(长度限制为 %d)"
#~ msgid "Error occured while processing %s (NewFileDesc1)"
#~ msgstr "处理 %s (NewFileDesc1)时出错"
@@ -3048,7 +3024,7 @@ msgstr "连接被永久关闭"
#~ msgstr "处理 %s (NewFileDesc2)时出错"
#~ msgid "Stored label: %s \n"
-#~ msgstr "存档标签：%s \n"
+#~ msgstr "归档文件标签：%s \n"
#~ msgid ""
#~ "Found %i package indexes, %i source indexes, %i translation indexes and %"
@@ -3076,5 +3052,4 @@ msgstr "连接被永久关闭"
#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
#~ msgstr ""
-#~ "在安装源列表 %3$s 的第 %2$u 行发现了无法识别的软件提供商 ID (vendor ID) “%"
-#~ "1$s”"
+#~ "在源列表 %3$s 的第 %2$u 行发现了无法识别的软件提供商 ID (vendor ID) “%1$s”"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 00:08:47 +0000