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/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/changelog37
-rw-r--r--doc/examples/configure-index2
-rw-r--r--doc/po/apt-doc.pot1590
-rw-r--r--doc/po/de.po1877
-rw-r--r--doc/po/fr.po1873
-rw-r--r--doc/po/ja.po2203
-rw-r--r--ftparchive/apt-ftparchive.cc1
-rw-r--r--methods/ftp.cc5
-rw-r--r--methods/http.cc7
-rw-r--r--methods/https.cc10
-rw-r--r--methods/https.h2
-rw-r--r--po/apt-all.pot984
-rw-r--r--po/it.po84
-rw-r--r--po/sk.po54
-rw-r--r--po/zh_CN.po465
27 files changed, 2495 insertions, 7256 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/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 49fde7466..52e90fc64 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 4718015a3..5830b8ad5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,36 @@ apt (0.7.25) UNRELEASED; urgency=low
Closes: #551534
* German translation of manpages by Chris Leick
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 ]
* apt-pkg/packagemanager.cc:
@@ -68,9 +98,10 @@ 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
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 27118fb7e..f5f996460 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -282,6 +282,7 @@ Dir "/"
// Config files
Etc "etc/apt/" {
Main "apt.conf";
+ Netrc "auth.conf";
Parts "apt.conf.d/";
Preferences "preferences";
PreferencesParts "preferences.d";
@@ -380,6 +381,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 79f901e97..e4736029f 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-10-29 14:19+0100\n"
+"POT-Creation-Date: 2009-12-01 19:13+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"
@@ -284,7 +284,7 @@ msgstr ""
msgid ""
"<!ENTITY dpkg \"<citerefentry>\n"
" <refentrytitle><command>dpkg</command></refentrytitle>\n"
-" <manvolnum>1</manvolnum>\n"
+" <manvolnum>8</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
msgstr ""
@@ -317,7 +317,7 @@ msgstr ""
msgid ""
"<!ENTITY dpkg-scanpackages \"<citerefentry>\n"
" <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n"
-" <manvolnum>1</manvolnum>\n"
+" <manvolnum>8</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
msgstr ""
@@ -328,7 +328,7 @@ msgstr ""
msgid ""
"<!ENTITY dpkg-scansources \"<citerefentry>\n"
" <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n"
-" <manvolnum>1</manvolnum>\n"
+" <manvolnum>8</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
msgstr ""
@@ -339,7 +339,7 @@ msgstr ""
msgid ""
"<!ENTITY dselect \"<citerefentry>\n"
" <refentrytitle><command>dselect</command></refentrytitle>\n"
-" <manvolnum>1</manvolnum>\n"
+" <manvolnum>8</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
msgstr ""
@@ -983,7 +983,7 @@ msgstr ""
msgid ""
"<literal>Missing</literal> is the number of package names that were "
"referenced in a dependency but were not provided by any package. Missing "
-"packages may be an evidence if a full distribution is not accessed, or if a "
+"packages may be in evidence if a full distribution is not accessed, or if a "
"package (real or virtual) has been dropped from the distribution. Usually "
"they are referenced from Conflicts or Breaks statements."
msgstr ""
@@ -1218,7 +1218,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 apt-sortpkgs.1.xml:54 apt.conf.5.xml:456 apt.conf.5.xml:478
+#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 apt-sortpkgs.1.xml:54 apt.conf.5.xml:441 apt.conf.5.xml:463
msgid "options"
msgstr ""
@@ -1416,7 +1416,7 @@ 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:988 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:973 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:563 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
+#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 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:979 apt_preferences.5.xml:622 sources.list.5.xml:221
msgid "See Also"
msgstr ""
@@ -1809,7 +1809,7 @@ msgstr ""
#: apt-extracttemplates.1.xml:62
msgid ""
"Temporary directory in which to write extracted debconf template files and "
-"config scripts. Configuration Item: "
+"config scripts Configuration Item: "
"<literal>APT::ExtractTemplates::TempDir</literal>"
msgstr ""
@@ -2027,8 +2027,8 @@ msgstr ""
msgid ""
"The <literal>Dir</literal> section defines the standard directories needed "
"to locate the files required during the generation process. These "
-"directories are prepended certain relative paths defined in later sections "
-"to produce a complete an absolute path."
+"directories are prepended to certain relative paths defined in later "
+"sections to produce a complete an absolute path."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
@@ -2681,7 +2681,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:552 apt.conf.5.xml:982 apt_preferences.5.xml:462 sources.list.5.xml:193
+#: apt-ftparchive.1.xml:552 apt.conf.5.xml:967 apt_preferences.5.xml:462 sources.list.5.xml:181
msgid "Examples"
msgstr ""
@@ -2716,8 +2716,8 @@ msgid ""
"November 2008</date>"
msgstr ""
-#. type: <heading></heading>
-#: apt-get.8.xml:22 apt-get.8.xml:29 guide.sgml:96
+#. type: Content of: <refentry><refnamediv><refname>
+#: apt-get.8.xml:22 apt-get.8.xml:29
msgid "apt-get"
msgstr ""
@@ -2792,8 +2792,8 @@ msgid ""
"advance."
msgstr ""
-#. type: <tag></tag>
-#: apt-get.8.xml:147 guide.sgml:121
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:147
msgid "upgrade"
msgstr ""
@@ -2829,8 +2829,8 @@ msgid ""
"removal of old and the installation of new packages)."
msgstr ""
-#. type: <tag></tag>
-#: apt-get.8.xml:170 guide.sgml:140
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:170
msgid "dist-upgrade"
msgstr ""
@@ -2848,8 +2848,8 @@ msgid ""
"for a mechanism for overriding the general settings for individual packages."
msgstr ""
-#. type: <tag></tag>
-#: apt-get.8.xml:183 guide.sgml:131
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:183
msgid "install"
msgstr ""
@@ -2977,7 +2977,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:266
msgid ""
-"If the <option>--compile</option> option is specified then the package will "
+"If the <option>--compile</option> options is specified then the package will "
"be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
"<option>--download-only</option> is specified then the source package will "
"not be unpacked."
@@ -3195,8 +3195,8 @@ msgstr ""
msgid ""
"Simulate prints out a series of lines each one representing a dpkg "
"operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
-"indicate broken packages and empty set of square brackets meaning breaks "
-"that are of no consequence (rare)."
+"indicate broken packages with and empty set of square brackets meaning "
+"breaks that are of no consequence (rare)."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -3812,8 +3812,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml:82
msgid ""
-"<literal>showauto</literal> is used to print a list of automatically "
-"installed packages with each package on a new line."
+"<literal>showauto</literal> is used to print a list of manually installed "
+"packages with each package on a new line."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -3938,7 +3938,7 @@ msgid ""
"different steps. <command>apt-secure</command> is the last step in this "
"chain, trusting an archive does not mean that the packages that you trust it "
"do not contain malicious code but means that you trust the archive "
-"maintainer. It's the archive maintainer responsibility to ensure that the "
+"maintainer. Its the archive maintainer responsibility to ensure that the "
"archive integrity is correct."
msgstr ""
@@ -3969,8 +3969,8 @@ msgid ""
"maintainer signature is stripped off, an MD5 sum of the package is computed "
"and put in the Packages file. The MD5 sum of all of the packages files are "
"then computed and put into the Release file. The Release file is then signed "
-"by the archive key (which is created once a year) and distributed through "
-"the FTP server. This key is also on the Debian keyring."
+"by the archive key (which is created once a year and distributed through the "
+"FTP server. This key is also on the Debian keyring."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
@@ -4058,7 +4058,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#: apt-secure.8.xml:160
msgid ""
-"<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
+"<literal>Create a toplevel Release file</literal>. if it does not exist "
"already. You can do this by running <command>apt-ftparchive "
"release</command> (provided in apt-utils)."
msgstr ""
@@ -4066,14 +4066,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#: apt-secure.8.xml:165
msgid ""
-"<emphasis>Sign it</emphasis>. You can do this by running <command>gpg -abs "
-"-o Release.gpg Release</command>."
+"<literal>Sign it</literal>. You can do this by running <command>gpg -abs -o "
+"Release.gpg Release</command>."
msgstr ""
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#: apt-secure.8.xml:168
msgid ""
-"<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
+"<literal>Publish the key fingerprint</literal>, that way your users will "
"know what key they need to import in order to authenticate the files in the "
"archive."
msgstr ""
@@ -4211,9 +4211,9 @@ msgstr ""
#: apt.conf.5.xml:50
msgid ""
"The configuration file is organized in a tree with options organized into "
-"functional groups. Option specification is given with a double colon "
+"functional groups. option specification is given with a double colon "
"notation, for instance <literal>APT::Get::Assume-Yes</literal> is an option "
-"within the APT tool group, for the Get tool. Options do not inherit from "
+"within the APT tool group, for the Get tool. options do not inherit from "
"their parent groups."
msgstr ""
@@ -4224,13 +4224,13 @@ msgid ""
"such as bind and dhcp use. Lines starting with <literal>//</literal> are "
"treated as comments (ignored), as well as all text between "
"<literal>/*</literal> and <literal>*/</literal>, just like C/C++ comments. "
-"Each line is of the form <literal>APT::Get::Assume-Yes "
-"\"true\";</literal>. The trailing semicolon and the quotes are required. The "
-"value must be on one line, and there is no kind of string concatenation. It "
-"must not include inside quotes. The behavior of the backslash \"\\\" and "
-"escaped characters inside a value is undefined and it should not be used. An "
-"option name may include alphanumerical characters and the \"/-:._+\" "
-"characters. A new scope can be opened with curly braces, like:"
+"Each line is of the form <literal>APT::Get::Assume-Yes \"true\";</literal> "
+"The trailing semicolon and the quotes are required. The value must be on one "
+"line, and there is no kind of string concatenation. It must not include "
+"inside quotes. The behavior of the backslash \"\\\" and escaped characters "
+"inside a value is undefined and it should not be used. An option name may "
+"include alphanumerical characters and the \"/-:._+\" characters. A new scope "
+"can be opened with curly braces, like:"
msgstr ""
#. type: Content of: <refentry><refsect1><informalexample><programlisting>
@@ -4408,43 +4408,20 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:159
msgid ""
-"Defaults to on which will cause APT to install essential and important "
-"packages as fast as possible in the install/upgrade operation. This is done "
-"to limit the effect of a failing &dpkg; call: If this option is disabled APT "
-"does treat an important package in the same way as an extra package: Between "
-"the unpacking of the important package A and his configuration can then be "
-"many other unpack or configuration calls, e.g. for package B which has no "
-"relation to A, but causes the dpkg call to fail (e.g. because maintainer "
-"script of package B generates an error) which results in a system state in "
-"which package A is unpacked but unconfigured - each package depending on A "
-"is now no longer guaranteed to work as their dependency on A is not longer "
-"satisfied. The immediate configuration marker is also applied to all "
-"dependencies which can generate a problem if the dependencies e.g. form a "
-"circle as a dependency with the immediate flag is comparable with a "
-"Pre-Dependency. So in theory it is possible that APT encounters a situation "
-"in which it is unable to perform immediate configuration, error out and "
-"refers to this option so the user can deactivate the immediate configuration "
-"temporary to be able to perform an install/upgrade again. Note the use of "
-"the word \"theory\" here as this problem was only encountered by now in real "
-"world a few times in non-stable distribution versions and caused by wrong "
-"dependencies of the package in question or by a system in an already broken "
-"state, so you should not blindly disable this option as the mentioned "
-"scenario above is not the only problem immediate configuration can help to "
-"prevent in the first place. Before a big operation like "
-"<literal>dist-upgrade</literal> is run with this option disabled it should "
-"be tried to explicitly <literal>install</literal> the package APT is unable "
-"to configure immediately, but please make sure to report your problem also "
-"to your distribution and to the APT team with the buglink below so they can "
-"work on improving or correcting the upgrade process."
+"Disable Immediate Configuration; This dangerous option disables some of "
+"APT's ordering code to cause it to make fewer dpkg calls. Doing so may be "
+"necessary on some extremely slow single user systems but is very dangerous "
+"and may cause package install scripts to fail or worse. Use at your own "
+"risk."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:181
+#: apt.conf.5.xml:166
msgid "Force-LoopBreak"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:182
+#: apt.conf.5.xml:167
msgid ""
"Never Enable this option unless you -really- know what you are doing. It "
"permits APT to temporarily remove an essential package to break a "
@@ -4455,87 +4432,87 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:190
+#: apt.conf.5.xml:175
msgid "Cache-Limit"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:191
+#: apt.conf.5.xml:176
msgid ""
"APT uses a fixed size memory mapped cache file to store the 'available' "
"information. This sets the size of that cache (in bytes)."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:195
+#: apt.conf.5.xml:180
msgid "Build-Essential"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:196
+#: apt.conf.5.xml:181
msgid "Defines which package(s) are considered essential build dependencies."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:184
msgid "Get"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:200
+#: apt.conf.5.xml:185
msgid ""
"The Get subsection controls the &apt-get; tool, please see its documentation "
"for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:204
+#: apt.conf.5.xml:189
msgid "Cache"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:205
+#: apt.conf.5.xml:190
msgid ""
"The Cache subsection controls the &apt-cache; tool, please see its "
"documentation for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:209
+#: apt.conf.5.xml:194
msgid "CDROM"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:210
+#: apt.conf.5.xml:195
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool, please see its "
"documentation for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:216
+#: apt.conf.5.xml:201
msgid "The Acquire Group"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:206
msgid "PDiffs"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:222
+#: apt.conf.5.xml:207
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for Packages or "
"Sources files instead of downloading whole ones. True by default."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:227
+#: apt.conf.5.xml:212
msgid "Queue-Mode"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:228
+#: apt.conf.5.xml:213
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of "
"<literal>host</literal> or <literal>access</literal> which determines how "
@@ -4545,36 +4522,36 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:235
+#: apt.conf.5.xml:220
msgid "Retries"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:221
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:240
+#: apt.conf.5.xml:225
msgid "Source-Symlinks"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:241
+#: apt.conf.5.xml:226
msgid ""
"Use symlinks for source archives. If set to true then source archives will "
"be symlinked when possible instead of copying. True is the default."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:245 sources.list.5.xml:139
+#: apt.conf.5.xml:230 sources.list.5.xml:139
msgid "http"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:246
+#: apt.conf.5.xml:231
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 "
@@ -4586,7 +4563,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:254
+#: apt.conf.5.xml:239
msgid ""
"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
"caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@ -4600,7 +4577,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:264 apt.conf.5.xml:321
+#: apt.conf.5.xml:249 apt.conf.5.xml:306
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method, this applies to all things including connection timeout and data "
@@ -4608,10 +4585,10 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:267
+#: apt.conf.5.xml:252
msgid ""
"One setting is provided to control the pipeline depth in cases where the "
-"remote server is not RFC conforming or buggy (such as Squid 2.0.2). "
+"remote server is not RFC conforming or buggy (such as Squid 2.0.2) "
"<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to 5 "
"indicating how many outstanding requests APT should send. A value of zero "
"MUST be specified if the remote host does not properly linger on TCP "
@@ -4620,7 +4597,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:275
+#: apt.conf.5.xml:260
msgid ""
"The used bandwidth can be limited with "
"<literal>Acquire::http::Dl-Limit</literal> which accepts integer values in "
@@ -4630,12 +4607,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:281
+#: apt.conf.5.xml:266
msgid "https"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:282
+#: apt.conf.5.xml:267
msgid ""
"HTTPS URIs. Cache-control and proxy options are the same as for "
"<literal>http</literal> method. <literal>Pipeline-Depth</literal> option is "
@@ -4643,7 +4620,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:286
+#: apt.conf.5.xml:271
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -4665,12 +4642,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:304 sources.list.5.xml:150
+#: apt.conf.5.xml:289 sources.list.5.xml:150
msgid "ftp"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:305
+#: apt.conf.5.xml:290
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 "
@@ -4690,7 +4667,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:324
+#: apt.conf.5.xml:309
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 "
@@ -4700,7 +4677,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#: apt.conf.5.xml:316
msgid ""
"It is possible to proxy FTP over HTTP by setting the "
"<envar>ftp_proxy</envar> environment variable to a http url - see the "
@@ -4710,7 +4687,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:336
+#: apt.conf.5.xml:321
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4720,18 +4697,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:343 sources.list.5.xml:132
+#: apt.conf.5.xml:328 sources.list.5.xml:132
msgid "cdrom"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:349
+#: apt.conf.5.xml:334
#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:344
+#: apt.conf.5.xml:329
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 "
@@ -4744,12 +4721,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:354
+#: apt.conf.5.xml:339
msgid "gpgv"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:355
+#: apt.conf.5.xml:340
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
@@ -4757,12 +4734,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:360
+#: apt.conf.5.xml:345
msgid "CompressionTypes"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:366
+#: apt.conf.5.xml:351
#, no-wrap
msgid ""
"Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> "
@@ -4770,7 +4747,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:361
+#: apt.conf.5.xml:346
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -4782,19 +4759,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:371
+#: apt.conf.5.xml:356
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:374
+#: apt.conf.5.xml:359
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:352
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 "
@@ -4811,13 +4788,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:378
+#: apt.conf.5.xml:363
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:376
+#: apt.conf.5.xml:361
msgid ""
"Note that at run time the "
"<literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will be "
@@ -4832,7 +4809,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:383
+#: apt.conf.5.xml:368
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 "
@@ -4842,7 +4819,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:217
+#: apt.conf.5.xml:202
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages and the URI handlers. <placeholder type=\"variablelist\" "
@@ -4850,12 +4827,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:392
+#: apt.conf.5.xml:377
msgid "Directories"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:394
+#: apt.conf.5.xml:379
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -4867,7 +4844,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:401
+#: apt.conf.5.xml:386
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4880,7 +4857,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:410
+#: apt.conf.5.xml:395
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4890,7 +4867,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:416
+#: apt.conf.5.xml:401
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 "
@@ -4898,7 +4875,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:405
msgid ""
"Binary programs are pointed to by "
"<literal>Dir::Bin</literal>. <literal>Dir::Bin::Methods</literal> specifies "
@@ -4910,7 +4887,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:428
+#: apt.conf.5.xml:413
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4923,12 +4900,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:441
+#: apt.conf.5.xml:426
msgid "APT in DSelect"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:443
+#: apt.conf.5.xml:428
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -4936,12 +4913,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:447
+#: apt.conf.5.xml:432
msgid "Clean"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:448
+#: apt.conf.5.xml:433
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 "
@@ -4952,50 +4929,50 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:457
+#: apt.conf.5.xml:442
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:461
+#: apt.conf.5.xml:446
msgid "Updateoptions"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:462
+#: apt.conf.5.xml:447
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:466
+#: apt.conf.5.xml:451
msgid "PromptAfterUpdate"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:467
+#: apt.conf.5.xml:452
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:473
+#: apt.conf.5.xml:458
msgid "How APT calls dpkg"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:474
+#: apt.conf.5.xml:459
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:479
+#: apt.conf.5.xml:464
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 "
@@ -5003,17 +4980,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:484
+#: apt.conf.5.xml:469
msgid "Pre-Invoke"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:484
+#: apt.conf.5.xml:469
msgid "Post-Invoke"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:485
+#: apt.conf.5.xml:470
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 "
@@ -5022,12 +4999,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:491
+#: apt.conf.5.xml:476
msgid "Pre-Install-Pkgs"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:492
+#: apt.conf.5.xml:477
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 "
@@ -5037,7 +5014,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:498
+#: apt.conf.5.xml:483
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -5048,36 +5025,36 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:505
+#: apt.conf.5.xml:490
msgid "Run-Directory"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:506
+#: apt.conf.5.xml:491
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:510
+#: apt.conf.5.xml:495
msgid "Build-options"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:511
+#: apt.conf.5.xml:496
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:516
+#: apt.conf.5.xml:501
msgid "dpkg trigger usage (and related options)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:502
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 "
@@ -5092,7 +5069,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:532
+#: apt.conf.5.xml:517
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -5102,7 +5079,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:526
+#: apt.conf.5.xml:511
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 "
@@ -5116,29 +5093,29 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:523
msgid "DPkg::NoTriggers"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:524
msgid ""
-"Add the no triggers flag to all dpkg calls (except the ConfigurePending "
+"Add the no triggers flag to all dpkg calls (expect the ConfigurePending "
"call). See &dpkg; if you are interested in what this actually means. In "
-"short: dpkg will not run the triggers when this flag is present unless it is "
-"explicitly called to do so in an extra call. Note that this option exists "
+"short: dpkg will not run the triggers then this flag is present unless it is "
+"explicit called to do so in an extra call. Note that this option exists "
"(undocumented) also in older apt versions with a slightly different meaning: "
"Previously these option only append --no-triggers to the configure calls to "
"dpkg - now apt will add these flag also to the unpack and remove calls."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:546
+#: apt.conf.5.xml:531
msgid "PackageManager::Configure"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:547
+#: apt.conf.5.xml:532
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
@@ -5147,37 +5124,37 @@ msgid ""
"to be configured before another package can be unpacked (Pre-Depends) and "
"let the rest configure by dpkg with a call generated by the next "
"option. \"<literal>no</literal>\" on the other hand will not configure "
-"anything and totally rely on dpkg for configuration (which will at the "
+"anything and totally relay on dpkg for configuration (which will at the "
"moment fail if a Pre-Depends is encountered). Setting this option to "
-"another than the all value will implicitly activate also the next option per "
+"another than the all value will implicit activate also the next option per "
"default as otherwise the system could end in an unconfigured status which "
"could be unbootable!"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:557
+#: apt.conf.5.xml:542
msgid "DPkg::ConfigurePending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:558
+#: apt.conf.5.xml:543
msgid ""
"If this option is set apt will call <command>dpkg --configure "
"--pending</command> to let dpkg handle all required configurations and "
"triggers. This option is activated automatic per default if the previous "
"option is not set to <literal>all</literal>, but deactivating could be "
"useful if you want to run APT multiple times in a row - e.g. in an "
-"installer. In these sceneries you could deactivate this option in all but "
-"the last run."
+"installer. In this sceneries you could deactivate this option in all but the "
+"last run."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:564
+#: apt.conf.5.xml:549
msgid "DPkg::TriggersPending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:565
+#: apt.conf.5.xml:550
msgid ""
"Useful for <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -5187,12 +5164,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:570
+#: apt.conf.5.xml:555
msgid "PackageManager::UnpackAll"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:571
+#: apt.conf.5.xml:556
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 "
@@ -5204,12 +5181,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:578
+#: apt.conf.5.xml:563
msgid "OrderList::Score::Immediate"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:586
+#: apt.conf.5.xml:571
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -5221,7 +5198,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:579
+#: apt.conf.5.xml:564
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 "
@@ -5235,12 +5212,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:599
+#: apt.conf.5.xml:584
msgid "Periodic and Archives options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:600
+#: apt.conf.5.xml:585
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -5249,12 +5226,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:608
+#: apt.conf.5.xml:593
msgid "Debug options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:610
+#: apt.conf.5.xml:595
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -5265,7 +5242,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:621
+#: apt.conf.5.xml:606
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, "
@@ -5273,7 +5250,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:629
+#: apt.conf.5.xml:614
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s "
@@ -5281,7 +5258,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:638
+#: apt.conf.5.xml:623
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -5291,110 +5268,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:646
+#: apt.conf.5.xml:631
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:656
+#: apt.conf.5.xml:641
msgid "A full list of debugging options to apt follows."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:646
msgid "<literal>Debug::Acquire::cdrom</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:665
+#: apt.conf.5.xml:650
msgid "Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:672
+#: apt.conf.5.xml:657
msgid "<literal>Debug::Acquire::ftp</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:676
+#: apt.conf.5.xml:661
msgid "Print information related to downloading packages using FTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:683
+#: apt.conf.5.xml:668
msgid "<literal>Debug::Acquire::http</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:687
+#: apt.conf.5.xml:672
msgid "Print information related to downloading packages using HTTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:694
+#: apt.conf.5.xml:679
msgid "<literal>Debug::Acquire::https</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:698
+#: apt.conf.5.xml:683
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:690
msgid "<literal>Debug::Acquire::gpgv</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:709
+#: apt.conf.5.xml:694
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:716
+#: apt.conf.5.xml:701
msgid "<literal>Debug::aptcdrom</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:720
+#: apt.conf.5.xml:705
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:727
+#: apt.conf.5.xml:712
msgid "<literal>Debug::BuildDeps</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:730
+#: apt.conf.5.xml:715
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:722
msgid "<literal>Debug::Hashes</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:740
+#: apt.conf.5.xml:725
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:747
+#: apt.conf.5.xml:732
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:750
+#: apt.conf.5.xml:735
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 "
@@ -5402,92 +5379,92 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:743
msgid "<literal>Debug::NoLocking</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:761
+#: apt.conf.5.xml:746
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:769
+#: apt.conf.5.xml:754
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:773
+#: apt.conf.5.xml:758
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:780
+#: apt.conf.5.xml:765
msgid "<literal>Debug::pkgAcquire::Auth</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:783
+#: apt.conf.5.xml:768
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:790
+#: apt.conf.5.xml:775
msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:793
+#: apt.conf.5.xml:778
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:801
+#: apt.conf.5.xml:786
msgid "<literal>Debug::pkgAcquire::RRed</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:805
+#: apt.conf.5.xml:790
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:812
+#: apt.conf.5.xml:797
msgid "<literal>Debug::pkgAcquire::Worker</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:816
+#: apt.conf.5.xml:801
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:823
+#: apt.conf.5.xml:808
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:827
+#: apt.conf.5.xml:812
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:834
+#: apt.conf.5.xml:819
msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:837
+#: apt.conf.5.xml:822
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial "
@@ -5497,12 +5474,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:848
+#: apt.conf.5.xml:833
msgid "<literal>Debug::pkgDepCache::Marker</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:851
+#: apt.conf.5.xml:836
msgid ""
"Generate debug messages describing which package is marked as "
"keep/install/remove while the ProblemResolver does his work. Each addition "
@@ -5520,90 +5497,90 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:870
+#: apt.conf.5.xml:855
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:873
+#: apt.conf.5.xml:858
msgid "Dump the default configuration to standard error on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:880
+#: apt.conf.5.xml:865
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:883
+#: apt.conf.5.xml:868
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:891
+#: apt.conf.5.xml:876
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:894
+#: apt.conf.5.xml:879
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:901
+#: apt.conf.5.xml:886
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:905
+#: apt.conf.5.xml:890
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:913
+#: apt.conf.5.xml:898
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:917
+#: apt.conf.5.xml:902
msgid "Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:924
+#: apt.conf.5.xml:909
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:928
+#: apt.conf.5.xml:913
msgid "Output the priority of each package list on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:934
+#: apt.conf.5.xml:919
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:938
+#: apt.conf.5.xml:923
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:946
+#: apt.conf.5.xml:931
msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:949
+#: apt.conf.5.xml:934
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 "
@@ -5611,32 +5588,32 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:957
+#: apt.conf.5.xml:942
msgid "<literal>Debug::sourceList</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:961
+#: apt.conf.5.xml:946
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:983
+#: apt.conf.5.xml:968
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:990
+#: apt.conf.5.xml:975
msgid "&file-aptconf;"
msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:995
+#: apt.conf.5.xml:980
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr ""
@@ -6552,7 +6529,7 @@ msgid ""
"The package resource list is used to locate archives of the package "
"distribution system in use on the system. At this time, this manual page "
"documents only the packaging system used by the Debian GNU/Linux system. "
-"This control file is <filename>/etc/apt/sources.list</filename>."
+"This control file is located in <filename>/etc/apt/sources.list</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
@@ -6562,7 +6539,7 @@ msgid ""
"variety of source media. The file lists one source per line, with the most "
"preferred source listed first. The format of each line is: <literal>type uri "
"args</literal> The first item, <literal>type</literal> determines the format "
-"for <literal>args</literal>. <literal>uri</literal> is a Universal Resource "
+"for <literal>args</literal> <literal>uri</literal> is a Universal Resource "
"Identifier (URI), which is a superset of the more specific and well-known "
"Universal Resource Locator, or URL. The rest of the line can be marked as a "
"comment by using a #."
@@ -6598,7 +6575,7 @@ msgid ""
"<literal>stable</literal> <literal>unstable</literal> or "
"<literal>testing</literal> while component is one of <literal>main</literal> "
"<literal>contrib</literal> <literal>non-free</literal> or "
-"<literal>non-us</literal>. The <literal>deb-src</literal> type describes a "
+"<literal>non-us</literal> The <literal>deb-src</literal> type describes a "
"debian distribution's source code in the same form as the "
"<literal>deb</literal> type. A <literal>deb-src</literal> line is required "
"to fetch source indexes."
@@ -6608,7 +6585,7 @@ msgstr ""
#: sources.list.5.xml:73
msgid ""
"The format for a <filename>sources.list</filename> entry using the "
-"<literal>deb</literal> and <literal>deb-src</literal> types is:"
+"<literal>deb</literal> and <literal>deb-src</literal> types are:"
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
@@ -6624,8 +6601,8 @@ msgid ""
"Debian distribution, from which APT will find the information it needs. "
"<literal>distribution</literal> can specify an exact path, in which case the "
"components must be omitted and <literal>distribution</literal> must end with "
-"a slash (/). This is useful for when the case only a particular sub-section "
-"of the archive denoted by the URI is of interest. If "
+"a slash (/). This is useful for when only a particular sub-section of the "
+"archive denoted by the URI is of interest. If "
"<literal>distribution</literal> does not specify an exact path, at least one "
"<literal>component</literal> must be present."
msgstr ""
@@ -6713,7 +6690,7 @@ msgid ""
"variable <envar>http_proxy</envar> is set with the format "
"http://server:port/, the proxy server specified in <envar>http_proxy</envar> "
"will be used. Users of authenticated HTTP/1.1 proxies may use a string of "
-"the format http://user:pass@server:port/. Note that this is an insecure "
+"the format http://user:pass@server:port/ Note that this is an insecure "
"method of authentication."
msgstr ""
@@ -6762,25 +6739,6 @@ msgid ""
"file transfers from the remote."
msgstr ""
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:178
-msgid "more recongnizable URI types"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:180
-msgid ""
-"APT can be extended with more methods shipped in other optional packages "
-"which should follow the nameing scheme "
-"<literal>apt-transport-<replaceable>method</replaceable></literal>. The APT "
-"team e.g. maintain also the <literal>apt-transport-https</literal> package "
-"which provides access methods for https-URIs with features similiar to the "
-"http method, but other methods for using e.g. debtorrent are also available, "
-"see <citerefentry> "
-"<refentrytitle><filename>apt-transport-debtorrent</filename></refentrytitle> "
-"<manvolnum>1</manvolnum></citerefentry>."
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:122
msgid ""
@@ -6789,90 +6747,91 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:194
+#: sources.list.5.xml:182
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:196
+#: sources.list.5.xml:184
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:198
+#: sources.list.5.xml:186
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:199
+#: sources.list.5.xml:187
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:201
+#: sources.list.5.xml:189
msgid "Source line for the above"
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:202
+#: sources.list.5.xml:190
#, no-wrap
msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:204
+#: sources.list.5.xml:192
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:194
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:208
+#: sources.list.5.xml:196
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the stable/contrib area."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:210
+#: sources.list.5.xml:198
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian stable contrib"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:212
+#: sources.list.5.xml:200
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
-"well as the one in the previous example in <filename>sources.list</filename> "
-"a single FTP session will be used for both resource lines."
+"well as the one in the previous example in "
+"<filename>sources.list</filename>. a single FTP session will be used for "
+"both resource lines."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:216
+#: sources.list.5.xml:204
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:218
+#: sources.list.5.xml:206
msgid ""
"Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US "
"directory."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:208
#, no-wrap
msgid ""
"deb http://nonus.debian.org/debian-non-US stable/non-US main contrib "
@@ -6880,13 +6839,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:229
+#: sources.list.5.xml:217
#, no-wrap
msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:210
msgid ""
"Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US "
"directory, and uses only files found under "
@@ -6898,1067 +6857,6 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:234
+#: sources.list.5.xml:222
msgid "&apt-cache; &apt-conf;"
msgstr ""
-
-#. type: <title></title>
-#: guide.sgml:4
-msgid "APT User's Guide"
-msgstr ""
-
-#. type: <author></author>
-#: guide.sgml:6 offline.sgml:6
-msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
-msgstr ""
-
-#. type: <version></version>
-#: guide.sgml:7
-msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
-msgstr ""
-
-#. type: <abstract></abstract>
-#: guide.sgml:11
-msgid ""
-"This document provides an overview of how to use the the APT package "
-"manager."
-msgstr ""
-
-#. type: <copyrightsummary></copyrightsummary>
-#: guide.sgml:15
-msgid "Copyright &copy; Jason Gunthorpe, 1998."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:21 offline.sgml:22
-msgid ""
-"\"APT\" and this document are free software; you can redistribute them "
-"and/or modify them under the terms of the GNU General Public License as "
-"published by the Free Software Foundation; either version 2 of the License, "
-"or (at your option) any later version."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:24 offline.sgml:25
-msgid ""
-"For more details, on Debian GNU/Linux systems, see the file "
-"/usr/share/common-licenses/GPL for the full license."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:32
-msgid "General"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:38
-msgid ""
-"The APT package currently contains two sections, the APT "
-"<prgn>dselect</prgn> method and the <prgn>apt-get</prgn> command line user "
-"interface. Both provide a way to install and remove packages as well as "
-"download new packages from the Internet."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:39
-msgid "Anatomy of the Package System"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:44
-msgid ""
-"The Debian packaging system has a large amount of information associated "
-"with each package to help assure that it integrates cleanly and easily into "
-"the system. The most prominent of its features is the dependency system."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:52
-msgid ""
-"The dependency system allows individual programs to make use of shared "
-"elements in the system such as libraries. It simplifies placing infrequently "
-"used portions of a program in separate packages to reduce the number of "
-"things the average user is required to install. Also, it allows for choices "
-"in mail transport agents, X servers and so on."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:57
-msgid ""
-"The first step to understanding the dependency system is to grasp the "
-"concept of a simple dependency. The meaning of a simple dependency is that a "
-"package requires another package to be installed at the same time to work "
-"properly."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:63
-msgid ""
-"For instance, mailcrypt is an emacs extension that aids in encrypting email "
-"with GPG. Without GPGP installed mail-crypt is useless, so mailcrypt has a "
-"simple dependency on GPG. Also, because it is an emacs extension it has a "
-"simple dependency on emacs, without emacs it is completely useless."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:73
-msgid ""
-"The other important dependency to understand is a conflicting dependency. It "
-"means that a package, when installed with another package, will not work and "
-"may possibly be extremely harmful to the system. As an example consider a "
-"mail transport agent such as sendmail, exim or qmail. It is not possible to "
-"have two mail transport agents installed because both need to listen to the "
-"network to receive mail. Attempting to install two will seriously damage the "
-"system so all mail transport agents have a conflicting dependency with all "
-"other mail transport agents."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:83
-msgid ""
-"As an added complication there is the possibility for a package to pretend "
-"to be another package. Consider that exim and sendmail for many intents are "
-"identical, they both deliver mail and understand a common interface. Hence, "
-"the package system has a way for them to declare that they are both "
-"mail-transport-agents. So, exim and sendmail both declare that they provide "
-"a mail-transport-agent and other packages that need a mail transport agent "
-"depend on mail-transport-agent. This can add a great deal of confusion when "
-"trying to manually fix packages."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:88
-msgid ""
-"At any given time a single dependency may be met by packages that are "
-"already installed or it may not be. APT attempts to help resolve dependency "
-"issues by providing a number of automatic algorithms that help in selecting "
-"packages for installation."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:102
-msgid ""
-"<prgn>apt-get</prgn> provides a simple way to install packages from the "
-"command line. Unlike <prgn>dpkg</prgn>, <prgn>apt-get</prgn> does not "
-"understand .deb files, it works with the package's proper name and can only "
-"install .deb archives from a <em>Source</em>."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:109
-msgid ""
-"The first <footnote><p>If you are using an http proxy server you must set "
-"the http_proxy environment variable first, see "
-"sources.list(5)</p></footnote> thing that should be done before using "
-"<prgn>apt-get</prgn> is to fetch the package lists from the <em>Sources</em> "
-"so that it knows what packages are available. This is done with <tt>apt-get "
-"update</tt>. For instance,"
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:116
-#, no-wrap
-msgid ""
-"# apt-get update\n"
-"Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
-"Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
-"Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
-msgstr ""
-
-#. type: <p><taglist>
-#: guide.sgml:120
-msgid "Once updated there are several commands that can be used:"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:131
-msgid ""
-"Upgrade will attempt to gently upgrade the whole system. Upgrade will never "
-"install a new package or remove an existing package, nor will it ever "
-"upgrade a package that might cause some other package to break. This can be "
-"used daily to relatively safely upgrade the system. Upgrade will list all of "
-"the packages that it could not upgrade, this usually means that they depend "
-"on new packages or conflict with some other package. <prgn>dselect</prgn> or "
-"<tt>apt-get install</tt> can be used to force these packages to install."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:140
-msgid ""
-"Install is used to install packages by name. The package is automatically "
-"fetched and installed. This can be useful if you already know the name of "
-"the package to install and do not want to go into a GUI to select it. Any "
-"number of packages may be passed to install, they will all be "
-"fetched. Install automatically attempts to resolve dependency problems with "
-"the listed packages and will print a summary and ask for confirmation if "
-"anything other than its arguments are changed."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:149
-msgid ""
-"Dist-upgrade is a complete upgrader designed to simplify upgrading between "
-"releases of Debian. It uses a sophisticated algorithm to determine the best "
-"set of packages to install, upgrade and remove to get as much of the system "
-"to the newest release. In some situations it may be desired to use "
-"dist-upgrade rather than spend the time manually resolving dependencies in "
-"<prgn>dselect</prgn>. Once dist-upgrade has completed then "
-"<prgn>dselect</prgn> can be used to install any packages that may have been "
-"left out."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:152
-msgid ""
-"It is important to closely look at what dist-upgrade is going to do, its "
-"decisions may sometimes be quite surprising."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:163
-msgid ""
-"<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
-"option is <tt>-d</tt> which does not install the fetched files. If the "
-"system has to download a large number of package it would be undesired to "
-"start installing them in case something goes wrong. When <tt>-d</tt> is used "
-"the downloaded archives can be installed by simply running the command that "
-"caused them to be downloaded again without <tt>-d</tt>."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:168
-msgid "DSelect"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:173
-msgid ""
-"The APT <prgn>dselect</prgn> method provides the complete APT system with "
-"the <prgn>dselect</prgn> package selection GUI. <prgn>dselect</prgn> is used "
-"to select the packages to be installed or removed and APT actually installs "
-"them."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:184
-msgid ""
-"To enable the APT method you need to to select [A]ccess in "
-"<prgn>dselect</prgn> and then choose the APT method. You will be prompted "
-"for a set of <em>Sources</em> which are places to fetch archives from. These "
-"can be remote Internet sites, local Debian mirrors or CDROMs. Each source "
-"can provide a fragment of the total Debian archive, APT will automatically "
-"combine them to form a complete set of packages. If you have a CDROM then it "
-"is a good idea to specify it first and then specify a mirror so that you "
-"have access to the latest bug fixes. APT will automatically use packages on "
-"your CDROM before downloading from the Internet."
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:198
-#, no-wrap
-msgid ""
-" Set up a list of distribution source locations\n"
-"\t \n"
-" Please give the base URL of the debian distribution.\n"
-" The access schemes I know about are: http file\n"
-"\t \n"
-" For example:\n"
-" file:/mnt/debian,\n"
-" ftp://ftp.debian.org/debian,\n"
-" http://ftp.de.debian.org/debian,\n"
-" \n"
-" \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:205
-msgid ""
-"The <em>Sources</em> setup starts by asking for the base of the Debian "
-"archive, defaulting to a HTTP mirror. Next it asks for the distribution to "
-"get."
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:212
-#, no-wrap
-msgid ""
-" Please give the distribution tag to get or a path to the\n"
-" package file ending in a /. The distribution\n"
-" tags are typically something like: stable unstable testing non-US\n"
-" \n"
-" Distribution [stable]:"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:222
-msgid ""
-"The distribution refers to the Debian version in the archive, "
-"<em>stable</em> refers to the latest released version and <em>unstable</em> "
-"refers to the developmental version. <em>non-US</em> is only available on "
-"some mirrors and refers to packages that contain encryption technology or "
-"other things that cannot be exported from the United States. Importing these "
-"packages into the US is legal however."
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:228
-#, no-wrap
-msgid ""
-" Please give the components to get\n"
-" The components are typically something like: main contrib non-free\n"
-" \n"
-" Components [main contrib non-free]:"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:236
-msgid ""
-"The components list refers to the list of sub distributions to fetch. The "
-"distribution is split up based on software licenses, main being DFSG free "
-"packages while contrib and non-free contain things that have various "
-"restrictions placed on their use and distribution."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:240
-msgid ""
-"Any number of sources can be added, the setup script will continue to prompt "
-"until you have specified all that you want."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:247
-msgid ""
-"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a super-set of "
-"<tt>apt-get update</tt> that makes the fetched information available to "
-"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get "
-"update</tt> has been run before."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:253
-msgid ""
-"You can then go on and make your selections using [S]elect and then perform "
-"the installation using [I]nstall. When using the APT method the [C]onfig and "
-"[R]emove commands have no meaning, the [I]nstall command performs both of "
-"them together."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:258
-msgid ""
-"By default APT will automatically remove the package (.deb) files once they "
-"have been successfully installed. To change this behavior place "
-"<tt>Dselect::clean \"prompt\";</tt> in /etc/apt/apt.conf."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:264
-msgid "The Interface"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:278
-msgid ""
-"Both that APT <prgn>dselect</prgn> method and <prgn>apt-get</prgn> share the "
-"same interface. It is a simple system that generally tells you what it will "
-"do and then goes and does it. <footnote><p>The <prgn>dselect</prgn> method "
-"actually is a set of wrapper scripts to <prgn>apt-get</prgn>. The method "
-"actually provides more functionality than is present in <prgn>apt-get</prgn> "
-"alone.</p></footnote> After printing out a summary of what will happen APT "
-"then will print out some informative status messages so that you can "
-"estimate how far along it is and how much is left to do."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:280
-msgid "Startup"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:284
-msgid ""
-"Before all operations except update, APT performs a number of actions to "
-"prepare its internal state. It also does some checks of the system's "
-"state. At any time these operations can be performed by running <tt>apt-get "
-"check</tt>."
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:289
-#, no-wrap
-msgid ""
-"# apt-get check\n"
-"Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:297
-msgid ""
-"The first thing it does is read all the package files into memory. APT uses "
-"a caching scheme so this operation will be faster the second time it is "
-"run. If some of the package files are not found then they will be ignored "
-"and a warning will be printed when apt-get exits."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:303
-msgid ""
-"The final operation performs a detailed analysis of the system's "
-"dependencies. It checks every dependency of every installed or unpacked "
-"package and considers if it is OK. Should this find a problem then a report "
-"will be printed out and <prgn>apt-get</prgn> will refuse to run."
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:320
-#, no-wrap
-msgid ""
-"# apt-get check\n"
-"Reading Package Lists... Done\n"
-"Building Dependency Tree... Done\n"
-"You might want to run apt-get -f install' to correct these.\n"
-"Sorry, but the following packages have unmet dependencies:\n"
-" 9fonts: Depends: xlib6g but it is not installed\n"
-" uucp: Depends: mailx but it is not installed\n"
-" blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n"
-" adduser: Depends: perl-base but it is not installed\n"
-" aumix: Depends: libgpmg1 but it is not installed\n"
-" debiandoc-sgml: Depends: sgml-base but it is not installed\n"
-" bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
-" cthugha: Depends: svgalibg1 but it is not installed\n"
-" Depends: xlib6g (>= 3.3-5) but it is not installed\n"
-" libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:329
-msgid ""
-"In this example the system has many problems, including a serious problem "
-"with libreadlineg2. For each package that has unmet dependencies a line is "
-"printed out indicating the package with the problem and the dependencies "
-"that are unmet. A short explanation of why the package has a dependency "
-"problem is also included."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:337
-msgid ""
-"There are two ways a system can get into a broken state like this. The first "
-"is caused by <prgn>dpkg</prgn> missing some subtle relationships between "
-"packages when performing upgrades. <footnote><p>APT however considers all "
-"known dependencies and attempts to prevent broken "
-"packages</p></footnote>. The second is if a package installation fails "
-"during an operation. In this situation a package may have been unpacked "
-"without its dependents being installed."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:345
-msgid ""
-"The second situation is much less serious than the first because APT places "
-"certain constraints on the order that packages are installed. In both cases "
-"supplying the <tt>-f</tt> option to <prgn>apt-get</prgn> will cause APT to "
-"deduce a possible solution to the problem and then continue on. The APT "
-"<prgn>dselect</prgn> method always supplies the <tt>-f</tt> option to allow "
-"for easy continuation of failed maintainer scripts."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:351
-msgid ""
-"However, if the <tt>-f</tt> option is used to correct a seriously broken "
-"system caused by the first case then it is possible that it will either fail "
-"immediately or the installation sequence will fail. In either case it is "
-"necessary to manually use dpkg (possibly with forcing options) to correct "
-"the situation enough to allow APT to proceed."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:356
-msgid "The Status Report"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:363
-msgid ""
-"Before proceeding <prgn>apt-get</prgn> will present a report on what will "
-"happen. Generally the report reflects the type of operation being performed "
-"but there are several common elements. In all cases the lists reflect the "
-"final state of things, taking into account the <tt>-f</tt> option and any "
-"other relevant activities to the command being executed."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:364
-msgid "The Extra Package list"
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:372
-#, no-wrap
-msgid ""
-"The following extra packages will be installed:\n"
-" libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n"
-" mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
-" bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
-" squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-" ssh"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:379
-msgid ""
-"The Extra Package list shows all of the packages that will be installed or "
-"upgraded in excess of the ones mentioned on the command line. It is only "
-"generated for an <tt>install</tt> command. The listed packages are often the "
-"result of an Auto Install."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:382
-msgid "The Packages to Remove"
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:389
-#, no-wrap
-msgid ""
-"The following packages will be REMOVED:\n"
-" xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
-" xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
-" xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-" nas xpilot xfig"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:399
-msgid ""
-"The Packages to Remove list shows all of the packages that will be removed "
-"from the system. It can be shown for any of the operations and should be "
-"given a careful inspection to ensure nothing important is to be taken "
-"off. The <tt>-f</tt> option is especially good at generating packages to "
-"remove so extreme care should be used in that case. The list may contain "
-"packages that are going to be removed because they are only partially "
-"installed, possibly due to an aborted installation."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:402
-msgid "The New Packages list"
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:406
-#, no-wrap
-msgid ""
-"The following NEW packages will installed:\n"
-" zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:411
-msgid ""
-"The New Packages list is simply a reminder of what will happen. The packages "
-"listed are not presently installed in the system but will be when APT is "
-"done."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:414
-msgid "The Kept Back list"
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:419
-#, no-wrap
-msgid ""
-"The following packages have been kept back\n"
-" compface man-db tetex-base msql libpaper svgalib1\n"
-" gs snmp arena lynx xpat2 groff xscreensaver"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:428
-msgid ""
-"Whenever the whole system is being upgraded there is the possibility that "
-"new versions of packages cannot be installed because they require new things "
-"or conflict with already installed things. In this case the package will "
-"appear in the Kept Back list. The best way to convince packages listed there "
-"to install is with <tt>apt-get install</tt> or by using <prgn>dselect</prgn> "
-"to resolve their problems."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:431
-msgid "Held Packages warning"
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:435
-#, no-wrap
-msgid ""
-"The following held packages will be changed:\n"
-" cvs"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:441
-msgid ""
-"Sometimes you can ask APT to install a package that is on hold, in such a "
-"case it prints out a warning that the held package is going to be "
-"changed. This should only happen during dist-upgrade or install."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:444
-msgid "Final summary"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:447
-msgid "Finally, APT will print out a summary of all the changes that will occur."
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:452
-#, no-wrap
-msgid ""
-"206 packages upgraded, 8 newly installed, 23 to remove and 51 not "
-"upgraded.\n"
-"12 packages not fully installed or removed.\n"
-"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:470
-msgid ""
-"The first line of the summary simply is a reduced version of all of the "
-"lists and includes the number of upgrades - that is packages already "
-"installed that have new versions available. The second line indicates the "
-"number of poorly configured packages, possibly the result of an aborted "
-"installation. The final line shows the space requirements that the "
-"installation needs. The first pair of numbers refer to the size of the "
-"archive files. The first number indicates the number of bytes that must be "
-"fetched from remote locations and the second indicates the total size of all "
-"the archives required. The next number indicates the size difference between "
-"the presently installed packages and the newly installed packages. It is "
-"roughly equivalent to the space required in /usr after everything is "
-"done. If a large number of packages are being removed then the value may "
-"indicate the amount of space that will be freed."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:473
-msgid ""
-"Some other reports can be generated by using the -u option to show packages "
-"to upgrade, they are similar to the previous examples."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:477
-msgid "The Status Display"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:481
-msgid ""
-"During the download of archives and package files APT prints out a series of "
-"status messages."
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:490
-#, no-wrap
-msgid ""
-"# apt-get update\n"
-"Get:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"
-"Get:2 http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
-"Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
-"Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ "
-"Packages\n"
-"Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:500
-msgid ""
-"The lines starting with <em>Get</em> are printed out when APT begins to "
-"fetch a file while the last line indicates the progress of the download. The "
-"first percent value on the progress line indicates the total percent done of "
-"all files. Unfortunately since the size of the Package files is unknown "
-"<tt>apt-get update</tt> estimates the percent done which causes some "
-"inaccuracies."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:509
-msgid ""
-"The next section of the status line is repeated once for each download "
-"thread and indicates the operation being performed and some useful "
-"information about what is happening. Sometimes this section will simply read "
-"<em>Forking</em> which means the OS is loading the download module. The "
-"first word after the [ is the fetch number as shown on the history "
-"lines. The next word is the short form name of the object being "
-"downloaded. For archives it will contain the name of the package that is "
-"being fetched."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:524
-msgid ""
-"Inside of the single quote is an informative string indicating the progress "
-"of the negotiation phase of the download. Typically it progresses from "
-"<em>Connecting</em> to <em>Waiting for file</em> to <em>Downloading</em> or "
-"<em>Resuming</em>. The final value is the number of bytes downloaded from "
-"the remote site. Once the download begins this is represented as "
-"<tt>102/10.2k</tt> indicating that 102 bytes have been fetched and 10.2 "
-"kilobytes is expected. The total size is always shown in 4 figure notation "
-"to preserve space. After the size display is a percent meter for the file "
-"itself. The second last element is the instantaneous average speed. This "
-"values is updated every 5 seconds and reflects the rate of data transfer for "
-"that period. Finally is shown the estimated transfer time. This is updated "
-"regularly and reflects the time to complete everything at the shown transfer "
-"rate."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:530
-msgid ""
-"The status display updates every half second to provide a constant feedback "
-"on the download progress while the Get lines scroll back whenever a new file "
-"is started. Since the status display is constantly updated it is unsuitable "
-"for logging to a file, use the <tt>-q</tt> option to remove the status "
-"display."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:535
-msgid "Dpkg"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:542
-msgid ""
-"APT uses <prgn>dpkg</prgn> for installing the archives and will switch over "
-"to the <prgn>dpkg</prgn> interface once downloading is "
-"completed. <prgn>dpkg</prgn> will also ask a number of questions as it "
-"processes the packages and the packages themselves may also ask several "
-"questions. Before each question there is usually a description of what it is "
-"asking and the questions are too varied to discuss completely here."
-msgstr ""
-
-#. type: <title></title>
-#: offline.sgml:4
-msgid "Using APT Offline"
-msgstr ""
-
-#. type: <version></version>
-#: offline.sgml:7
-msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-msgstr ""
-
-#. type: <abstract></abstract>
-#: offline.sgml:12
-msgid ""
-"This document describes how to use APT in a non-networked environment, "
-"specifically a 'sneaker-net' approach for performing upgrades."
-msgstr ""
-
-#. type: <copyrightsummary></copyrightsummary>
-#: offline.sgml:16
-msgid "Copyright &copy; Jason Gunthorpe, 1999."
-msgstr ""
-
-#. type: <heading></heading>
-#: offline.sgml:32
-msgid "Introduction"
-msgstr ""
-
-#. type: <heading></heading>
-#: offline.sgml:34 offline.sgml:65 offline.sgml:180
-msgid "Overview"
-msgstr ""
-
-#. type: <p></p>
-#: offline.sgml:40
-msgid ""
-"Normally APT requires direct access to a Debian archive, either from a local "
-"media or through a network. Another common complaint is that a Debian "
-"machine is on a slow link, such as a modem and another machine has a very "
-"fast connection but they are physically distant."
-msgstr ""
-
-#. type: <p></p>
-#: offline.sgml:51
-msgid ""
-"The solution to this is to use large removable media such as a Zip disc or a "
-"SuperDisk disc. These discs are not large enough to store the entire Debian "
-"archive but can easily fit a subset large enough for most users. The idea is "
-"to use APT to generate a list of packages that are required and then fetch "
-"them onto the disc using another machine with good connectivity. It is even "
-"possible to use another Debian machine with APT or to use a completely "
-"different OS and a download tool like wget. Let <em>remote host</em> mean "
-"the machine downloading the packages, and <em>target host</em> the one with "
-"bad or no connection."
-msgstr ""
-
-#. type: <p></p>
-#: offline.sgml:57
-msgid ""
-"This is achieved by creatively manipulating the APT configuration file. The "
-"essential premis to tell APT to look on a disc for it's archive files. Note "
-"that the disc should be formated with a filesystem that can handle long file "
-"names such as ext2, fat32 or vfat."
-msgstr ""
-
-#. type: <heading></heading>
-#: offline.sgml:63
-msgid "Using APT on both machines"
-msgstr ""
-
-#. type: <p><example>
-#: offline.sgml:71
-msgid ""
-"APT being available on both machines gives the simplest configuration. The "
-"basic idea is to place a copy of the status file on the disc and use the "
-"remote machine to fetch the latest package files and decide which packages "
-"to download. The disk directory structure should look like:"
-msgstr ""
-
-#. type: <example></example>
-#: offline.sgml:80
-#, no-wrap
-msgid ""
-" /disc/\n"
-" archives/\n"
-" partial/\n"
-" lists/\n"
-" partial/\n"
-" status\n"
-" sources.list\n"
-" apt.conf"
-msgstr ""
-
-#. type: <heading></heading>
-#: offline.sgml:88
-msgid "The configuration file"
-msgstr ""
-
-#. type: <p></p>
-#: offline.sgml:96
-msgid ""
-"The configuration file should tell APT to store its files on the disc and to "
-"use the configuration files on the disc as well. The sources.list should "
-"contain the proper sites that you wish to use from the remote machine, and "
-"the status file should be a copy of <em>/var/lib/dpkg/status</em> from the "
-"<em>target host</em>. Please note, if you are using a local archive you must "
-"use copy URIs, the syntax is identical to file URIs."
-msgstr ""
-
-#. type: <p><example>
-#: offline.sgml:100
-msgid ""
-"<em>apt.conf</em> must contain the necessary information to make APT use the "
-"disc:"
-msgstr ""
-
-#. type: <example></example>
-#: offline.sgml:124
-#, no-wrap
-msgid ""
-" APT\n"
-" {\n"
-" /* This is not necessary if the two machines are the same arch, it "
-"tells\n"
-" the remote APT what architecture the target machine is */\n"
-" Architecture \"i386\";\n"
-" \n"
-" Get::Download-Only \"true\";\n"
-" };\n"
-" \n"
-" Dir\n"
-" {\n"
-" /* Use the disc for state information and redirect the status file from\n"
-" the /var/lib/dpkg default */\n"
-" State \"/disc/\";\n"
-" State::status \"status\";\n"
-"\n"
-" // Binary caches will be stored locally\n"
-" Cache::archives \"/disc/archives/\";\n"
-" Cache \"/tmp/\";\n"
-" \n"
-" // Location of the source list.\n"
-" Etc \"/disc/\";\n"
-" };"
-msgstr ""
-
-#. type: </example></p>
-#: offline.sgml:129
-msgid ""
-"More details can be seen by examining the apt.conf man page and the sample "
-"configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>."
-msgstr ""
-
-#. type: <p><example>
-#: offline.sgml:136
-msgid ""
-"On the target machine the first thing to do is mount the disc and copy "
-"<em>/var/lib/dpkg/status</em> to it. You will also need to create the "
-"directories outlined in the Overview, <em>archives/partial/</em> and "
-"<em>lists/partial/</em> Then take the disc to the remote machine and "
-"configure the sources.list. On the remote machine execute the following:"
-msgstr ""
-
-#. type: <example></example>
-#: offline.sgml:142
-#, no-wrap
-msgid ""
-" # export APT_CONFIG=\"/disc/apt.conf\"\n"
-" # apt-get update\n"
-" [ APT fetches the package files ]\n"
-" # apt-get dist-upgrade\n"
-" [ APT fetches all the packages needed to upgrade the target machine ]"
-msgstr ""
-
-#. type: </example></p>
-#: offline.sgml:149
-msgid ""
-"The dist-upgrade command can be replaced with any-other standard APT "
-"commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em> However this presents a problem in communicating "
-"your selections back to the local computer."
-msgstr ""
-
-#. type: <p><example>
-#: offline.sgml:153
-msgid ""
-"Now the disc contains all of the index files and archives needed to upgrade "
-"the target machine. Take the disc back and run:"
-msgstr ""
-
-#. type: <example></example>
-#: offline.sgml:159
-#, no-wrap
-msgid ""
-" # export APT_CONFIG=\"/disc/apt.conf\"\n"
-" # apt-get check\n"
-" [ APT generates a local copy of the cache files ]\n"
-" # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-" [ Or any other APT command ]"
-msgstr ""
-
-#. type: <p></p>
-#: offline.sgml:165
-msgid ""
-"It is necessary for proper function to re-specify the status file to be the "
-"local one. This is very important!"
-msgstr ""
-
-#. type: <p></p>
-#: offline.sgml:172
-msgid ""
-"If you are using dselect you can do the very risky operation of copying "
-"disc/status to /var/lib/dpkg/status so that any selections you made on the "
-"remote machine are updated. I highly recommend that people only make "
-"selections on the local machine - but this may not always be possible. DO "
-"NOT copy the status file if dpkg or APT have been run in the mean time!!"
-msgstr ""
-
-#. type: <heading></heading>
-#: offline.sgml:178
-msgid "Using APT and wget"
-msgstr ""
-
-#. type: <p></p>
-#: offline.sgml:185
-msgid ""
-"<em>wget</em> is a popular and portable download tool that can run on nearly "
-"any machine. Unlike the method above this requires that the Debian machine "
-"already has a list of available packages."
-msgstr ""
-
-#. type: <p></p>
-#: offline.sgml:190
-msgid ""
-"The basic idea is to create a disc that has only the archive files "
-"downloaded from the remote site. This is done by using the --print-uris "
-"option to apt-get and then preparing a wget script to actually fetch the "
-"packages."
-msgstr ""
-
-#. type: <heading></heading>
-#: offline.sgml:196
-msgid "Operation"
-msgstr ""
-
-#. type: <p><example>
-#: offline.sgml:200
-msgid ""
-"Unlike the previous technique no special configuration files are "
-"required. We merely use the standard APT commands to generate the file list."
-msgstr ""
-
-#. type: <example></example>
-#: offline.sgml:205
-#, no-wrap
-msgid ""
-" # apt-get dist-upgrade \n"
-" [ Press no when prompted, make sure you are happy with the actions ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
-msgstr ""
-
-#. type: </example></p>
-#: offline.sgml:210
-msgid ""
-"Any command other than dist-upgrade could be used here, including "
-"dselect-upgrade."
-msgstr ""
-
-#. type: <p></p>
-#: offline.sgml:216
-msgid ""
-"The /disc/wget-script file will now contain a list of wget commands to "
-"execute in order to fetch the necessary archives. This script should be run "
-"with the current directory as the disc's mount point so as to save the "
-"output on the disc."
-msgstr ""
-
-#. type: <p><example>
-#: offline.sgml:219
-msgid "The remote machine would do something like"
-msgstr ""
-
-#. type: <example></example>
-#: offline.sgml:223
-#, no-wrap
-msgid ""
-" # cd /disc\n"
-" # sh -x ./wget-script\n"
-" [ wait.. ]"
-msgstr ""
-
-#. type: </example><example>
-#: offline.sgml:228
-msgid ""
-"Once the archives are downloaded and the disc returned to the Debian machine "
-"installation can proceed using,"
-msgstr ""
-
-#. type: <example></example>
-#: offline.sgml:230
-#, no-wrap
-msgid " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
-msgstr ""
-
-#. type: </example></p>
-#: offline.sgml:234
-msgid "Which will use the already fetched archives on the disc."
-msgstr ""
diff --git a/doc/po/de.po b/doc/po/de.po
index 326470a30..23c4c5b27 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,8 +7,8 @@ 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-10-29 01:51+0100\n"
-"PO-Revision-Date: 2009-10-25 15:11+GMT\n"
+"POT-Creation-Date: 2009-12-01 19:13+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"
"MIME-Version: 1.0\n"
@@ -350,17 +350,11 @@ msgstr ""
#. type: Plain text
#: apt.ent:84
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY dpkg \"<citerefentry>\n"
-#| " <refentrytitle><command>dpkg</command></refentrytitle>\n"
-#| " <manvolnum>8</manvolnum>\n"
-#| " </citerefentry>\"\n"
-#| ">\n"
+#, no-wrap
msgid ""
"<!ENTITY dpkg \"<citerefentry>\n"
" <refentrytitle><command>dpkg</command></refentrytitle>\n"
-" <manvolnum>1</manvolnum>\n"
+" <manvolnum>8</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
msgstr ""
@@ -404,17 +398,11 @@ msgstr ""
#. type: Plain text
#: apt.ent:102
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY dpkg-scanpackages \"<citerefentry>\n"
-#| " <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n"
-#| " <manvolnum>8</manvolnum>\n"
-#| " </citerefentry>\"\n"
-#| ">\n"
+#, no-wrap
msgid ""
"<!ENTITY dpkg-scanpackages \"<citerefentry>\n"
" <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n"
-" <manvolnum>1</manvolnum>\n"
+" <manvolnum>8</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
msgstr ""
@@ -426,17 +414,11 @@ msgstr ""
#. type: Plain text
#: apt.ent:108
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY dpkg-scansources \"<citerefentry>\n"
-#| " <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n"
-#| " <manvolnum>8</manvolnum>\n"
-#| " </citerefentry>\"\n"
-#| ">\n"
+#, no-wrap
msgid ""
"<!ENTITY dpkg-scansources \"<citerefentry>\n"
" <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n"
-" <manvolnum>1</manvolnum>\n"
+" <manvolnum>8</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
msgstr ""
@@ -448,17 +430,11 @@ msgstr ""
#. type: Plain text
#: apt.ent:114
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY dselect \"<citerefentry>\n"
-#| " <refentrytitle><command>dselect</command></refentrytitle>\n"
-#| " <manvolnum>8</manvolnum>\n"
-#| " </citerefentry>\"\n"
-#| ">\n"
+#, no-wrap
msgid ""
"<!ENTITY dselect \"<citerefentry>\n"
" <refentrytitle><command>dselect</command></refentrytitle>\n"
-" <manvolnum>1</manvolnum>\n"
+" <manvolnum>8</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
msgstr ""
@@ -1375,17 +1351,10 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
#: apt-cache.8.xml:152
-#, fuzzy
-#| msgid ""
-#| "<literal>Missing</literal> is the number of package names that were "
-#| "referenced in a dependency but were not provided by any package. Missing "
-#| "packages may be in evidence if a full distribution is not accessed, or if "
-#| "a package (real or virtual) has been dropped from the distribution. "
-#| "Usually they are referenced from Conflicts or Breaks statements."
msgid ""
"<literal>Missing</literal> is the number of package names that were "
"referenced in a dependency but were not provided by any package. Missing "
-"packages may be an evidence if a full distribution is not accessed, or if a "
+"packages may be in evidence if a full distribution is not accessed, or if a "
"package (real or virtual) has been dropped from the distribution. Usually "
"they are referenced from Conflicts or Breaks statements."
msgstr ""
@@ -1585,10 +1554,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 "
@@ -1706,7 +1671,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89
-#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:456 apt.conf.5.xml:478
+#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:441 apt.conf.5.xml:463
msgid "options"
msgstr "Optionen"
@@ -1949,7 +1914,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:988 apt_preferences.5.xml:615
+#: apt.conf.5.xml:973 apt_preferences.5.xml:615
msgid "Files"
msgstr "Dateien"
@@ -1962,8 +1927,8 @@ 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:563 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
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:979 apt_preferences.5.xml:622
+#: sources.list.5.xml:221
msgid "See Also"
msgstr "Siehe auch"
@@ -2443,15 +2408,10 @@ msgstr "<option>--tempdir</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-extracttemplates.1.xml:62
-#, fuzzy
-#| msgid ""
-#| "Temporary directory in which to write extracted debconf template files "
-#| "and config scripts Configuration Item: <literal>APT::ExtractTemplates::"
-#| "TempDir</literal>"
msgid ""
"Temporary directory in which to write extracted debconf template files and "
-"config scripts. Configuration Item: <literal>APT::ExtractTemplates::"
-"TempDir</literal>"
+"config scripts Configuration Item: <literal>APT::ExtractTemplates::TempDir</"
+"literal>"
msgstr ""
"Temporäres Verzeichnis, in das die extrahierten DebConf-Schablonendateien "
"und Konfigurationsdateien geschrieben werden. Konfigurationselement: "
@@ -2478,26 +2438,6 @@ msgstr "Hilfsprogramm zum Generieren von Indexdateien"
#. 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> "
@@ -2520,9 +2460,10 @@ msgstr ""
"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
"<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
-"arg> <arg><option>-o=<replaceable>Konfigurationszeichenkette</replaceable></"
-"option></arg> <arg><option>-c=<replaceable>Datei</replaceable></option></"
-"arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
+"arg> <arg><option>-o=<replaceable>Konfiguration</"
+"replaceable>=<replaceable>Zeichenkette</replaceable></option></arg> "
+"<arg><option>-c=<replaceable>Datei</replaceable></option></arg> <group "
+"choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
"\"><replaceable>Pfad</replaceable></arg><arg><replaceable>überschreiben</"
"replaceable><arg><replaceable>Pfadvorsilbe</replaceable></arg></arg></arg> "
"<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>Pfad</"
@@ -2771,17 +2712,11 @@ msgstr "Dir-Abschnitt"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt-ftparchive.1.xml:159
-#, fuzzy
-#| msgid ""
-#| "The <literal>Dir</literal> section defines the standard directories "
-#| "needed to locate the files required during the generation process. These "
-#| "directories are prepended to certain relative paths defined in later "
-#| "sections to produce a complete an absolute path."
msgid ""
"The <literal>Dir</literal> section defines the standard directories needed "
"to locate the files required during the generation process. These "
-"directories are prepended certain relative paths defined in later sections "
-"to produce a complete an absolute path."
+"directories are prepended to certain relative paths defined in later "
+"sections to produce a complete an absolute path."
msgstr ""
"Der <literal>Dir</literal>-Abschnitt definiert die Vorgabeverzeichnisse, die "
"zum Orten der benötigten Dateien während des Generierungsprozesses gebraucht "
@@ -3582,8 +3517,8 @@ msgstr ""
"<literal>APT::FTPArchive::ReadOnlyDB</literal>."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:552 apt.conf.5.xml:982 apt_preferences.5.xml:462
-#: sources.list.5.xml:193
+#: apt-ftparchive.1.xml:552 apt.conf.5.xml:967 apt_preferences.5.xml:462
+#: sources.list.5.xml:181
msgid "Examples"
msgstr "Beispiele"
@@ -3622,8 +3557,8 @@ msgstr ""
"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>8. "
"November 2008</date>"
-#. type: <heading></heading>
-#: apt-get.8.xml:22 apt-get.8.xml:29 guide.sgml:96
+#. type: Content of: <refentry><refnamediv><refname>
+#: apt-get.8.xml:22 apt-get.8.xml:29
msgid "apt-get"
msgstr "apt-get"
@@ -3742,8 +3677,8 @@ msgstr ""
"bewusst, dass die Gesamtfortschrittsanzeige nicht richtig sein wird, da die "
"Größe der Pakete nicht im voraus bekannt ist."
-#. type: <tag></tag>
-#: apt-get.8.xml:147 guide.sgml:121
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:147
msgid "upgrade"
msgstr "upgrade"
@@ -3795,8 +3730,8 @@ msgstr ""
"diesen Status zu realisieren (zum Beispiel das Entfernen von alten und "
"Installieren von neuen Paketen)."
-#. type: <tag></tag>
-#: apt-get.8.xml:170 guide.sgml:140
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:170
msgid "dist-upgrade"
msgstr "dist-upgrade"
@@ -3824,8 +3759,8 @@ msgstr ""
"abgerufen werden. Siehe auch &apt-preferences; für einen Mechanismus zum "
"überschreiben der allgemeinen Einstellungen für einzelne Pakete."
-#. type: <tag></tag>
-#: apt-get.8.xml:183 guide.sgml:131
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:183
msgid "install"
msgstr "install"
@@ -3979,14 +3914,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 "
@@ -4023,14 +3950,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:266
-#, fuzzy
-#| msgid ""
-#| "If the <option>--compile</option> options is specified then the package "
-#| "will be compiled to a binary .deb using <command>dpkg-buildpackage</"
-#| "command>, if <option>--download-only</option> is specified then the "
-#| "source package will not be unpacked."
msgid ""
-"If the <option>--compile</option> option is specified then the package will "
+"If the <option>--compile</option> options is specified then the package will "
"be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
"<option>--download-only</option> is specified then the source package will "
"not be unpacked."
@@ -4329,17 +4250,11 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:392
-#, fuzzy
-#| msgid ""
-#| "Simulate prints out a series of lines each one representing a dpkg "
-#| "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square "
-#| "brackets indicate broken packages with and empty set of square brackets "
-#| "meaning breaks that are of no consequence (rare)."
msgid ""
"Simulate prints out a series of lines each one representing a dpkg "
"operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
-"indicate broken packages and empty set of square brackets meaning breaks "
-"that are of no consequence (rare)."
+"indicate broken packages with and empty set of square brackets meaning "
+"breaks that are of no consequence (rare)."
msgstr ""
"Simulieren gibt eine Serie von Zeilen aus, von denen jede eine Dpkg-"
"Operation darstellt: Konfigurieren (Conf), Entfernen (Remv), Entpacken "
@@ -5099,13 +5014,9 @@ msgstr "showauto"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml:82
-#, fuzzy
-#| msgid ""
-#| "<literal>showauto</literal> is used to print a list of manually installed "
-#| "packages with each package on a new line."
msgid ""
-"<literal>showauto</literal> is used to print a list of automatically "
-"installed packages with each package on a new line."
+"<literal>showauto</literal> is used to print a list of manually installed "
+"packages with each package on a new line."
msgstr ""
"<literal>showauto</literal> wird benutzt, um eine Liste manuell "
"installierter Pakete mit einem Paket in jeder neuen Zeile, auszugeben."
@@ -5254,20 +5165,12 @@ msgstr "Vertrauenswürdige Archive"
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml:67
-#, fuzzy
-#| msgid ""
-#| "The chain of trust from an apt archive to the end user is made up of "
-#| "different steps. <command>apt-secure</command> is the last step in this "
-#| "chain, trusting an archive does not mean that the packages that you trust "
-#| "it do not contain malicious code but means that you trust the archive "
-#| "maintainer. Its the archive maintainer responsibility to ensure that the "
-#| "archive integrity is correct."
msgid ""
"The chain of trust from an apt archive to the end user is made up of "
"different steps. <command>apt-secure</command> is the last step in this "
"chain, trusting an archive does not mean that the packages that you trust it "
"do not contain malicious code but means that you trust the archive "
-"maintainer. It's the archive maintainer responsibility to ensure that the "
+"maintainer. Its the archive maintainer responsibility to ensure that the "
"archive integrity is correct."
msgstr ""
"Eine Kette des Vertrauens von einem APT-Archiv zum Endanwender wird durch "
@@ -5311,22 +5214,13 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml:92
-#, fuzzy
-#| msgid ""
-#| "Once the uploaded package is verified and included in the archive, the "
-#| "maintainer signature is stripped off, an MD5 sum of the package is "
-#| "computed and put in the Packages file. The MD5 sum of all of the packages "
-#| "files are then computed and put into the Release file. The Release file "
-#| "is then signed by the archive key (which is created once a year and "
-#| "distributed through the FTP server. This key is also on the Debian "
-#| "keyring."
msgid ""
"Once the uploaded package is verified and included in the archive, the "
"maintainer signature is stripped off, an MD5 sum of the package is computed "
"and put in the Packages file. The MD5 sum of all of the packages files are "
"then computed and put into the Release file. The Release file is then signed "
-"by the archive key (which is created once a year) and distributed through "
-"the FTP server. This key is also on the Debian keyring."
+"by the archive key (which is created once a year and distributed through the "
+"FTP server. This key is also on the Debian keyring."
msgstr ""
"Sobald das hochgeladenen Paket überprüft und in das Archiv hinzugefügt "
"wurde, wird die Betreuersignatur entfernt, eine MD5-Summe des Pakets "
@@ -5453,13 +5347,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#: apt-secure.8.xml:160
-#, fuzzy
-#| msgid ""
-#| "<literal>Create a toplevel Release file</literal>. if it does not exist "
-#| "already. You can do this by running <command>apt-ftparchive release</"
-#| "command> (provided in apt-utils)."
msgid ""
-"<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
+"<literal>Create a toplevel Release file</literal>. if it does not exist "
"already. You can do this by running <command>apt-ftparchive release</"
"command> (provided in apt-utils)."
msgstr ""
@@ -5469,26 +5358,17 @@ msgstr ""
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#: apt-secure.8.xml:165
-#, fuzzy
-#| msgid ""
-#| "<literal>Sign it</literal>. You can do this by running <command>gpg -abs -"
-#| "o Release.gpg Release</command>."
msgid ""
-"<emphasis>Sign it</emphasis>. You can do this by running <command>gpg -abs -"
-"o Release.gpg Release</command>."
+"<literal>Sign it</literal>. You can do this by running <command>gpg -abs -o "
+"Release.gpg Release</command>."
msgstr ""
"<literal>Sign it</literal>. Sie können dies tun, indem Sie <command>gpg -abs "
"-o Release.gpg Release</command> ausführen."
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#: apt-secure.8.xml:168
-#, fuzzy
-#| msgid ""
-#| "<literal>Publish the key fingerprint</literal>, that way your users will "
-#| "know what key they need to import in order to authenticate the files in "
-#| "the archive."
msgid ""
-"<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
+"<literal>Publish the key fingerprint</literal>, that way your users will "
"know what key they need to import in order to authenticate the files in the "
"archive."
msgstr ""
@@ -5668,18 +5548,11 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:50
-#, fuzzy
-#| msgid ""
-#| "The configuration file is organized in a tree with options organized into "
-#| "functional groups. option specification is given with a double colon "
-#| "notation, for instance <literal>APT::Get::Assume-Yes</literal> is an "
-#| "option within the APT tool group, for the Get tool. options do not "
-#| "inherit from their parent groups."
msgid ""
"The configuration file is organized in a tree with options organized into "
-"functional groups. Option specification is given with a double colon "
+"functional groups. option specification is given with a double colon "
"notation, for instance <literal>APT::Get::Assume-Yes</literal> is an option "
-"within the APT tool group, for the Get tool. Options do not inherit from "
+"within the APT tool group, for the Get tool. options do not inherit from "
"their parent groups."
msgstr ""
"Die Konfigurationsdatei ist in einem Baum mit Optionen organisiert, die in "
@@ -5691,20 +5564,12 @@ 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 "
"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 "
+"of the form <literal>APT::Get::Assume-Yes \"true\";</literal> The trailing "
"semicolon and the quotes are required. The value must be on one line, and "
"there is no kind of string concatenation. It must not include inside "
"quotes. The behavior of the backslash \"\\\" and escaped characters inside "
@@ -5797,13 +5662,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 descendants are "
-#| "erased. (Note that these lines also need to end with a semicolon.)"
msgid ""
"Two specials are allowed, <literal>#include</literal> (which is deprecated "
"and not supported by alternative implementations) and <literal>#clear</"
@@ -5977,43 +5835,25 @@ msgstr "Immediate-Configure"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:159
msgid ""
-"Defaults to on which will cause APT to install essential and important "
-"packages as fast as possible in the install/upgrade operation. This is done "
-"to limit the effect of a failing &dpkg; call: If this option is disabled APT "
-"does treat an important package in the same way as an extra package: Between "
-"the unpacking of the important package A and his configuration can then be "
-"many other unpack or configuration calls, e.g. for package B which has no "
-"relation to A, but causes the dpkg call to fail (e.g. because maintainer "
-"script of package B generates an error) which results in a system state in "
-"which package A is unpacked but unconfigured - each package depending on A "
-"is now no longer guaranteed to work as their dependency on A is not longer "
-"satisfied. The immediate configuration marker is also applied to all "
-"dependencies which can generate a problem if the dependencies e.g. form a "
-"circle as a dependency with the immediate flag is comparable with a Pre-"
-"Dependency. So in theory it is possible that APT encounters a situation in "
-"which it is unable to perform immediate configuration, error out and refers "
-"to this option so the user can deactivate the immediate configuration "
-"temporary to be able to perform an install/upgrade again. Note the use of "
-"the word \"theory\" here as this problem was only encountered by now in real "
-"world a few times in non-stable distribution versions and caused by wrong "
-"dependencies of the package in question or by a system in an already broken "
-"state, so you should not blindly disable this option as the mentioned "
-"scenario above is not the only problem immediate configuration can help to "
-"prevent in the first place. Before a big operation like <literal>dist-"
-"upgrade</literal> is run with this option disabled it should be tried to "
-"explicitly <literal>install</literal> the package APT is unable to configure "
-"immediately, but please make sure to report your problem also to your "
-"distribution and to the APT team with the buglink below so they can work on "
-"improving or correcting the upgrade process."
+"Disable Immediate Configuration; This dangerous option disables some of "
+"APT's ordering code to cause it to make fewer dpkg calls. Doing so may be "
+"necessary on some extremely slow single user systems but is very dangerous "
+"and may cause package install scripts to fail or worse. Use at your own "
+"risk."
msgstr ""
+"Sofortkonfiguration ausschalten; Diese gefährliche Option schaltet einigen "
+"Befehlscode von APT aus, um es zu veranlassen, Dpkg seltener aufzurufen. "
+"Dies zu tun, könnte auf besonders langsamen Einzelbenutzersystemen nötig "
+"sein, ist aber gefährlich und könnte Paketinstallationsskripte zum Scheitern "
+"oder schlimmeren veranlassen. Benutzen Sie es auf eigene Gefahr."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:181
+#: apt.conf.5.xml:166
msgid "Force-LoopBreak"
msgstr "Force-LoopBreak"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:182
+#: apt.conf.5.xml:167
msgid ""
"Never Enable this option unless you -really- know what you are doing. It "
"permits APT to temporarily remove an essential package to break a Conflicts/"
@@ -6031,12 +5871,12 @@ msgstr ""
"bash oder etwas, was davon abhängt, sind."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:190
+#: apt.conf.5.xml:175
msgid "Cache-Limit"
msgstr "Cache-Limit"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:191
+#: apt.conf.5.xml:176
msgid ""
"APT uses a fixed size memory mapped cache file to store the 'available' "
"information. This sets the size of that cache (in bytes)."
@@ -6046,24 +5886,24 @@ msgstr ""
"(in Bytes)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:195
+#: apt.conf.5.xml:180
msgid "Build-Essential"
msgstr "Build-Essential"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:196
+#: apt.conf.5.xml:181
msgid "Defines which package(s) are considered essential build dependencies."
msgstr ""
"Definiert, welche(s) Paket(e) als essentielle Bauabhängigkeiten betrachtet "
"werde."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:184
msgid "Get"
msgstr "Get"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:200
+#: apt.conf.5.xml:185
msgid ""
"The Get subsection controls the &apt-get; tool, please see its documentation "
"for more information about the options here."
@@ -6073,12 +5913,12 @@ msgstr ""
"erhalten."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:204
+#: apt.conf.5.xml:189
msgid "Cache"
msgstr "Cache"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:205
+#: apt.conf.5.xml:190
msgid ""
"The Cache subsection controls the &apt-cache; tool, please see its "
"documentation for more information about the options here."
@@ -6088,12 +5928,12 @@ msgstr ""
"erhalten."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:209
+#: apt.conf.5.xml:194
msgid "CDROM"
msgstr "CDROM"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:210
+#: apt.conf.5.xml:195
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool, please see its "
"documentation for more information about the options here."
@@ -6103,17 +5943,17 @@ msgstr ""
"erhalten."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:216
+#: apt.conf.5.xml:201
msgid "The Acquire Group"
msgstr "Die Erwerbgruppe"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:206
msgid "PDiffs"
msgstr "PDiffs"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:222
+#: apt.conf.5.xml:207
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for Packages or "
"Sources files instead of downloading whole ones. True by default."
@@ -6123,12 +5963,12 @@ msgstr ""
"True."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:227
+#: apt.conf.5.xml:212
msgid "Queue-Mode"
msgstr "Queue-Mode"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:228
+#: apt.conf.5.xml:213
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
"literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -6144,12 +5984,12 @@ msgstr ""
"URI-Art geöffnet wird."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:235
+#: apt.conf.5.xml:220
msgid "Retries"
msgstr "Retries"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:221
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
@@ -6158,12 +5998,12 @@ msgstr ""
"APT fehlgeschlagene Dateien in der angegebenen Zahl erneut versuchen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:240
+#: apt.conf.5.xml:225
msgid "Source-Symlinks"
msgstr "Source-Symlinks"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:241
+#: apt.conf.5.xml:226
msgid ""
"Use symlinks for source archives. If set to true then source archives will "
"be symlinked when possible instead of copying. True is the default."
@@ -6173,12 +6013,12 @@ msgstr ""
"kopiert zu werden. True ist die Vorgabe."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:245 sources.list.5.xml:139
+#: apt.conf.5.xml:230 sources.list.5.xml:139
msgid "http"
msgstr "http"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:246
+#: apt.conf.5.xml:231
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 "
@@ -6196,7 +6036,7 @@ msgstr ""
"die Umgebungsvariable <envar>http_proxy</envar> benutzt."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:254
+#: apt.conf.5.xml:239
msgid ""
"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
"caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@ -6222,7 +6062,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:321
+#: apt.conf.5.xml:249 apt.conf.5.xml:306
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method, this applies to all things including connection timeout and data "
@@ -6233,19 +6073,10 @@ msgstr ""
"Dinge, einschließlich Verbindungs- und Datenzeitüberschreitungen, angewandt."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:267
-#, fuzzy
-#| msgid ""
-#| "One setting is provided to control the pipeline depth in cases where the "
-#| "remote server is not RFC conforming or buggy (such as Squid 2.0.2) "
-#| "<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to "
-#| "5 indicating how many outstanding requests APT should send. A value of "
-#| "zero MUST be specified if the remote host does not properly linger on TCP "
-#| "connections - otherwise data corruption will occur. Hosts which require "
-#| "this are in violation of RFC 2068."
+#: apt.conf.5.xml:252
msgid ""
"One setting is provided to control the pipeline depth in cases where the "
-"remote server is not RFC conforming or buggy (such as Squid 2.0.2). "
+"remote server is not RFC conforming or buggy (such as Squid 2.0.2) "
"<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to 5 "
"indicating how many outstanding requests APT should send. A value of zero "
"MUST be specified if the remote host does not properly linger on TCP "
@@ -6262,7 +6093,7 @@ msgstr ""
"gegen RFC 2068."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:275
+#: apt.conf.5.xml:260
msgid ""
"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
"literal> which accepts integer values in kilobyte. The default value is 0 "
@@ -6278,12 +6109,12 @@ msgstr ""
"deaktiviert.)"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:281
+#: apt.conf.5.xml:266
msgid "https"
msgstr "https"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:282
+#: apt.conf.5.xml:267
msgid ""
"HTTPS URIs. Cache-control and proxy options are the same as for "
"<literal>http</literal> method. <literal>Pipeline-Depth</literal> option is "
@@ -6294,7 +6125,7 @@ msgstr ""
"literal> wird noch nicht unterstützt."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:286
+#: apt.conf.5.xml:271
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -6333,12 +6164,12 @@ msgstr ""
"SslForceVersion</literal> ist die entsprechende per-Host-Option."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:304 sources.list.5.xml:150
+#: apt.conf.5.xml:289 sources.list.5.xml:150
msgid "ftp"
msgstr "ftp"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:305
+#: apt.conf.5.xml:290
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 "
@@ -6373,7 +6204,7 @@ msgstr ""
"entsprechenden URI-Bestandteil genommen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:324
+#: apt.conf.5.xml:309
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 "
@@ -6390,7 +6221,7 @@ msgstr ""
"Beispielskonfiguration, um Beispiele zu erhalten)."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#: apt.conf.5.xml:316
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 "
@@ -6404,7 +6235,7 @@ msgstr ""
"Effizienz nicht empfohlen FTP über HTTP zu benutzen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:336
+#: apt.conf.5.xml:321
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -6420,19 +6251,18 @@ msgstr ""
"Server RFC2428 unterstützen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:343 sources.list.5.xml:132
+#: apt.conf.5.xml:328 sources.list.5.xml:132
msgid "cdrom"
msgstr "cdrom"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:349
+#: apt.conf.5.xml:334
#, 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:344
+#: apt.conf.5.xml:329
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 "
@@ -6454,12 +6284,12 @@ msgstr ""
"können per UMount angegeben werden."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:354
+#: apt.conf.5.xml:339
msgid "gpgv"
msgstr "gpgv"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:355
+#: apt.conf.5.xml:340
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
@@ -6470,18 +6300,18 @@ msgstr ""
"Zusätzliche Parameter werden an gpgv weitergeleitet."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:360
+#: apt.conf.5.xml:345
msgid "CompressionTypes"
msgstr "CompressionTypes"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:366
+#: apt.conf.5.xml:351
#, 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:361
+#: apt.conf.5.xml:346
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -6501,19 +6331,19 @@ msgstr ""
"\"synopsis\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:371
+#: apt.conf.5.xml:356
#, 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:374
+#: apt.conf.5.xml:359
#, 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:367
+#: apt.conf.5.xml:352
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 "
@@ -6535,7 +6365,7 @@ msgstr ""
"Fehler fortfahren. Um daher einen nach dem anderen Typ vorzuziehen, fügen "
"Sie einfach den bevorzugten Typ zuerst in die Liste – noch nicht "
"hinzugefügte Standardtypen werden zur Laufzeit an das Ende der Liste "
-"angehängt, so kann z.B. <placeholder type=\"synopsis\" id=\"0\"/> verwandt "
+"angehängt, so kann z.B. <placeholder type=\"synopsis\"id=\"0\"/> verwandt "
"werden, um <command>gzip</command>-komprimierte Dateien über <command>bzip2</"
"command> und <command>lzma</command> zu bevorzugen. Falls <command>lzma</"
"command> vor <command>gzip</command> und <command>bzip2</command> vorgezogen "
@@ -6544,13 +6374,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:378
+#: apt.conf.5.xml:363
#, 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:376
+#: apt.conf.5.xml:361
msgid ""
"Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
"replaceable></literal> will be checked: If this setting exists the method "
@@ -6576,7 +6406,7 @@ msgstr ""
"diesen Typ nur vor die Liste setzen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:383
+#: apt.conf.5.xml:368
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 "
@@ -6593,22 +6423,22 @@ msgstr ""
"unterstützen."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:217
+#: apt.conf.5.xml:202
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>"
msgstr ""
"Die <literal>Acquire</literal>-Gruppe der Optionen steuert das Herunterladen "
-"von Paketen und die URI-Steuerprogramme."
-" <placeholder type=\"variablelist\" id=\"0\"/>"
+"von Paketen und die URI-Steuerprogramme. <placeholder type=\"variablelist\" "
+"id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:392
+#: apt.conf.5.xml:377
msgid "Directories"
msgstr "Verzeichnisse"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:394
+#: apt.conf.5.xml:379
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -6628,7 +6458,7 @@ msgstr ""
"filename> oder <filename>./</filename> beginnen."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:401
+#: apt.conf.5.xml:386
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -6651,7 +6481,7 @@ msgstr ""
"<literal>Dir::Cache</literal> enthalten."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:410
+#: apt.conf.5.xml:395
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -6666,7 +6496,7 @@ msgstr ""
"Konfigurationsdatei erfolgt)."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:416
+#: apt.conf.5.xml:401
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 "
@@ -6678,7 +6508,7 @@ msgstr ""
"geladen."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:405
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -6696,7 +6526,7 @@ msgstr ""
"Programms an."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:428
+#: apt.conf.5.xml:413
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -6716,12 +6546,12 @@ msgstr ""
"<filename>/tmp/staging/var/lib/dpkg/status</filename> nachgesehen."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:441
+#: apt.conf.5.xml:426
msgid "APT in DSelect"
msgstr "APT in DSelect"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:443
+#: apt.conf.5.xml:428
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -6732,12 +6562,12 @@ msgstr ""
"<literal>DSelect</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:447
+#: apt.conf.5.xml:432
msgid "Clean"
msgstr "Clean"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:448
+#: apt.conf.5.xml:433
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 "
@@ -6755,7 +6585,7 @@ msgstr ""
"Herunterladen neuer Pakete durch."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:457
+#: apt.conf.5.xml:442
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the install phase."
@@ -6764,12 +6594,12 @@ msgstr ""
"übermittelt, wenn es für die Installationsphase durchlaufen wird."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:461
+#: apt.conf.5.xml:446
msgid "Updateoptions"
msgstr "Updateoptions"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:462
+#: apt.conf.5.xml:447
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the update phase."
@@ -6778,12 +6608,12 @@ msgstr ""
"übermittelt, wenn es für die Aktualisierungsphase durchlaufen wird."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:466
+#: apt.conf.5.xml:451
msgid "PromptAfterUpdate"
msgstr "PromptAfterUpdate"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:467
+#: apt.conf.5.xml:452
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
@@ -6792,12 +6622,12 @@ msgstr ""
"nachfragen, um fortzufahren. Vorgabe ist es, nur bei Fehlern nachzufragen."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:473
+#: apt.conf.5.xml:458
msgid "How APT calls dpkg"
msgstr "Wie APT Dpkg aufruft"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:474
+#: apt.conf.5.xml:459
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
@@ -6806,7 +6636,7 @@ msgstr ""
"stehen im Abschnitt <literal>DPkg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:479
+#: apt.conf.5.xml:464
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 "
@@ -6817,17 +6647,17 @@ msgstr ""
"jedes Listenelement wird als einzelnes Argument an &dpkg; übermittelt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:484
+#: apt.conf.5.xml:469
msgid "Pre-Invoke"
msgstr "Pre-Invoke"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:484
+#: apt.conf.5.xml:469
msgid "Post-Invoke"
msgstr "Post-Invoke"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:485
+#: apt.conf.5.xml:470
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 "
@@ -6841,12 +6671,12 @@ msgstr ""
"APT abgebrochen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:491
+#: apt.conf.5.xml:476
msgid "Pre-Install-Pkgs"
msgstr "Pre-Install-Pkgs"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:492
+#: apt.conf.5.xml:477
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 "
@@ -6863,7 +6693,7 @@ msgstr ""
"pro Zeile."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:498
+#: apt.conf.5.xml:483
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -6879,12 +6709,12 @@ msgstr ""
"literal> gegeben wird."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:505
+#: apt.conf.5.xml:490
msgid "Run-Directory"
msgstr "Run-Directory"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:506
+#: apt.conf.5.xml:491
msgid ""
"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
"</filename>."
@@ -6893,12 +6723,12 @@ msgstr ""
"die Vorgabe ist <filename>/</filename>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:510
+#: apt.conf.5.xml:495
msgid "Build-options"
msgstr "Build-options"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:511
+#: apt.conf.5.xml:496
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages, the "
"default is to disable signing and produce all binaries."
@@ -6908,12 +6738,12 @@ msgstr ""
"Programme werden erstellt."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:516
+#: apt.conf.5.xml:501
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:517
+#: apt.conf.5.xml:502
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 "
@@ -6939,7 +6769,7 @@ msgstr ""
"Status 100% stehen, während es aktuell alle Pakete konfiguriert."
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:532
+#: apt.conf.5.xml:517
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -6953,7 +6783,7 @@ msgstr ""
"DPkg::TriggersPending \"true\";"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:526
+#: apt.conf.5.xml:511
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 "
@@ -6978,27 +6808,17 @@ msgstr ""
"wäre <placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:523
msgid "DPkg::NoTriggers"
msgstr "DPkg::NoTriggers"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:539
-#, fuzzy
-#| msgid ""
-#| "Add the no triggers flag to all dpkg calls (expect the ConfigurePending "
-#| "call). See &dpkg; if you are interested in what this actually means. In "
-#| "short: dpkg will not run the triggers then this flag is present unless it "
-#| "is explicit called to do so in an extra call. Note that this option "
-#| "exists (undocumented) also in older apt versions with a slightly "
-#| "different meaning: Previously these option only append --no-triggers to "
-#| "the configure calls to dpkg - now apt will add these flag also to the "
-#| "unpack and remove calls."
-msgid ""
-"Add the no triggers flag to all dpkg calls (except the ConfigurePending "
+#: apt.conf.5.xml:524
+msgid ""
+"Add the no triggers flag to all dpkg calls (expect the ConfigurePending "
"call). See &dpkg; if you are interested in what this actually means. In "
-"short: dpkg will not run the triggers when this flag is present unless it is "
-"explicitly called to do so in an extra call. Note that this option exists "
+"short: dpkg will not run the triggers then this flag is present unless it is "
+"explicit called to do so in an extra call. Note that this option exists "
"(undocumented) also in older apt versions with a slightly different meaning: "
"Previously these option only append --no-triggers to the configure calls to "
"dpkg - now apt will add these flag also to the unpack and remove calls."
@@ -7014,26 +6834,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:546
+#: apt.conf.5.xml:531
msgid "PackageManager::Configure"
msgstr "PackageManager::Configure"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:547
-#, fuzzy
-#| msgid ""
-#| "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
-#| "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
-#| "value and causes APT to configure all packages explicit. The "
-#| "\"<literal>smart</literal>\" way is it to configure only packages which "
-#| "need to be configured before another package can be unpacked (Pre-"
-#| "Depends) and let the rest configure by dpkg with a call generated by the "
-#| "next option. \"<literal>no</literal>\" on the other hand will not "
-#| "configure anything and totally relay on dpkg for configuration (which "
-#| "will at the moment fail if a Pre-Depends is encountered). Setting this "
-#| "option to another than the all value will implicit activate also the next "
-#| "option per default as otherwise the system could end in an unconfigured "
-#| "status which could be unbootable!"
+#: apt.conf.5.xml:532
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
@@ -7042,9 +6848,9 @@ msgid ""
"to be configured before another package can be unpacked (Pre-Depends) and "
"let the rest configure by dpkg with a call generated by the next option. "
"\"<literal>no</literal>\" on the other hand will not configure anything and "
-"totally rely on dpkg for configuration (which will at the moment fail if a "
+"totally relay on dpkg for configuration (which will at the moment fail if a "
"Pre-Depends is encountered). Setting this option to another than the all "
-"value will implicitly activate also the next option per default as otherwise "
+"value will implicit activate also the next option per default as otherwise "
"the system could end in an unconfigured status which could be unbootable!"
msgstr ""
"Gültige Werte sind »<literal>all</literal>«, »<literal>smart</literal>« und "
@@ -7062,26 +6868,18 @@ msgstr ""
"mehr startbar sein könnte."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:557
+#: apt.conf.5.xml:542
msgid "DPkg::ConfigurePending"
msgstr "DPkg::ConfigurePending"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:558
-#, fuzzy
-#| msgid ""
-#| "If this option is set apt will call <command>dpkg --configure --pending</"
-#| "command> to let dpkg handle all required configurations and triggers. "
-#| "This option is activated automatic per default if the previous option is "
-#| "not set to <literal>all</literal>, but deactivating could be useful if "
-#| "you want to run APT multiple times in a row - e.g. in an installer. In "
-#| "this sceneries you could deactivate this option in all but the last run."
+#: apt.conf.5.xml:543
msgid ""
"If this option is set apt will call <command>dpkg --configure --pending</"
"command> to let dpkg handle all required configurations and triggers. This "
"option is activated automatic per default if the previous option is not set "
"to <literal>all</literal>, but deactivating could be useful if you want to "
-"run APT multiple times in a row - e.g. in an installer. In these sceneries "
+"run APT multiple times in a row - e.g. in an installer. In this sceneries "
"you could deactivate this option in all but the last run."
msgstr ""
"Wenn diese Option gesetzt ist, wird APT <command>dpkg --configure --pending</"
@@ -7094,12 +6892,12 @@ msgstr ""
"deaktivieren."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:564
+#: apt.conf.5.xml:549
msgid "DPkg::TriggersPending"
msgstr "DPkg::TriggersPending"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:565
+#: apt.conf.5.xml:550
msgid ""
"Useful for <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -7115,12 +6913,12 @@ msgstr ""
"benötigt werden."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:570
+#: apt.conf.5.xml:555
msgid "PackageManager::UnpackAll"
msgstr "PackageManager::UnpackAll"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:571
+#: apt.conf.5.xml:556
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-"
@@ -7139,12 +6937,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:578
+#: apt.conf.5.xml:563
msgid "OrderList::Score::Immediate"
msgstr "OrderList::Score::Immediate"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:586
+#: apt.conf.5.xml:571
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -7162,7 +6960,7 @@ msgstr ""
"};"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:579
+#: apt.conf.5.xml:564
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 "
@@ -7186,12 +6984,12 @@ msgstr ""
"mit ihren Vorgabewerten. <placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:599
+#: apt.conf.5.xml:584
msgid "Periodic and Archives options"
msgstr "Periodische- und Archivoptionen"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:600
+#: apt.conf.5.xml:585
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -7205,12 +7003,12 @@ msgstr ""
"Dokumentation dieser Optionen zu erhalten."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:608
+#: apt.conf.5.xml:593
msgid "Debug options"
msgstr "Fehlersuchoptionen"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:610
+#: apt.conf.5.xml:595
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -7228,7 +7026,7 @@ msgstr ""
"könnten es sein:"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:621
+#: apt.conf.5.xml:606
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -7239,7 +7037,7 @@ msgstr ""
"getroffenen Entscheidungen ein."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:629
+#: apt.conf.5.xml:614
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -7250,7 +7048,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:638
+#: apt.conf.5.xml:623
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -7262,7 +7060,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:646
+#: apt.conf.5.xml:631
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CDROM IDs."
@@ -7271,17 +7069,17 @@ msgstr ""
"Daten in CDROM-IDs aus."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:641
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:661
+#: apt.conf.5.xml:646
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:665
+#: apt.conf.5.xml:650
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
@@ -7289,48 +7087,48 @@ msgstr ""
"literal>-Quellen beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:672
+#: apt.conf.5.xml:657
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:676
+#: apt.conf.5.xml:661
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:683
+#: apt.conf.5.xml:668
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:687
+#: apt.conf.5.xml:672
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:694
+#: apt.conf.5.xml:679
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:698
+#: apt.conf.5.xml:683
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:705
+#: apt.conf.5.xml:690
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:709
+#: apt.conf.5.xml:694
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
@@ -7339,12 +7137,12 @@ msgstr ""
"mittels <literal>gpg</literal> beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:716
+#: apt.conf.5.xml:701
msgid "<literal>Debug::aptcdrom</literal>"
msgstr "<literal>Debug::aptcdrom</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:720
+#: apt.conf.5.xml:705
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
@@ -7353,23 +7151,23 @@ msgstr ""
"CD-ROMs gespeichert sind."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:727
+#: apt.conf.5.xml:712
msgid "<literal>Debug::BuildDeps</literal>"
msgstr "<literal>Debug::BuildDeps</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:730
+#: apt.conf.5.xml:715
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:737
+#: apt.conf.5.xml:722
msgid "<literal>Debug::Hashes</literal>"
msgstr "<literal>Debug::Hashes</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:740
+#: apt.conf.5.xml:725
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
@@ -7378,12 +7176,12 @@ msgstr ""
"Bibliotheken generiert wurde."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:747
+#: apt.conf.5.xml:732
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr "<literal>Debug::IdentCDROM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:750
+#: apt.conf.5.xml:735
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 "
@@ -7394,12 +7192,12 @@ msgstr ""
"ID für eine CD-ROM generiert wird."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:743
msgid "<literal>Debug::NoLocking</literal>"
msgstr "<literal>Debug::NoLocking</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:761
+#: apt.conf.5.xml:746
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."
@@ -7409,24 +7207,24 @@ msgstr ""
"gleichen Zeit laufen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:769
+#: apt.conf.5.xml:754
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr "<literal>Debug::pkgAcquire</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:773
+#: apt.conf.5.xml:758
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:780
+#: apt.conf.5.xml:765
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:783
+#: apt.conf.5.xml:768
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
@@ -7435,12 +7233,12 @@ msgstr ""
"und kryptografischen Signaturen von heruntergeladenen Dateien beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:790
+#: apt.conf.5.xml:775
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:793
+#: apt.conf.5.xml:778
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
@@ -7449,12 +7247,12 @@ msgstr ""
"und Fehler, die die Paketindexlisten-Diffs betreffen, ausgeben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:786
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:805
+#: apt.conf.5.xml:790
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
@@ -7464,12 +7262,12 @@ msgstr ""
"werden."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:812
+#: apt.conf.5.xml:797
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:816
+#: apt.conf.5.xml:801
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
@@ -7477,12 +7275,12 @@ msgstr ""
"durchführen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:823
+#: apt.conf.5.xml:808
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr "<literal>Debug::pkgAutoRemove</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:827
+#: apt.conf.5.xml:812
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
@@ -7492,12 +7290,12 @@ msgstr ""
"beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:834
+#: apt.conf.5.xml:819
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:837
+#: apt.conf.5.xml:822
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -7513,12 +7311,12 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:848
+#: apt.conf.5.xml:833
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:851
+#: apt.conf.5.xml:836
msgid ""
"Generate debug messages describing which package is marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -7550,23 +7348,23 @@ msgstr ""
"erscheint."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:870
+#: apt.conf.5.xml:855
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr "<literal>Debug::pkgInitConfig</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:873
+#: apt.conf.5.xml:858
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:880
+#: apt.conf.5.xml:865
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr "<literal>Debug::pkgDPkgPM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:883
+#: apt.conf.5.xml:868
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
@@ -7576,12 +7374,12 @@ msgstr ""
"sind."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:891
+#: apt.conf.5.xml:876
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:894
+#: apt.conf.5.xml:879
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
@@ -7590,12 +7388,12 @@ msgstr ""
"alle während deren Auswertung gefundenen Fehler ausgeben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:901
+#: apt.conf.5.xml:886
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr "<literal>Debug::pkgOrderList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:905
+#: apt.conf.5.xml:890
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
@@ -7605,12 +7403,12 @@ msgstr ""
"soll."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:913
+#: apt.conf.5.xml:898
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr "<literal>Debug::pkgPackageManager</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:917
+#: apt.conf.5.xml:902
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
@@ -7618,22 +7416,22 @@ msgstr ""
"von &dpkg; ausgeführt werden."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:924
+#: apt.conf.5.xml:909
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr "<literal>Debug::pkgPolicy</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:928
+#: apt.conf.5.xml:913
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:934
+#: apt.conf.5.xml:919
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr "<literal>Debug::pkgProblemResolver</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:938
+#: apt.conf.5.xml:923
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
@@ -7643,12 +7441,12 @@ msgstr ""
"aufgetreten ist)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:946
+#: apt.conf.5.xml:931
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:949
+#: apt.conf.5.xml:934
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 "
@@ -7660,12 +7458,12 @@ msgstr ""
"beschrieben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:957
+#: apt.conf.5.xml:942
msgid "<literal>Debug::sourceList</literal>"
msgstr "<literal>Debug::sourceList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:961
+#: apt.conf.5.xml:946
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
@@ -7674,7 +7472,7 @@ msgstr ""
"gelesenen Anbieter ausgeben."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:968
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -7683,13 +7481,13 @@ msgstr ""
"möglichen Optionen zeigen."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:990
+#: apt.conf.5.xml:975
msgid "&file-aptconf;"
msgstr "&file-aptconf;"
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:995
+#: apt.conf.5.xml:980
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
@@ -8928,17 +8726,11 @@ msgstr "Paketressourcenliste für APT"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:34
-#, fuzzy
-#| msgid ""
-#| "The package resource list is used to locate archives of the package "
-#| "distribution system in use on the system. At this time, this manual page "
-#| "documents only the packaging system used by the Debian GNU/Linux system. "
-#| "This control file is located in <filename>/etc/apt/sources.list</filename>"
msgid ""
"The package resource list is used to locate archives of the package "
"distribution system in use on the system. At this time, this manual page "
"documents only the packaging system used by the Debian GNU/Linux system. "
-"This control file is <filename>/etc/apt/sources.list</filename>."
+"This control file is located in <filename>/etc/apt/sources.list</filename>"
msgstr ""
"Die Paketquellenliste wird benutzt, um Archive des Paketverteilungssystems, "
"das auf dem System benutzt wird, zu finden. Momentan dokumentiert diese "
@@ -8948,22 +8740,12 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:39
-#, fuzzy
-#| msgid ""
-#| "The source list is designed to support any number of active sources and a "
-#| "variety of source media. The file lists one source per line, with the "
-#| "most preferred source listed first. The format of each line is: "
-#| "<literal>type uri args</literal> The first item, <literal>type</literal> "
-#| "determines the format for <literal>args</literal> <literal>uri</literal> "
-#| "is a Universal Resource Identifier (URI), which is a superset of the more "
-#| "specific and well-known Universal Resource Locator, or URL. The rest of "
-#| "the line can be marked as a comment by using a #."
msgid ""
"The source list is designed to support any number of active sources and a "
"variety of source media. The file lists one source per line, with the most "
"preferred source listed first. The format of each line is: <literal>type uri "
"args</literal> The first item, <literal>type</literal> determines the format "
-"for <literal>args</literal>. <literal>uri</literal> is a Universal Resource "
+"for <literal>args</literal> <literal>uri</literal> is a Universal Resource "
"Identifier (URI), which is a superset of the more specific and well-known "
"Universal Resource Locator, or URL. The rest of the line can be marked as a "
"comment by using a #."
@@ -9009,24 +8791,13 @@ msgstr "Die Typen deb und deb-src"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:61
-#, fuzzy
-#| msgid ""
-#| "The <literal>deb</literal> type describes a typical two-level Debian "
-#| "archive, <filename>distribution/component</filename>. Typically, "
-#| "<literal>distribution</literal> is generally one of <literal>stable</"
-#| "literal> <literal>unstable</literal> or <literal>testing</literal> while "
-#| "component is one of <literal>main</literal> <literal>contrib</literal> "
-#| "<literal>non-free</literal> or <literal>non-us</literal> The <literal>deb-"
-#| "src</literal> type describes a debian distribution's source code in the "
-#| "same form as the <literal>deb</literal> type. A <literal>deb-src</"
-#| "literal> line is required to fetch source indexes."
msgid ""
"The <literal>deb</literal> type describes a typical two-level Debian "
"archive, <filename>distribution/component</filename>. Typically, "
"<literal>distribution</literal> is generally one of <literal>stable</"
"literal> <literal>unstable</literal> or <literal>testing</literal> while "
"component is one of <literal>main</literal> <literal>contrib</literal> "
-"<literal>non-free</literal> or <literal>non-us</literal>. The <literal>deb-"
+"<literal>non-free</literal> or <literal>non-us</literal> The <literal>deb-"
"src</literal> type describes a debian distribution's source code in the same "
"form as the <literal>deb</literal> type. A <literal>deb-src</literal> line "
"is required to fetch source indexes."
@@ -9044,13 +8815,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:73
-#, fuzzy
-#| msgid ""
-#| "The format for a <filename>sources.list</filename> entry using the "
-#| "<literal>deb</literal> and <literal>deb-src</literal> types are:"
msgid ""
"The format for a <filename>sources.list</filename> entry using the "
-"<literal>deb</literal> and <literal>deb-src</literal> types is:"
+"<literal>deb</literal> and <literal>deb-src</literal> types are:"
msgstr ""
"Das Format für einen <filename>sources.list</filename>-Eintrag, der die "
"<literal>deb</literal>- und <literal>deb-src</literal>-Typen benutzt, ist:"
@@ -9063,23 +8830,13 @@ msgstr "deb URI Distribution [Komponente1] [Komponente2] [...]"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:78
-#, fuzzy
-#| msgid ""
-#| "The URI for the <literal>deb</literal> type must specify the base of the "
-#| "Debian distribution, from which APT will find the information it needs. "
-#| "<literal>distribution</literal> can specify an exact path, in which case "
-#| "the components must be omitted and <literal>distribution</literal> must "
-#| "end with a slash (/). This is useful for when only a particular sub-"
-#| "section of the archive denoted by the URI is of interest. If "
-#| "<literal>distribution</literal> does not specify an exact path, at least "
-#| "one <literal>component</literal> must be present."
msgid ""
"The URI for the <literal>deb</literal> type must specify the base of the "
"Debian distribution, from which APT will find the information it needs. "
"<literal>distribution</literal> can specify an exact path, in which case the "
"components must be omitted and <literal>distribution</literal> must end with "
-"a slash (/). This is useful for when the case only a particular sub-section "
-"of the archive denoted by the URI is of interest. If <literal>distribution</"
+"a slash (/). This is useful for when only a particular sub-section of the "
+"archive denoted by the URI is of interest. If <literal>distribution</"
"literal> does not specify an exact path, at least one <literal>component</"
"literal> must be present."
msgstr ""
@@ -9094,14 +8851,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:87
-#, fuzzy
-#| msgid ""
-#| "<literal> distribution</literal> may also contain a variable, <literal>"
-#| "$(ARCH)</literal> which expands to the Debian architecture (i386, m68k, "
-#| "powerpc, ...) used on the system. This permits architecture-independent "
-#| "<filename>sources.list</filename> files to be used. In general this is "
-#| "only of interest when specifying an exact path, <literal>APT</literal> "
-#| "will automatically generate a URI with the current architecture otherwise."
msgid ""
"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)"
"</literal> which expands to the Debian architecture (i386, m68k, "
@@ -9209,20 +8958,12 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: sources.list.5.xml:141
-#, fuzzy
-#| msgid ""
-#| "The http scheme specifies an HTTP server for the archive. If an "
-#| "environment variable <envar>http_proxy</envar> is set with the format "
-#| "http://server:port/, the proxy server specified in <envar>http_proxy</"
-#| "envar> will be used. Users of authenticated HTTP/1.1 proxies may use a "
-#| "string of the format http://user:pass@server:port/ Note that this is an "
-#| "insecure method of authentication."
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format http://server:"
"port/, the proxy server specified in <envar>http_proxy</envar> will be used. "
"Users of authenticated HTTP/1.1 proxies may use a string of the format "
-"http://user:pass@server:port/. Note that this is an insecure method of "
+"http://user:pass@server:port/ Note that this is an insecure method of "
"authentication."
msgstr ""
"Das http-Schema gibt einen HTTP-Server für das Archiv an. Wenn eine "
@@ -9295,24 +9036,6 @@ msgstr ""
"<command>find</command> und <command>dd</command>, um die Datenübertragung "
"aus der Ferne durchzuführen."
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:178
-msgid "more recongnizable URI types"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:180
-msgid ""
-"APT can be extended with more methods shipped in other optional packages "
-"which should follow the nameing scheme <literal>apt-transport-"
-"<replaceable>method</replaceable></literal>. The APT team e.g. maintain "
-"also the <literal>apt-transport-https</literal> package which provides "
-"access methods for https-URIs with features similiar to the http method, but "
-"other methods for using e.g. debtorrent are also available, see "
-"<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></"
-"refentrytitle> <manvolnum>1</manvolnum></citerefentry>."
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:122
msgid ""
@@ -9323,7 +9046,7 @@ msgstr ""
"<placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:194
+#: sources.list.5.xml:182
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
@@ -9332,36 +9055,36 @@ msgstr ""
"jason/debian für stable/main, stable/contrib und stable/non-free."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:196
+#: sources.list.5.xml:184
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr "deb file:/home/jason/debian stable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:198
+#: sources.list.5.xml:186
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
"Wie oben, außer das dies die unstable- (Entwicklungs-) Distribution benutzt."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:199
+#: sources.list.5.xml:187
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr "deb file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:201
+#: sources.list.5.xml:189
msgid "Source line for the above"
msgstr "Quellzeile für obiges"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:202
+#: sources.list.5.xml:190
#, no-wrap
msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:204
+#: sources.list.5.xml:192
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -9370,13 +9093,13 @@ msgstr ""
"den hamm/main-Bereich zu benutzen."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:194
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr "deb http://archive.debian.org/debian-archive hamm main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:208
+#: sources.list.5.xml:196
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the stable/contrib area."
@@ -9385,24 +9108,18 @@ msgstr ""
"Verzeichnis zuzugreifen und nur den stable/contrib-Bereich zu benutzen."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:210
+#: sources.list.5.xml:198
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian stable contrib"
msgstr "deb ftp://ftp.debian.org/debian stable contrib"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:212
-#, fuzzy
-#| msgid ""
-#| "Uses FTP to access the archive at ftp.debian.org, under the debian "
-#| "directory, and uses only the unstable/contrib area. If this line appears "
-#| "as well as the one in the previous example in <filename>sources.list</"
-#| "filename>. a single FTP session will be used for both resource lines."
+#: sources.list.5.xml:200
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
-"well as the one in the previous example in <filename>sources.list</filename> "
-"a single FTP session will be used for both resource lines."
+"well as the one in the previous example in <filename>sources.list</"
+"filename>. a single FTP session will be used for both resource lines."
msgstr ""
"Benutzt FTP, um auf das Archiv auf ftp.debian.org unter dem debian-"
"Verzeichnis zuzugreifen und nur den unstable/contrib-Bereich zu benutzen. "
@@ -9411,13 +9128,13 @@ msgstr ""
"für beide Quellzeilen benutzt."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:216
+#: sources.list.5.xml:204
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:218
+#: sources.list.5.xml:206
msgid ""
"Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US "
"directory."
@@ -9426,19 +9143,19 @@ msgstr ""
"Verzeichnis zuzugreifen."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:208
#, no-wrap
msgid "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free"
msgstr "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:229
+#: sources.list.5.xml:217
#, no-wrap
msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
msgstr "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:210
msgid ""
"Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US "
"directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -9457,1086 +9174,6 @@ msgstr ""
"id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:234
+#: sources.list.5.xml:222
msgid "&apt-cache; &apt-conf;"
msgstr "&apt-cache; &apt-conf;"
-
-#. type: <title></title>
-#: guide.sgml:4
-msgid "APT User's Guide"
-msgstr ""
-
-#. type: <author></author>
-#: guide.sgml:6 offline.sgml:6
-msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
-msgstr ""
-
-#. type: <version></version>
-#: guide.sgml:7
-msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
-msgstr ""
-
-#. type: <abstract></abstract>
-#: guide.sgml:11
-msgid ""
-"This document provides an overview of how to use the the APT package manager."
-msgstr ""
-
-#. type: <copyrightsummary></copyrightsummary>
-#: guide.sgml:15
-msgid "Copyright &copy; Jason Gunthorpe, 1998."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:21 offline.sgml:22
-msgid ""
-"\"APT\" and this document are free software; you can redistribute them and/"
-"or modify them under the terms of the GNU General Public License as "
-"published by the Free Software Foundation; either version 2 of the License, "
-"or (at your option) any later version."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:24 offline.sgml:25
-msgid ""
-"For more details, on Debian GNU/Linux systems, see the file /usr/share/"
-"common-licenses/GPL for the full license."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:32
-#, fuzzy
-#| msgid "generate"
-msgid "General"
-msgstr "generate"
-
-#. type: <p></p>
-#: guide.sgml:38
-msgid ""
-"The APT package currently contains two sections, the APT <prgn>dselect</"
-"prgn> method and the <prgn>apt-get</prgn> command line user interface. Both "
-"provide a way to install and remove packages as well as download new "
-"packages from the Internet."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:39
-msgid "Anatomy of the Package System"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:44
-msgid ""
-"The Debian packaging system has a large amount of information associated "
-"with each package to help assure that it integrates cleanly and easily into "
-"the system. The most prominent of its features is the dependency system."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:52
-msgid ""
-"The dependency system allows individual programs to make use of shared "
-"elements in the system such as libraries. It simplifies placing infrequently "
-"used portions of a program in separate packages to reduce the number of "
-"things the average user is required to install. Also, it allows for choices "
-"in mail transport agents, X servers and so on."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:57
-msgid ""
-"The first step to understanding the dependency system is to grasp the "
-"concept of a simple dependency. The meaning of a simple dependency is that a "
-"package requires another package to be installed at the same time to work "
-"properly."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:63
-msgid ""
-"For instance, mailcrypt is an emacs extension that aids in encrypting email "
-"with GPG. Without GPGP installed mail-crypt is useless, so mailcrypt has a "
-"simple dependency on GPG. Also, because it is an emacs extension it has a "
-"simple dependency on emacs, without emacs it is completely useless."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:73
-msgid ""
-"The other important dependency to understand is a conflicting dependency. It "
-"means that a package, when installed with another package, will not work and "
-"may possibly be extremely harmful to the system. As an example consider a "
-"mail transport agent such as sendmail, exim or qmail. It is not possible to "
-"have two mail transport agents installed because both need to listen to the "
-"network to receive mail. Attempting to install two will seriously damage the "
-"system so all mail transport agents have a conflicting dependency with all "
-"other mail transport agents."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:83
-msgid ""
-"As an added complication there is the possibility for a package to pretend "
-"to be another package. Consider that exim and sendmail for many intents are "
-"identical, they both deliver mail and understand a common interface. Hence, "
-"the package system has a way for them to declare that they are both mail-"
-"transport-agents. So, exim and sendmail both declare that they provide a "
-"mail-transport-agent and other packages that need a mail transport agent "
-"depend on mail-transport-agent. This can add a great deal of confusion when "
-"trying to manually fix packages."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:88
-msgid ""
-"At any given time a single dependency may be met by packages that are "
-"already installed or it may not be. APT attempts to help resolve dependency "
-"issues by providing a number of automatic algorithms that help in selecting "
-"packages for installation."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:102
-msgid ""
-"<prgn>apt-get</prgn> provides a simple way to install packages from the "
-"command line. Unlike <prgn>dpkg</prgn>, <prgn>apt-get</prgn> does not "
-"understand .deb files, it works with the package's proper name and can only "
-"install .deb archives from a <em>Source</em>."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:109
-msgid ""
-"The first <footnote><p>If you are using an http proxy server you must set "
-"the http_proxy environment variable first, see sources.list(5)</p></"
-"footnote> thing that should be done before using <prgn>apt-get</prgn> is to "
-"fetch the package lists from the <em>Sources</em> so that it knows what "
-"packages are available. This is done with <tt>apt-get update</tt>. For "
-"instance,"
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:116
-#, no-wrap
-msgid ""
-"# apt-get update\n"
-"Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
-"Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
-"Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
-msgstr ""
-
-#. type: <p><taglist>
-#: guide.sgml:120
-msgid "Once updated there are several commands that can be used:"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:131
-msgid ""
-"Upgrade will attempt to gently upgrade the whole system. Upgrade will never "
-"install a new package or remove an existing package, nor will it ever "
-"upgrade a package that might cause some other package to break. This can be "
-"used daily to relatively safely upgrade the system. Upgrade will list all of "
-"the packages that it could not upgrade, this usually means that they depend "
-"on new packages or conflict with some other package. <prgn>dselect</prgn> or "
-"<tt>apt-get install</tt> can be used to force these packages to install."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:140
-msgid ""
-"Install is used to install packages by name. The package is automatically "
-"fetched and installed. This can be useful if you already know the name of "
-"the package to install and do not want to go into a GUI to select it. Any "
-"number of packages may be passed to install, they will all be fetched. "
-"Install automatically attempts to resolve dependency problems with the "
-"listed packages and will print a summary and ask for confirmation if "
-"anything other than its arguments are changed."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:149
-msgid ""
-"Dist-upgrade is a complete upgrader designed to simplify upgrading between "
-"releases of Debian. It uses a sophisticated algorithm to determine the best "
-"set of packages to install, upgrade and remove to get as much of the system "
-"to the newest release. In some situations it may be desired to use dist-"
-"upgrade rather than spend the time manually resolving dependencies in "
-"<prgn>dselect</prgn>. Once dist-upgrade has completed then <prgn>dselect</"
-"prgn> can be used to install any packages that may have been left out."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:152
-msgid ""
-"It is important to closely look at what dist-upgrade is going to do, its "
-"decisions may sometimes be quite surprising."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:163
-msgid ""
-"<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
-"option is <tt>-d</tt> which does not install the fetched files. If the "
-"system has to download a large number of package it would be undesired to "
-"start installing them in case something goes wrong. When <tt>-d</tt> is used "
-"the downloaded archives can be installed by simply running the command that "
-"caused them to be downloaded again without <tt>-d</tt>."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:168
-#, fuzzy
-#| msgid "APT in DSelect"
-msgid "DSelect"
-msgstr "APT in DSelect"
-
-#. type: <p></p>
-#: guide.sgml:173
-msgid ""
-"The APT <prgn>dselect</prgn> method provides the complete APT system with "
-"the <prgn>dselect</prgn> package selection GUI. <prgn>dselect</prgn> is used "
-"to select the packages to be installed or removed and APT actually installs "
-"them."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:184
-msgid ""
-"To enable the APT method you need to to select [A]ccess in <prgn>dselect</"
-"prgn> and then choose the APT method. You will be prompted for a set of "
-"<em>Sources</em> which are places to fetch archives from. These can be "
-"remote Internet sites, local Debian mirrors or CDROMs. Each source can "
-"provide a fragment of the total Debian archive, APT will automatically "
-"combine them to form a complete set of packages. If you have a CDROM then it "
-"is a good idea to specify it first and then specify a mirror so that you "
-"have access to the latest bug fixes. APT will automatically use packages on "
-"your CDROM before downloading from the Internet."
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:198
-#, no-wrap
-msgid ""
-" Set up a list of distribution source locations\n"
-"\t \n"
-" Please give the base URL of the debian distribution.\n"
-" The access schemes I know about are: http file\n"
-"\t \n"
-" For example:\n"
-" file:/mnt/debian,\n"
-" ftp://ftp.debian.org/debian,\n"
-" http://ftp.de.debian.org/debian,\n"
-" \n"
-" \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:205
-msgid ""
-"The <em>Sources</em> setup starts by asking for the base of the Debian "
-"archive, defaulting to a HTTP mirror. Next it asks for the distribution to "
-"get."
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:212
-#, no-wrap
-msgid ""
-" Please give the distribution tag to get or a path to the\n"
-" package file ending in a /. The distribution\n"
-" tags are typically something like: stable unstable testing non-US\n"
-" \n"
-" Distribution [stable]:"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:222
-msgid ""
-"The distribution refers to the Debian version in the archive, <em>stable</"
-"em> refers to the latest released version and <em>unstable</em> refers to "
-"the developmental version. <em>non-US</em> is only available on some mirrors "
-"and refers to packages that contain encryption technology or other things "
-"that cannot be exported from the United States. Importing these packages "
-"into the US is legal however."
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:228
-#, no-wrap
-msgid ""
-" Please give the components to get\n"
-" The components are typically something like: main contrib non-free\n"
-" \n"
-" Components [main contrib non-free]:"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:236
-msgid ""
-"The components list refers to the list of sub distributions to fetch. The "
-"distribution is split up based on software licenses, main being DFSG free "
-"packages while contrib and non-free contain things that have various "
-"restrictions placed on their use and distribution."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:240
-msgid ""
-"Any number of sources can be added, the setup script will continue to prompt "
-"until you have specified all that you want."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:247
-msgid ""
-"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a super-set of "
-"<tt>apt-get update</tt> that makes the fetched information available to "
-"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
-"tt> has been run before."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:253
-msgid ""
-"You can then go on and make your selections using [S]elect and then perform "
-"the installation using [I]nstall. When using the APT method the [C]onfig and "
-"[R]emove commands have no meaning, the [I]nstall command performs both of "
-"them together."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:258
-msgid ""
-"By default APT will automatically remove the package (.deb) files once they "
-"have been successfully installed. To change this behavior place <tt>Dselect::"
-"clean \"prompt\";</tt> in /etc/apt/apt.conf."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:264
-msgid "The Interface"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:278
-msgid ""
-"Both that APT <prgn>dselect</prgn> method and <prgn>apt-get</prgn> share the "
-"same interface. It is a simple system that generally tells you what it will "
-"do and then goes and does it. <footnote><p>The <prgn>dselect</prgn> method "
-"actually is a set of wrapper scripts to <prgn>apt-get</prgn>. The method "
-"actually provides more functionality than is present in <prgn>apt-get</prgn> "
-"alone.</p></footnote> After printing out a summary of what will happen APT "
-"then will print out some informative status messages so that you can "
-"estimate how far along it is and how much is left to do."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:280
-msgid "Startup"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:284
-msgid ""
-"Before all operations except update, APT performs a number of actions to "
-"prepare its internal state. It also does some checks of the system's state. "
-"At any time these operations can be performed by running <tt>apt-get check</"
-"tt>."
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:289
-#, no-wrap
-msgid ""
-"# apt-get check\n"
-"Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:297
-msgid ""
-"The first thing it does is read all the package files into memory. APT uses "
-"a caching scheme so this operation will be faster the second time it is run. "
-"If some of the package files are not found then they will be ignored and a "
-"warning will be printed when apt-get exits."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:303
-msgid ""
-"The final operation performs a detailed analysis of the system's "
-"dependencies. It checks every dependency of every installed or unpacked "
-"package and considers if it is OK. Should this find a problem then a report "
-"will be printed out and <prgn>apt-get</prgn> will refuse to run."
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:320
-#, no-wrap
-msgid ""
-"# apt-get check\n"
-"Reading Package Lists... Done\n"
-"Building Dependency Tree... Done\n"
-"You might want to run apt-get -f install' to correct these.\n"
-"Sorry, but the following packages have unmet dependencies:\n"
-" 9fonts: Depends: xlib6g but it is not installed\n"
-" uucp: Depends: mailx but it is not installed\n"
-" blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n"
-" adduser: Depends: perl-base but it is not installed\n"
-" aumix: Depends: libgpmg1 but it is not installed\n"
-" debiandoc-sgml: Depends: sgml-base but it is not installed\n"
-" bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
-" cthugha: Depends: svgalibg1 but it is not installed\n"
-" Depends: xlib6g (>= 3.3-5) but it is not installed\n"
-" libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:329
-msgid ""
-"In this example the system has many problems, including a serious problem "
-"with libreadlineg2. For each package that has unmet dependencies a line is "
-"printed out indicating the package with the problem and the dependencies "
-"that are unmet. A short explanation of why the package has a dependency "
-"problem is also included."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:337
-msgid ""
-"There are two ways a system can get into a broken state like this. The first "
-"is caused by <prgn>dpkg</prgn> missing some subtle relationships between "
-"packages when performing upgrades. <footnote><p>APT however considers all "
-"known dependencies and attempts to prevent broken packages</p></footnote>. "
-"The second is if a package installation fails during an operation. In this "
-"situation a package may have been unpacked without its dependents being "
-"installed."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:345
-msgid ""
-"The second situation is much less serious than the first because APT places "
-"certain constraints on the order that packages are installed. In both cases "
-"supplying the <tt>-f</tt> option to <prgn>apt-get</prgn> will cause APT to "
-"deduce a possible solution to the problem and then continue on. The APT "
-"<prgn>dselect</prgn> method always supplies the <tt>-f</tt> option to allow "
-"for easy continuation of failed maintainer scripts."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:351
-msgid ""
-"However, if the <tt>-f</tt> option is used to correct a seriously broken "
-"system caused by the first case then it is possible that it will either fail "
-"immediately or the installation sequence will fail. In either case it is "
-"necessary to manually use dpkg (possibly with forcing options) to correct "
-"the situation enough to allow APT to proceed."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:356
-msgid "The Status Report"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:363
-msgid ""
-"Before proceeding <prgn>apt-get</prgn> will present a report on what will "
-"happen. Generally the report reflects the type of operation being performed "
-"but there are several common elements. In all cases the lists reflect the "
-"final state of things, taking into account the <tt>-f</tt> option and any "
-"other relevant activities to the command being executed."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:364
-msgid "The Extra Package list"
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:372
-#, no-wrap
-msgid ""
-"The following extra packages will be installed:\n"
-" libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n"
-" mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
-" bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
-" squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-" ssh"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:379
-msgid ""
-"The Extra Package list shows all of the packages that will be installed or "
-"upgraded in excess of the ones mentioned on the command line. It is only "
-"generated for an <tt>install</tt> command. The listed packages are often the "
-"result of an Auto Install."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:382
-msgid "The Packages to Remove"
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:389
-#, no-wrap
-msgid ""
-"The following packages will be REMOVED:\n"
-" xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
-" xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
-" xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-" nas xpilot xfig"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:399
-msgid ""
-"The Packages to Remove list shows all of the packages that will be removed "
-"from the system. It can be shown for any of the operations and should be "
-"given a careful inspection to ensure nothing important is to be taken off. "
-"The <tt>-f</tt> option is especially good at generating packages to remove "
-"so extreme care should be used in that case. The list may contain packages "
-"that are going to be removed because they are only partially installed, "
-"possibly due to an aborted installation."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:402
-msgid "The New Packages list"
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:406
-#, no-wrap
-msgid ""
-"The following NEW packages will installed:\n"
-" zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:411
-msgid ""
-"The New Packages list is simply a reminder of what will happen. The packages "
-"listed are not presently installed in the system but will be when APT is "
-"done."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:414
-msgid "The Kept Back list"
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:419
-#, no-wrap
-msgid ""
-"The following packages have been kept back\n"
-" compface man-db tetex-base msql libpaper svgalib1\n"
-" gs snmp arena lynx xpat2 groff xscreensaver"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:428
-msgid ""
-"Whenever the whole system is being upgraded there is the possibility that "
-"new versions of packages cannot be installed because they require new things "
-"or conflict with already installed things. In this case the package will "
-"appear in the Kept Back list. The best way to convince packages listed there "
-"to install is with <tt>apt-get install</tt> or by using <prgn>dselect</prgn> "
-"to resolve their problems."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:431
-msgid "Held Packages warning"
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:435
-#, no-wrap
-msgid ""
-"The following held packages will be changed:\n"
-" cvs"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:441
-msgid ""
-"Sometimes you can ask APT to install a package that is on hold, in such a "
-"case it prints out a warning that the held package is going to be changed. "
-"This should only happen during dist-upgrade or install."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:444
-msgid "Final summary"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:447
-msgid ""
-"Finally, APT will print out a summary of all the changes that will occur."
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:452
-#, no-wrap
-msgid ""
-"206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.\n"
-"12 packages not fully installed or removed.\n"
-"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:470
-msgid ""
-"The first line of the summary simply is a reduced version of all of the "
-"lists and includes the number of upgrades - that is packages already "
-"installed that have new versions available. The second line indicates the "
-"number of poorly configured packages, possibly the result of an aborted "
-"installation. The final line shows the space requirements that the "
-"installation needs. The first pair of numbers refer to the size of the "
-"archive files. The first number indicates the number of bytes that must be "
-"fetched from remote locations and the second indicates the total size of all "
-"the archives required. The next number indicates the size difference between "
-"the presently installed packages and the newly installed packages. It is "
-"roughly equivalent to the space required in /usr after everything is done. "
-"If a large number of packages are being removed then the value may indicate "
-"the amount of space that will be freed."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:473
-msgid ""
-"Some other reports can be generated by using the -u option to show packages "
-"to upgrade, they are similar to the previous examples."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:477
-msgid "The Status Display"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:481
-msgid ""
-"During the download of archives and package files APT prints out a series of "
-"status messages."
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:490
-#, no-wrap
-msgid ""
-"# apt-get update\n"
-"Get:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"
-"Get:2 http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
-"Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
-"Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
-"Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:500
-msgid ""
-"The lines starting with <em>Get</em> are printed out when APT begins to "
-"fetch a file while the last line indicates the progress of the download. The "
-"first percent value on the progress line indicates the total percent done of "
-"all files. Unfortunately since the size of the Package files is unknown "
-"<tt>apt-get update</tt> estimates the percent done which causes some "
-"inaccuracies."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:509
-msgid ""
-"The next section of the status line is repeated once for each download "
-"thread and indicates the operation being performed and some useful "
-"information about what is happening. Sometimes this section will simply read "
-"<em>Forking</em> which means the OS is loading the download module. The "
-"first word after the [ is the fetch number as shown on the history lines. "
-"The next word is the short form name of the object being downloaded. For "
-"archives it will contain the name of the package that is being fetched."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:524
-msgid ""
-"Inside of the single quote is an informative string indicating the progress "
-"of the negotiation phase of the download. Typically it progresses from "
-"<em>Connecting</em> to <em>Waiting for file</em> to <em>Downloading</em> or "
-"<em>Resuming</em>. The final value is the number of bytes downloaded from "
-"the remote site. Once the download begins this is represented as "
-"<tt>102/10.2k</tt> indicating that 102 bytes have been fetched and 10.2 "
-"kilobytes is expected. The total size is always shown in 4 figure notation "
-"to preserve space. After the size display is a percent meter for the file "
-"itself. The second last element is the instantaneous average speed. This "
-"values is updated every 5 seconds and reflects the rate of data transfer for "
-"that period. Finally is shown the estimated transfer time. This is updated "
-"regularly and reflects the time to complete everything at the shown transfer "
-"rate."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:530
-msgid ""
-"The status display updates every half second to provide a constant feedback "
-"on the download progress while the Get lines scroll back whenever a new file "
-"is started. Since the status display is constantly updated it is unsuitable "
-"for logging to a file, use the <tt>-q</tt> option to remove the status "
-"display."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:535
-msgid "Dpkg"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:542
-msgid ""
-"APT uses <prgn>dpkg</prgn> for installing the archives and will switch over "
-"to the <prgn>dpkg</prgn> interface once downloading is completed. "
-"<prgn>dpkg</prgn> will also ask a number of questions as it processes the "
-"packages and the packages themselves may also ask several questions. Before "
-"each question there is usually a description of what it is asking and the "
-"questions are too varied to discuss completely here."
-msgstr ""
-
-#. type: <title></title>
-#: offline.sgml:4
-msgid "Using APT Offline"
-msgstr ""
-
-#. type: <version></version>
-#: offline.sgml:7
-msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-msgstr ""
-
-#. type: <abstract></abstract>
-#: offline.sgml:12
-msgid ""
-"This document describes how to use APT in a non-networked environment, "
-"specifically a 'sneaker-net' approach for performing upgrades."
-msgstr ""
-
-#. type: <copyrightsummary></copyrightsummary>
-#: offline.sgml:16
-msgid "Copyright &copy; Jason Gunthorpe, 1999."
-msgstr ""
-
-#. type: <heading></heading>
-#: offline.sgml:32
-msgid "Introduction"
-msgstr ""
-
-#. type: <heading></heading>
-#: offline.sgml:34 offline.sgml:65 offline.sgml:180
-#, fuzzy
-#| msgid "OverrideDir"
-msgid "Overview"
-msgstr "OverrideDir"
-
-#. type: <p></p>
-#: offline.sgml:40
-msgid ""
-"Normally APT requires direct access to a Debian archive, either from a local "
-"media or through a network. Another common complaint is that a Debian "
-"machine is on a slow link, such as a modem and another machine has a very "
-"fast connection but they are physically distant."
-msgstr ""
-
-#. type: <p></p>
-#: offline.sgml:51
-msgid ""
-"The solution to this is to use large removable media such as a Zip disc or a "
-"SuperDisk disc. These discs are not large enough to store the entire Debian "
-"archive but can easily fit a subset large enough for most users. The idea is "
-"to use APT to generate a list of packages that are required and then fetch "
-"them onto the disc using another machine with good connectivity. It is even "
-"possible to use another Debian machine with APT or to use a completely "
-"different OS and a download tool like wget. Let <em>remote host</em> mean "
-"the machine downloading the packages, and <em>target host</em> the one with "
-"bad or no connection."
-msgstr ""
-
-#. type: <p></p>
-#: offline.sgml:57
-msgid ""
-"This is achieved by creatively manipulating the APT configuration file. The "
-"essential premis to tell APT to look on a disc for it's archive files. Note "
-"that the disc should be formated with a filesystem that can handle long file "
-"names such as ext2, fat32 or vfat."
-msgstr ""
-
-#. type: <heading></heading>
-#: offline.sgml:63
-msgid "Using APT on both machines"
-msgstr ""
-
-#. type: <p><example>
-#: offline.sgml:71
-msgid ""
-"APT being available on both machines gives the simplest configuration. The "
-"basic idea is to place a copy of the status file on the disc and use the "
-"remote machine to fetch the latest package files and decide which packages "
-"to download. The disk directory structure should look like:"
-msgstr ""
-
-#. type: <example></example>
-#: offline.sgml:80
-#, no-wrap
-msgid ""
-" /disc/\n"
-" archives/\n"
-" partial/\n"
-" lists/\n"
-" partial/\n"
-" status\n"
-" sources.list\n"
-" apt.conf"
-msgstr ""
-
-#. type: <heading></heading>
-#: offline.sgml:88
-#, fuzzy
-#| msgid "User configuration"
-msgid "The configuration file"
-msgstr "Benutzerkonfiguration"
-
-#. type: <p></p>
-#: offline.sgml:96
-msgid ""
-"The configuration file should tell APT to store its files on the disc and to "
-"use the configuration files on the disc as well. The sources.list should "
-"contain the proper sites that you wish to use from the remote machine, and "
-"the status file should be a copy of <em>/var/lib/dpkg/status</em> from the "
-"<em>target host</em>. Please note, if you are using a local archive you must "
-"use copy URIs, the syntax is identical to file URIs."
-msgstr ""
-
-#. type: <p><example>
-#: offline.sgml:100
-msgid ""
-"<em>apt.conf</em> must contain the necessary information to make APT use the "
-"disc:"
-msgstr ""
-
-#. type: <example></example>
-#: offline.sgml:124
-#, no-wrap
-msgid ""
-" APT\n"
-" {\n"
-" /* This is not necessary if the two machines are the same arch, it tells\n"
-" the remote APT what architecture the target machine is */\n"
-" Architecture \"i386\";\n"
-" \n"
-" Get::Download-Only \"true\";\n"
-" };\n"
-" \n"
-" Dir\n"
-" {\n"
-" /* Use the disc for state information and redirect the status file from\n"
-" the /var/lib/dpkg default */\n"
-" State \"/disc/\";\n"
-" State::status \"status\";\n"
-"\n"
-" // Binary caches will be stored locally\n"
-" Cache::archives \"/disc/archives/\";\n"
-" Cache \"/tmp/\";\n"
-" \n"
-" // Location of the source list.\n"
-" Etc \"/disc/\";\n"
-" };"
-msgstr ""
-
-#. type: </example></p>
-#: offline.sgml:129
-msgid ""
-"More details can be seen by examining the apt.conf man page and the sample "
-"configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>."
-msgstr ""
-
-#. type: <p><example>
-#: offline.sgml:136
-msgid ""
-"On the target machine the first thing to do is mount the disc and copy <em>/"
-"var/lib/dpkg/status</em> to it. You will also need to create the directories "
-"outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
-"em> Then take the disc to the remote machine and configure the sources.list. "
-"On the remote machine execute the following:"
-msgstr ""
-
-#. type: <example></example>
-#: offline.sgml:142
-#, no-wrap
-msgid ""
-" # export APT_CONFIG=\"/disc/apt.conf\"\n"
-" # apt-get update\n"
-" [ APT fetches the package files ]\n"
-" # apt-get dist-upgrade\n"
-" [ APT fetches all the packages needed to upgrade the target machine ]"
-msgstr ""
-
-#. type: </example></p>
-#: offline.sgml:149
-msgid ""
-"The dist-upgrade command can be replaced with any-other standard APT "
-"commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em> However this presents a problem in communicating "
-"your selections back to the local computer."
-msgstr ""
-
-#. type: <p><example>
-#: offline.sgml:153
-msgid ""
-"Now the disc contains all of the index files and archives needed to upgrade "
-"the target machine. Take the disc back and run:"
-msgstr ""
-
-#. type: <example></example>
-#: offline.sgml:159
-#, no-wrap
-msgid ""
-" # export APT_CONFIG=\"/disc/apt.conf\"\n"
-" # apt-get check\n"
-" [ APT generates a local copy of the cache files ]\n"
-" # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-" [ Or any other APT command ]"
-msgstr ""
-
-#. type: <p></p>
-#: offline.sgml:165
-msgid ""
-"It is necessary for proper function to re-specify the status file to be the "
-"local one. This is very important!"
-msgstr ""
-
-#. type: <p></p>
-#: offline.sgml:172
-msgid ""
-"If you are using dselect you can do the very risky operation of copying disc/"
-"status to /var/lib/dpkg/status so that any selections you made on the remote "
-"machine are updated. I highly recommend that people only make selections on "
-"the local machine - but this may not always be possible. DO NOT copy the "
-"status file if dpkg or APT have been run in the mean time!!"
-msgstr ""
-
-#. type: <heading></heading>
-#: offline.sgml:178
-msgid "Using APT and wget"
-msgstr ""
-
-#. type: <p></p>
-#: offline.sgml:185
-msgid ""
-"<em>wget</em> is a popular and portable download tool that can run on nearly "
-"any machine. Unlike the method above this requires that the Debian machine "
-"already has a list of available packages."
-msgstr ""
-
-#. type: <p></p>
-#: offline.sgml:190
-msgid ""
-"The basic idea is to create a disc that has only the archive files "
-"downloaded from the remote site. This is done by using the --print-uris "
-"option to apt-get and then preparing a wget script to actually fetch the "
-"packages."
-msgstr ""
-
-#. type: <heading></heading>
-#: offline.sgml:196
-#, fuzzy
-#| msgid "Options"
-msgid "Operation"
-msgstr "Optionen"
-
-#. type: <p><example>
-#: offline.sgml:200
-msgid ""
-"Unlike the previous technique no special configuration files are required. "
-"We merely use the standard APT commands to generate the file list."
-msgstr ""
-
-#. type: <example></example>
-#: offline.sgml:205
-#, no-wrap
-msgid ""
-" # apt-get dist-upgrade \n"
-" [ Press no when prompted, make sure you are happy with the actions ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
-msgstr ""
-
-#. type: </example></p>
-#: offline.sgml:210
-msgid ""
-"Any command other than dist-upgrade could be used here, including dselect-"
-"upgrade."
-msgstr ""
-
-#. type: <p></p>
-#: offline.sgml:216
-msgid ""
-"The /disc/wget-script file will now contain a list of wget commands to "
-"execute in order to fetch the necessary archives. This script should be run "
-"with the current directory as the disc's mount point so as to save the "
-"output on the disc."
-msgstr ""
-
-#. type: <p><example>
-#: offline.sgml:219
-msgid "The remote machine would do something like"
-msgstr ""
-
-#. type: <example></example>
-#: offline.sgml:223
-#, no-wrap
-msgid ""
-" # cd /disc\n"
-" # sh -x ./wget-script\n"
-" [ wait.. ]"
-msgstr ""
-
-#. type: </example><example>
-#: offline.sgml:228
-msgid ""
-"Once the archives are downloaded and the disc returned to the Debian machine "
-"installation can proceed using,"
-msgstr ""
-
-#. type: <example></example>
-#: offline.sgml:230
-#, no-wrap
-msgid " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
-msgstr ""
-
-#. type: </example></p>
-#: offline.sgml:234
-msgid "Which will use the already fetched archives on the disc."
-msgstr ""
-
-#~ msgid ""
-#~ "Disable Immediate Configuration; This dangerous option disables some of "
-#~ "APT's ordering code to cause it to make fewer dpkg calls. Doing so may be "
-#~ "necessary on some extremely slow single user systems but is very "
-#~ "dangerous and may cause package install scripts to fail or worse. Use at "
-#~ "your own risk."
-#~ msgstr ""
-#~ "Sofortkonfiguration ausschalten; Diese gefährliche Option schaltet "
-#~ "einigen Befehlscode von APT aus, um es zu veranlassen, Dpkg seltener "
-#~ "aufzurufen. Dies zu tun, könnte auf besonders langsamen "
-#~ "Einzelbenutzersystemen nötig sein, ist aber gefährlich und könnte "
-#~ "Paketinstallationsskripte zum Scheitern oder schlimmeren veranlassen. "
-#~ "Benutzen Sie es auf eigene Gefahr."
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 35eeedf9e..cab40fc9d 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-10-29 01:51+0100\n"
+"POT-Creation-Date: 2009-12-01 19:13+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"
@@ -358,17 +358,11 @@ msgstr ""
#. type: Plain text
#: apt.ent:84
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY dpkg \"<citerefentry>\n"
-#| " <refentrytitle><command>dpkg</command></refentrytitle>\n"
-#| " <manvolnum>8</manvolnum>\n"
-#| " </citerefentry>\"\n"
-#| ">\n"
+#, no-wrap
msgid ""
"<!ENTITY dpkg \"<citerefentry>\n"
" <refentrytitle><command>dpkg</command></refentrytitle>\n"
-" <manvolnum>1</manvolnum>\n"
+" <manvolnum>8</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
msgstr ""
@@ -412,17 +406,11 @@ msgstr ""
#. type: Plain text
#: apt.ent:102
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY dpkg-scanpackages \"<citerefentry>\n"
-#| " <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n"
-#| " <manvolnum>8</manvolnum>\n"
-#| " </citerefentry>\"\n"
-#| ">\n"
+#, no-wrap
msgid ""
"<!ENTITY dpkg-scanpackages \"<citerefentry>\n"
" <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n"
-" <manvolnum>1</manvolnum>\n"
+" <manvolnum>8</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
msgstr ""
@@ -434,17 +422,11 @@ msgstr ""
#. type: Plain text
#: apt.ent:108
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY dpkg-scansources \"<citerefentry>\n"
-#| " <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n"
-#| " <manvolnum>8</manvolnum>\n"
-#| " </citerefentry>\"\n"
-#| ">\n"
+#, no-wrap
msgid ""
"<!ENTITY dpkg-scansources \"<citerefentry>\n"
" <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n"
-" <manvolnum>1</manvolnum>\n"
+" <manvolnum>8</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
msgstr ""
@@ -456,17 +438,11 @@ msgstr ""
#. type: Plain text
#: apt.ent:114
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY dselect \"<citerefentry>\n"
-#| " <refentrytitle><command>dselect</command></refentrytitle>\n"
-#| " <manvolnum>8</manvolnum>\n"
-#| " </citerefentry>\"\n"
-#| ">\n"
+#, no-wrap
msgid ""
"<!ENTITY dselect \"<citerefentry>\n"
" <refentrytitle><command>dselect</command></refentrytitle>\n"
-" <manvolnum>1</manvolnum>\n"
+" <manvolnum>8</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
msgstr ""
@@ -696,7 +672,6 @@ msgstr ""
"<!ENTITY apt-author.team \"\n"
" <author>\n"
" <othername>Équipe de développement d'APT</othername>\n"
-" <contrib></contrib>\n"
" </author>\n"
"\">\n"
@@ -1379,17 +1354,10 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
#: apt-cache.8.xml:152
-#, fuzzy
-#| msgid ""
-#| "<literal>Missing</literal> is the number of package names that were "
-#| "referenced in a dependency but were not provided by any package. Missing "
-#| "packages may be in evidence if a full distribution is not accessed, or if "
-#| "a package (real or virtual) has been dropped from the distribution. "
-#| "Usually they are referenced from Conflicts or Breaks statements."
msgid ""
"<literal>Missing</literal> is the number of package names that were "
"referenced in a dependency but were not provided by any package. Missing "
-"packages may be an evidence if a full distribution is not accessed, or if a "
+"packages may be in evidence if a full distribution is not accessed, or if a "
"package (real or virtual) has been dropped from the distribution. Usually "
"they are referenced from Conflicts or Breaks statements."
msgstr ""
@@ -1586,10 +1554,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 "
@@ -1709,7 +1673,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89
-#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:456 apt.conf.5.xml:478
+#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:441 apt.conf.5.xml:463
msgid "options"
msgstr "options"
@@ -1955,7 +1919,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:988 apt_preferences.5.xml:615
+#: apt.conf.5.xml:973 apt_preferences.5.xml:615
msgid "Files"
msgstr "Fichiers"
@@ -1968,8 +1932,8 @@ 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:563 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
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:979 apt_preferences.5.xml:622
+#: sources.list.5.xml:221
msgid "See Also"
msgstr "Voir aussi"
@@ -2450,15 +2414,10 @@ msgstr "<option>--tempdir</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-extracttemplates.1.xml:62
-#, fuzzy
-#| msgid ""
-#| "Temporary directory in which to write extracted debconf template files "
-#| "and config scripts Configuration Item: <literal>APT::ExtractTemplates::"
-#| "TempDir</literal>"
msgid ""
"Temporary directory in which to write extracted debconf template files and "
-"config scripts. Configuration Item: <literal>APT::ExtractTemplates::"
-"TempDir</literal>"
+"config scripts Configuration Item: <literal>APT::ExtractTemplates::TempDir</"
+"literal>"
msgstr ""
"Répertoire temporaire dans lequel écrire les scripts et guides de "
"configuration pour Debconf. Élément de configuration : <literal>APT::"
@@ -2755,17 +2714,11 @@ msgstr "La section Dir"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt-ftparchive.1.xml:159
-#, fuzzy
-#| msgid ""
-#| "The <literal>Dir</literal> section defines the standard directories "
-#| "needed to locate the files required during the generation process. These "
-#| "directories are prepended to certain relative paths defined in later "
-#| "sections to produce a complete an absolute path."
msgid ""
"The <literal>Dir</literal> section defines the standard directories needed "
"to locate the files required during the generation process. These "
-"directories are prepended certain relative paths defined in later sections "
-"to produce a complete an absolute path."
+"directories are prepended to certain relative paths defined in later "
+"sections to produce a complete an absolute path."
msgstr ""
"La section <literal>Dir</literal> définit les répertoires standards où "
"situer les fichiers nécessaires au processus de création. Ces répertoires "
@@ -3566,8 +3519,8 @@ msgstr ""
"configuration : <literal>APT::FTPArchive::ReadOnlyDB</literal>."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:552 apt.conf.5.xml:982 apt_preferences.5.xml:462
-#: sources.list.5.xml:193
+#: apt-ftparchive.1.xml:552 apt.conf.5.xml:967 apt_preferences.5.xml:462
+#: sources.list.5.xml:181
msgid "Examples"
msgstr "Exemples"
@@ -3605,8 +3558,8 @@ msgstr ""
"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>08 "
"Novembre 2008</date>"
-#. type: <heading></heading>
-#: apt-get.8.xml:22 apt-get.8.xml:29 guide.sgml:96
+#. type: Content of: <refentry><refnamediv><refname>
+#: apt-get.8.xml:22 apt-get.8.xml:29
msgid "apt-get"
msgstr "apt-get"
@@ -3725,8 +3678,8 @@ msgstr ""
"progression d'ensemble peut être imprécis puisque la taille de ces fichiers "
"ne peut être connue à l'avance."
-#. type: <tag></tag>
-#: apt-get.8.xml:147 guide.sgml:121
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:147
msgid "upgrade"
msgstr "upgrade"
@@ -3779,8 +3732,8 @@ msgstr ""
"état (par exemple, suppression d'anciens paquets, installation de nouveaux "
"paquets)."
-#. type: <tag></tag>
-#: apt-get.8.xml:170 guide.sgml:140
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:170
msgid "dist-upgrade"
msgstr "dist-upgrade"
@@ -3807,8 +3760,8 @@ msgstr ""
"sources où récupérer les paquets désirés. Voyez aussi &apt-preferences; pour "
"un mécanisme de remplacement des paramètres généraux pour certains paquets."
-#. type: <tag></tag>
-#: apt-get.8.xml:183 guide.sgml:131
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:183
msgid "install"
msgstr "install"
@@ -3962,14 +3915,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 "
@@ -4006,7 +3951,7 @@ msgstr ""
#: apt-get.8.xml:266
#, fuzzy
msgid ""
-"If the <option>--compile</option> option is specified then the package will "
+"If the <option>--compile</option> options is specified then the package will "
"be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
"<option>--download-only</option> is specified then the source package will "
"not be unpacked."
@@ -4284,14 +4229,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 "
@@ -4311,17 +4248,11 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:392
-#, fuzzy
-#| msgid ""
-#| "Simulate prints out a series of lines each one representing a dpkg "
-#| "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square "
-#| "brackets indicate broken packages with and empty set of square brackets "
-#| "meaning breaks that are of no consequence (rare)."
msgid ""
"Simulate prints out a series of lines each one representing a dpkg "
"operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
-"indicate broken packages and empty set of square brackets meaning breaks "
-"that are of no consequence (rare)."
+"indicate broken packages with and empty set of square brackets meaning "
+"breaks that are of no consequence (rare)."
msgstr ""
"La simulation affiche une série de lignes représentant chacune une opération "
"de dpkg, Configure (Conf),Remove (Remv),Unpack (Inst). Les crochets "
@@ -4968,9 +4899,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>"
@@ -4991,11 +4919,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"
@@ -5021,12 +4944,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 "
@@ -5079,13 +4996,9 @@ 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."
+"<literal>showauto</literal> is used to print a list of manually installed "
+"packages with each package on a new line."
msgstr ""
"Avec la commande <literal>autoremove</literal>, apt-get supprime les paquets "
"installés dans le but de satisfaire les dépendances d'un paquet donné et qui "
@@ -5094,7 +5007,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>"
@@ -5102,7 +5014,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>"
@@ -5111,11 +5022,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 "
@@ -5160,7 +5066,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>"
@@ -5175,7 +5080,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;"
@@ -5243,20 +5147,12 @@ msgstr "Trusted archives"
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml:67
-#, fuzzy
-#| msgid ""
-#| "The chain of trust from an apt archive to the end user is made up of "
-#| "different steps. <command>apt-secure</command> is the last step in this "
-#| "chain, trusting an archive does not mean that the packages that you trust "
-#| "it do not contain malicious code but means that you trust the archive "
-#| "maintainer. Its the archive maintainer responsibility to ensure that the "
-#| "archive integrity is correct."
msgid ""
"The chain of trust from an apt archive to the end user is made up of "
"different steps. <command>apt-secure</command> is the last step in this "
"chain, trusting an archive does not mean that the packages that you trust it "
"do not contain malicious code but means that you trust the archive "
-"maintainer. It's the archive maintainer responsibility to ensure that the "
+"maintainer. Its the archive maintainer responsibility to ensure that the "
"archive integrity is correct."
msgstr ""
"D'une archive apt jusqu'à l'utilisateur, la confiance se construit en "
@@ -5299,22 +5195,13 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml:92
-#, fuzzy
-#| msgid ""
-#| "Once the uploaded package is verified and included in the archive, the "
-#| "maintainer signature is stripped off, an MD5 sum of the package is "
-#| "computed and put in the Packages file. The MD5 sum of all of the packages "
-#| "files are then computed and put into the Release file. The Release file "
-#| "is then signed by the archive key (which is created once a year and "
-#| "distributed through the FTP server. This key is also on the Debian "
-#| "keyring."
msgid ""
"Once the uploaded package is verified and included in the archive, the "
"maintainer signature is stripped off, an MD5 sum of the package is computed "
"and put in the Packages file. The MD5 sum of all of the packages files are "
"then computed and put into the Release file. The Release file is then signed "
-"by the archive key (which is created once a year) and distributed through "
-"the FTP server. This key is also on the Debian keyring."
+"by the archive key (which is created once a year and distributed through the "
+"FTP server. This key is also on the Debian keyring."
msgstr ""
"Une fois le paquet vérifié et archivé, la signature du responsable est "
"enlevée, une somme MD5 du paquet est calculée et mise dans le fichier "
@@ -5355,7 +5242,7 @@ 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>. "
+"<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 "
@@ -5436,13 +5323,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#: apt-secure.8.xml:160
-#, fuzzy
-#| msgid ""
-#| "<literal>Create a toplevel Release file</literal>. if it does not exist "
-#| "already. You can do this by running <command>apt-ftparchive release</"
-#| "command> (provided in apt-utils)."
msgid ""
-"<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
+"<literal>Create a toplevel Release file</literal>. if it does not exist "
"already. You can do this by running <command>apt-ftparchive release</"
"command> (provided in apt-utils)."
msgstr ""
@@ -5452,26 +5334,17 @@ msgstr ""
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#: apt-secure.8.xml:165
-#, fuzzy
-#| msgid ""
-#| "<literal>Sign it</literal>. You can do this by running <command>gpg -abs -"
-#| "o Release.gpg Release</command>."
msgid ""
-"<emphasis>Sign it</emphasis>. You can do this by running <command>gpg -abs -"
-"o Release.gpg Release</command>."
+"<literal>Sign it</literal>. You can do this by running <command>gpg -abs -o "
+"Release.gpg Release</command>."
msgstr ""
"<literal>le signer</literal>, avec la commande <command>gpg -abs -o Release."
"gpg Release</command> ;"
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#: apt-secure.8.xml:168
-#, fuzzy
-#| msgid ""
-#| "<literal>Publish the key fingerprint</literal>, that way your users will "
-#| "know what key they need to import in order to authenticate the files in "
-#| "the archive."
msgid ""
-"<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
+"<literal>Publish the key fingerprint</literal>, that way your users will "
"know what key they need to import in order to authenticate the files in the "
"archive."
msgstr ""
@@ -5599,11 +5472,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 "
@@ -5657,18 +5525,11 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:50
-#, fuzzy
-#| msgid ""
-#| "The configuration file is organized in a tree with options organized into "
-#| "functional groups. option specification is given with a double colon "
-#| "notation, for instance <literal>APT::Get::Assume-Yes</literal> is an "
-#| "option within the APT tool group, for the Get tool. options do not "
-#| "inherit from their parent groups."
msgid ""
"The configuration file is organized in a tree with options organized into "
-"functional groups. Option specification is given with a double colon "
+"functional groups. option specification is given with a double colon "
"notation, for instance <literal>APT::Get::Assume-Yes</literal> is an option "
-"within the APT tool group, for the Get tool. Options do not inherit from "
+"within the APT tool group, for the Get tool. options do not inherit from "
"their parent groups."
msgstr ""
"Le fichier de configuration est construit comme un arbre d'options "
@@ -5680,20 +5541,12 @@ 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 "
"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 "
+"of the form <literal>APT::Get::Assume-Yes \"true\";</literal> The trailing "
"semicolon and the quotes are required. The value must be on one line, and "
"there is no kind of string concatenation. It must not include inside "
"quotes. The behavior of the backslash \"\\\" and escaped characters inside "
@@ -5779,13 +5632,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</"
@@ -5815,12 +5661,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 "
@@ -5943,43 +5783,26 @@ msgstr "Immediate-Configure"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:159
msgid ""
-"Defaults to on which will cause APT to install essential and important "
-"packages as fast as possible in the install/upgrade operation. This is done "
-"to limit the effect of a failing &dpkg; call: If this option is disabled APT "
-"does treat an important package in the same way as an extra package: Between "
-"the unpacking of the important package A and his configuration can then be "
-"many other unpack or configuration calls, e.g. for package B which has no "
-"relation to A, but causes the dpkg call to fail (e.g. because maintainer "
-"script of package B generates an error) which results in a system state in "
-"which package A is unpacked but unconfigured - each package depending on A "
-"is now no longer guaranteed to work as their dependency on A is not longer "
-"satisfied. The immediate configuration marker is also applied to all "
-"dependencies which can generate a problem if the dependencies e.g. form a "
-"circle as a dependency with the immediate flag is comparable with a Pre-"
-"Dependency. So in theory it is possible that APT encounters a situation in "
-"which it is unable to perform immediate configuration, error out and refers "
-"to this option so the user can deactivate the immediate configuration "
-"temporary to be able to perform an install/upgrade again. Note the use of "
-"the word \"theory\" here as this problem was only encountered by now in real "
-"world a few times in non-stable distribution versions and caused by wrong "
-"dependencies of the package in question or by a system in an already broken "
-"state, so you should not blindly disable this option as the mentioned "
-"scenario above is not the only problem immediate configuration can help to "
-"prevent in the first place. Before a big operation like <literal>dist-"
-"upgrade</literal> is run with this option disabled it should be tried to "
-"explicitly <literal>install</literal> the package APT is unable to configure "
-"immediately, but please make sure to report your problem also to your "
-"distribution and to the APT team with the buglink below so they can work on "
-"improving or correcting the upgrade process."
+"Disable Immediate Configuration; This dangerous option disables some of "
+"APT's ordering code to cause it to make fewer dpkg calls. Doing so may be "
+"necessary on some extremely slow single user systems but is very dangerous "
+"and may cause package install scripts to fail or worse. Use at your own "
+"risk."
msgstr ""
+"Désactive la configuration immédiate ; cette dangereuse option désactive une "
+"partie du code de mise en ordre de APT pour que ce dernier effectue le moins "
+"d'appels possible à &dpkg;. Ça peut être nécessaire sur des systèmes à un "
+"seul utilisateur extrêmement lents, mais cette option est très dangereuse et "
+"peut faire échouer les scripts d'installation, voire pire. Utilisez-la à "
+"vos risques et périls."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:181
+#: apt.conf.5.xml:166
msgid "Force-LoopBreak"
msgstr "Force-LoopBreak"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:182
+#: apt.conf.5.xml:167
msgid ""
"Never Enable this option unless you -really- know what you are doing. It "
"permits APT to temporarily remove an essential package to break a Conflicts/"
@@ -5997,12 +5820,12 @@ msgstr ""
"ces paquets dépendent."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:190
+#: apt.conf.5.xml:175
msgid "Cache-Limit"
msgstr "Cache-Limit"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:191
+#: apt.conf.5.xml:176
msgid ""
"APT uses a fixed size memory mapped cache file to store the 'available' "
"information. This sets the size of that cache (in bytes)."
@@ -6012,24 +5835,24 @@ msgstr ""
"mémoire allouée pour le chargement de ce cache."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:195
+#: apt.conf.5.xml:180
msgid "Build-Essential"
msgstr "Build-Essential"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:196
+#: apt.conf.5.xml:181
msgid "Defines which package(s) are considered essential build dependencies."
msgstr ""
"Cette option définit les paquets qui sont considérés comme faisant partie "
"des dépendances essentielles pour la construction de paquets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:184
msgid "Get"
msgstr "Get"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:200
+#: apt.conf.5.xml:185
msgid ""
"The Get subsection controls the &apt-get; tool, please see its documentation "
"for more information about the options here."
@@ -6039,12 +5862,12 @@ msgstr ""
"question."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:204
+#: apt.conf.5.xml:189
msgid "Cache"
msgstr "Cache"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:205
+#: apt.conf.5.xml:190
msgid ""
"The Cache subsection controls the &apt-cache; tool, please see its "
"documentation for more information about the options here."
@@ -6054,12 +5877,12 @@ msgstr ""
"options en question."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:209
+#: apt.conf.5.xml:194
msgid "CDROM"
msgstr "CDROM"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:210
+#: apt.conf.5.xml:195
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool, please see its "
"documentation for more information about the options here."
@@ -6069,17 +5892,17 @@ msgstr ""
"options en question."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:216
+#: apt.conf.5.xml:201
msgid "The Acquire Group"
msgstr "Le groupe Acquire"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:206
msgid "PDiffs"
msgstr "PDiffs"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:222
+#: apt.conf.5.xml:207
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for Packages or "
"Sources files instead of downloading whole ones. True by default."
@@ -6089,12 +5912,12 @@ msgstr ""
"télécharger entièrement. Par défaut à « true »."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:227
+#: apt.conf.5.xml:212
msgid "Queue-Mode"
msgstr "Queue-Mode"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:228
+#: apt.conf.5.xml:213
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
"literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -6110,12 +5933,12 @@ msgstr ""
"initiée."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:235
+#: apt.conf.5.xml:220
msgid "Retries"
msgstr "Retries"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:221
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
@@ -6125,12 +5948,12 @@ msgstr ""
"échoué."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:240
+#: apt.conf.5.xml:225
msgid "Source-Symlinks"
msgstr "Source-Symlinks"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:241
+#: apt.conf.5.xml:226
msgid ""
"Use symlinks for source archives. If set to true then source archives will "
"be symlinked when possible instead of copying. True is the default."
@@ -6140,20 +5963,13 @@ msgstr ""
"archives de sources au lieu de les copier. Par défaut à « true »."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:245 sources.list.5.xml:139
+#: apt.conf.5.xml:230 sources.list.5.xml:139
msgid "http"
msgstr "http"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:246
+#: apt.conf.5.xml:231
#, 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 "
@@ -6172,7 +5988,7 @@ msgstr ""
"les options de mandataire HTTP."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:254
+#: apt.conf.5.xml:239
msgid ""
"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
"caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@ -6197,7 +6013,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:321
+#: apt.conf.5.xml:249 apt.conf.5.xml:306
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method, this applies to all things including connection timeout and data "
@@ -6207,19 +6023,10 @@ msgstr ""
"(timeout) utilisé par la méthode. Cela vaut pour tout, connexion et données."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:267
-#, fuzzy
-#| msgid ""
-#| "One setting is provided to control the pipeline depth in cases where the "
-#| "remote server is not RFC conforming or buggy (such as Squid 2.0.2) "
-#| "<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to "
-#| "5 indicating how many outstanding requests APT should send. A value of "
-#| "zero MUST be specified if the remote host does not properly linger on TCP "
-#| "connections - otherwise data corruption will occur. Hosts which require "
-#| "this are in violation of RFC 2068."
+#: apt.conf.5.xml:252
msgid ""
"One setting is provided to control the pipeline depth in cases where the "
-"remote server is not RFC conforming or buggy (such as Squid 2.0.2). "
+"remote server is not RFC conforming or buggy (such as Squid 2.0.2) "
"<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to 5 "
"indicating how many outstanding requests APT should send. A value of zero "
"MUST be specified if the remote host does not properly linger on TCP "
@@ -6236,7 +6043,7 @@ msgstr ""
"option ne respectent pas la RFC 2068."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:275
+#: apt.conf.5.xml:260
msgid ""
"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
"literal> which accepts integer values in kilobyte. The default value is 0 "
@@ -6246,12 +6053,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:281
+#: apt.conf.5.xml:266
msgid "https"
msgstr "https"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:282
+#: apt.conf.5.xml:267
msgid ""
"HTTPS URIs. Cache-control and proxy options are the same as for "
"<literal>http</literal> method. <literal>Pipeline-Depth</literal> option is "
@@ -6262,7 +6069,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:286
+#: apt.conf.5.xml:271
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -6294,25 +6101,13 @@ msgstr ""
"ou 'SSLv3'."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:304 sources.list.5.xml:150
+#: apt.conf.5.xml:289 sources.list.5.xml:150
msgid "ftp"
msgstr "ftp"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:305
+#: apt.conf.5.xml:290
#, 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 "
@@ -6347,7 +6142,7 @@ msgstr ""
"respectif de l'URI."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:324
+#: apt.conf.5.xml:309
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 "
@@ -6364,7 +6159,7 @@ msgstr ""
"modèle de fichier de configuration)."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#: apt.conf.5.xml:316
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 "
@@ -6379,7 +6174,7 @@ msgstr ""
"de cette méthode."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:336
+#: apt.conf.5.xml:321
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -6395,19 +6190,18 @@ msgstr ""
"des serveurs FTP ne suivent pas la RFC 2428."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:343 sources.list.5.xml:132
+#: apt.conf.5.xml:328 sources.list.5.xml:132
msgid "cdrom"
msgstr "cdrom"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:349
+#: apt.conf.5.xml:334
#, 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:344
+#: apt.conf.5.xml:329
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 "
@@ -6429,12 +6223,12 @@ msgstr ""
"spécifiées en utilisant <literal>UMount</literal>."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:354
+#: apt.conf.5.xml:339
msgid "gpgv"
msgstr "gpgv"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:355
+#: apt.conf.5.xml:340
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
@@ -6445,18 +6239,18 @@ msgstr ""
"supplémentaires passées à gpgv."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:360
+#: apt.conf.5.xml:345
msgid "CompressionTypes"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:366
+#: apt.conf.5.xml:351
#, 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:361
+#: apt.conf.5.xml:346
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -6468,19 +6262,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:371
+#: apt.conf.5.xml:356
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:374
+#: apt.conf.5.xml:359
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:352
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 "
@@ -6497,13 +6291,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:378
+#: apt.conf.5.xml:363
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:376
+#: apt.conf.5.xml:361
msgid ""
"Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
"replaceable></literal> will be checked: If this setting exists the method "
@@ -6518,7 +6312,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:383
+#: apt.conf.5.xml:368
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 "
@@ -6528,7 +6322,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:217
+#: apt.conf.5.xml:202
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>"
@@ -6538,12 +6332,12 @@ msgstr ""
"id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:392
+#: apt.conf.5.xml:377
msgid "Directories"
msgstr "Les répertoires"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:394
+#: apt.conf.5.xml:379
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -6563,7 +6357,7 @@ msgstr ""
"filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:401
+#: apt.conf.5.xml:386
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -6586,7 +6380,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:410
+#: apt.conf.5.xml:395
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -6601,7 +6395,7 @@ msgstr ""
"fichier de configuration indiqué par la variable <envar>APT_CONFIG</envar>)."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:416
+#: apt.conf.5.xml:401
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 "
@@ -6612,15 +6406,8 @@ msgstr ""
"configuration est chargé."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:405
#, 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 "
@@ -6637,7 +6424,7 @@ msgstr ""
"l'emplacement des programmes correspondants."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:428
+#: apt.conf.5.xml:413
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -6659,12 +6446,12 @@ msgstr ""
"staging/var/lib/dpkg/status</filename>."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:441
+#: apt.conf.5.xml:426
msgid "APT in DSelect"
msgstr "APT et DSelect"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:443
+#: apt.conf.5.xml:428
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -6675,12 +6462,12 @@ msgstr ""
"<literal>DSelect</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:447
+#: apt.conf.5.xml:432
msgid "Clean"
msgstr "Clean"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:448
+#: apt.conf.5.xml:433
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 "
@@ -6698,7 +6485,7 @@ msgstr ""
"supprime avant de récupérer de nouveaux paquets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:457
+#: apt.conf.5.xml:442
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the install phase."
@@ -6707,12 +6494,12 @@ msgstr ""
"&apt-get; lors de la phase d'installation."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:461
+#: apt.conf.5.xml:446
msgid "Updateoptions"
msgstr "UpdateOptions"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:462
+#: apt.conf.5.xml:447
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the update phase."
@@ -6721,12 +6508,12 @@ msgstr ""
"&apt-get; lors de la phase de mise à jour."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:466
+#: apt.conf.5.xml:451
msgid "PromptAfterUpdate"
msgstr "PromptAfterUpdate"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:467
+#: apt.conf.5.xml:452
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
@@ -6736,12 +6523,12 @@ msgstr ""
"d'erreur que l'on propose à l'utilisateur d'intervenir."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:473
+#: apt.conf.5.xml:458
msgid "How APT calls dpkg"
msgstr "Méthode d'appel de &dpkg; par APT"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:474
+#: apt.conf.5.xml:459
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
@@ -6750,7 +6537,7 @@ msgstr ""
"&dpkg; : elles figurent dans la section <literal>DPkg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:479
+#: apt.conf.5.xml:464
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 "
@@ -6761,17 +6548,17 @@ msgstr ""
"est passé comme un seul paramètre à &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:484
+#: apt.conf.5.xml:469
msgid "Pre-Invoke"
msgstr "Pre-Invoke"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:484
+#: apt.conf.5.xml:469
msgid "Post-Invoke"
msgstr "Post-Invoke"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:485
+#: apt.conf.5.xml:470
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 "
@@ -6784,12 +6571,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:491
+#: apt.conf.5.xml:476
msgid "Pre-Install-Pkgs"
msgstr "Pre-Install-Pkgs"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:492
+#: apt.conf.5.xml:477
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 "
@@ -6805,7 +6592,7 @@ msgstr ""
"qu'il va installer, à raison d'un par ligne."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:498
+#: apt.conf.5.xml:483
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -6821,12 +6608,12 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:505
+#: apt.conf.5.xml:490
msgid "Run-Directory"
msgstr "Run-Directory"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:506
+#: apt.conf.5.xml:491
msgid ""
"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
"</filename>."
@@ -6835,12 +6622,12 @@ msgstr ""
"le répertoire <filename>/</filename>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:510
+#: apt.conf.5.xml:495
msgid "Build-options"
msgstr "Build-options"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:511
+#: apt.conf.5.xml:496
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages, the "
"default is to disable signing and produce all binaries."
@@ -6850,12 +6637,12 @@ msgstr ""
"créés."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:516
+#: apt.conf.5.xml:501
msgid "dpkg trigger usage (and related options)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:502
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 "
@@ -6870,7 +6657,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:532
+#: apt.conf.5.xml:517
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -6880,7 +6667,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:526
+#: apt.conf.5.xml:511
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 "
@@ -6894,31 +6681,30 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:523
msgid "DPkg::NoTriggers"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:524
msgid ""
-"Add the no triggers flag to all dpkg calls (except the ConfigurePending "
+"Add the no triggers flag to all dpkg calls (expect the ConfigurePending "
"call). See &dpkg; if you are interested in what this actually means. In "
-"short: dpkg will not run the triggers when this flag is present unless it is "
-"explicitly called to do so in an extra call. Note that this option exists "
+"short: dpkg will not run the triggers then this flag is present unless it is "
+"explicit called to do so in an extra call. Note that this option exists "
"(undocumented) also in older apt versions with a slightly different meaning: "
"Previously these option only append --no-triggers to the configure calls to "
"dpkg - now apt will add these flag also to the unpack and remove calls."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:546
+#: apt.conf.5.xml:531
#, fuzzy
-#| msgid "Packages::Compress"
msgid "PackageManager::Configure"
msgstr "Packages::Compress"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:547
+#: apt.conf.5.xml:532
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
@@ -6927,35 +6713,35 @@ msgid ""
"to be configured before another package can be unpacked (Pre-Depends) and "
"let the rest configure by dpkg with a call generated by the next option. "
"\"<literal>no</literal>\" on the other hand will not configure anything and "
-"totally rely on dpkg for configuration (which will at the moment fail if a "
+"totally relay on dpkg for configuration (which will at the moment fail if a "
"Pre-Depends is encountered). Setting this option to another than the all "
-"value will implicitly activate also the next option per default as otherwise "
+"value will implicit activate also the next option per default as otherwise "
"the system could end in an unconfigured status which could be unbootable!"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:557
+#: apt.conf.5.xml:542
msgid "DPkg::ConfigurePending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:558
+#: apt.conf.5.xml:543
msgid ""
"If this option is set apt will call <command>dpkg --configure --pending</"
"command> to let dpkg handle all required configurations and triggers. This "
"option is activated automatic per default if the previous option is not set "
"to <literal>all</literal>, but deactivating could be useful if you want to "
-"run APT multiple times in a row - e.g. in an installer. In these sceneries "
+"run APT multiple times in a row - e.g. in an installer. In this sceneries "
"you could deactivate this option in all but the last run."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:564
+#: apt.conf.5.xml:549
msgid "DPkg::TriggersPending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:565
+#: apt.conf.5.xml:550
msgid ""
"Useful for <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -6965,12 +6751,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:570
+#: apt.conf.5.xml:555
msgid "PackageManager::UnpackAll"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:571
+#: apt.conf.5.xml:556
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-"
@@ -6982,12 +6768,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:578
+#: apt.conf.5.xml:563
msgid "OrderList::Score::Immediate"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:586
+#: apt.conf.5.xml:571
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -6999,7 +6785,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:579
+#: apt.conf.5.xml:564
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 "
@@ -7013,12 +6799,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:599
+#: apt.conf.5.xml:584
msgid "Periodic and Archives options"
msgstr "Options « Periodic » et « Archive »"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:600
+#: apt.conf.5.xml:585
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -7030,12 +6816,12 @@ msgstr ""
"script <literal>/etc/cron.daily/apt</literal>, lancé quotidiennement."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:608
+#: apt.conf.5.xml:593
msgid "Debug options"
msgstr "Les options de débogage"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:610
+#: apt.conf.5.xml:595
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -7053,7 +6839,7 @@ msgstr ""
"peuvent tout de même être utiles :"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:621
+#: apt.conf.5.xml:606
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -7064,7 +6850,7 @@ msgstr ""
"upgrade, upgrade, install, remove et purge</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:629
+#: apt.conf.5.xml:614
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -7076,7 +6862,7 @@ msgstr ""
"superutilisateur."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:638
+#: apt.conf.5.xml:623
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -7088,7 +6874,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:646
+#: apt.conf.5.xml:631
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CDROM IDs."
@@ -7097,17 +6883,17 @@ msgstr ""
"type statfs dans les identifiants de CD."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:641
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:661
+#: apt.conf.5.xml:646
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:665
+#: apt.conf.5.xml:650
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
@@ -7115,44 +6901,44 @@ msgstr ""
"literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:672
+#: apt.conf.5.xml:657
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:676
+#: apt.conf.5.xml:661
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:683
+#: apt.conf.5.xml:668
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:687
+#: apt.conf.5.xml:672
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:694
+#: apt.conf.5.xml:679
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:698
+#: apt.conf.5.xml:683
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:705
+#: apt.conf.5.xml:690
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:709
+#: apt.conf.5.xml:694
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
@@ -7161,12 +6947,12 @@ msgstr ""
"cryptographiques avec <literal>gpg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:716
+#: apt.conf.5.xml:701
msgid "<literal>Debug::aptcdrom</literal>"
msgstr "<literal>Debug::aptcdrom</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:720
+#: apt.conf.5.xml:705
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
@@ -7175,24 +6961,24 @@ msgstr ""
"stockées sur CD."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:727
+#: apt.conf.5.xml:712
msgid "<literal>Debug::BuildDeps</literal>"
msgstr "<literal>Debug::BuildDeps</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:730
+#: apt.conf.5.xml:715
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:737
+#: apt.conf.5.xml:722
msgid "<literal>Debug::Hashes</literal>"
msgstr "<literal>Debug::Hashes</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:740
+#: apt.conf.5.xml:725
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
@@ -7201,12 +6987,12 @@ msgstr ""
"librairies d'<literal>apt</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:747
+#: apt.conf.5.xml:732
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr "<literal>Debug::IdentCDROM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:750
+#: apt.conf.5.xml:735
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 "
@@ -7217,12 +7003,12 @@ msgstr ""
"utilisés sur le système de fichier du CD."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:743
msgid "<literal>Debug::NoLocking</literal>"
msgstr "<literal>Debug::NoLocking</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:761
+#: apt.conf.5.xml:746
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."
@@ -7232,24 +7018,24 @@ msgstr ""
"temps."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:769
+#: apt.conf.5.xml:754
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr "<literal>Debug::pkgAcquire</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:773
+#: apt.conf.5.xml:758
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:780
+#: apt.conf.5.xml:765
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:783
+#: apt.conf.5.xml:768
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
@@ -7259,12 +7045,12 @@ msgstr ""
"éventuelles."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:790
+#: apt.conf.5.xml:775
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:793
+#: apt.conf.5.xml:778
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
@@ -7274,12 +7060,12 @@ msgstr ""
"éventuelles."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:786
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:805
+#: apt.conf.5.xml:790
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
@@ -7289,12 +7075,12 @@ msgstr ""
"place des fichiers complets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:812
+#: apt.conf.5.xml:797
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:816
+#: apt.conf.5.xml:801
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
@@ -7302,12 +7088,12 @@ msgstr ""
"effectivement des téléchargements."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:823
+#: apt.conf.5.xml:808
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr "<literal>Debug::pkgAutoRemove</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:827
+#: apt.conf.5.xml:812
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
@@ -7316,12 +7102,12 @@ msgstr ""
"automatiquement, et la suppression des paquets inutiles."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:834
+#: apt.conf.5.xml:819
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:837
+#: apt.conf.5.xml:822
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -7336,12 +7122,12 @@ msgstr ""
"de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:848
+#: apt.conf.5.xml:833
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:851
+#: apt.conf.5.xml:836
msgid ""
"Generate debug messages describing which package is marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -7376,24 +7162,24 @@ msgstr ""
"de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:870
+#: apt.conf.5.xml:855
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr "<literal>Debug::pkgInitConfig</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:873
+#: apt.conf.5.xml:858
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:880
+#: apt.conf.5.xml:865
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr "<literal>Debug::pkgDPkgPM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:883
+#: apt.conf.5.xml:868
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
@@ -7402,12 +7188,12 @@ msgstr ""
"paramètres sont séparés par des espaces."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:891
+#: apt.conf.5.xml:876
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:894
+#: apt.conf.5.xml:879
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
@@ -7417,12 +7203,12 @@ msgstr ""
"fichier."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:901
+#: apt.conf.5.xml:886
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr "<literal>Debug::pkgOrderList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:905
+#: apt.conf.5.xml:890
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
@@ -7431,33 +7217,33 @@ msgstr ""
"<literal>apt</literal> passe les paquets à &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:913
+#: apt.conf.5.xml:898
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr "<literal>Debug::pkgPackageManager</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:917
+#: apt.conf.5.xml:902
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:924
+#: apt.conf.5.xml:909
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr "<literal>Debug::pkgPolicy</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:928
+#: apt.conf.5.xml:913
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:934
+#: apt.conf.5.xml:919
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr "<literal>Debug::pkgProblemResolver</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:938
+#: apt.conf.5.xml:923
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
@@ -7466,12 +7252,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:946
+#: apt.conf.5.xml:931
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:949
+#: apt.conf.5.xml:934
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 "
@@ -7482,12 +7268,12 @@ msgstr ""
"est décrite dans <literal>Debug::pkgDepCache::Marker</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:957
+#: apt.conf.5.xml:942
msgid "<literal>Debug::sourceList</literal>"
msgstr "<literal>Debug::sourceList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:961
+#: apt.conf.5.xml:946
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
@@ -7496,7 +7282,7 @@ msgstr ""
"list</filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:968
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -7505,15 +7291,14 @@ msgstr ""
"exemples pour toutes les options existantes."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:990
+#: apt.conf.5.xml:975
#, fuzzy
-#| msgid "&apt-conf;"
msgid "&file-aptconf;"
msgstr "&apt-conf;"
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:995
+#: apt.conf.5.xml:980
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
@@ -7536,10 +7321,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 "
@@ -8717,7 +8498,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt_preferences.5.xml:617
#, fuzzy
-#| msgid "apt_preferences"
msgid "&file-preferences;"
msgstr "apt_preferences"
@@ -8738,17 +8518,11 @@ msgstr "Liste des sources de paquets"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:34
-#, fuzzy
-#| msgid ""
-#| "The package resource list is used to locate archives of the package "
-#| "distribution system in use on the system. At this time, this manual page "
-#| "documents only the packaging system used by the Debian GNU/Linux system. "
-#| "This control file is located in <filename>/etc/apt/sources.list</filename>"
msgid ""
"The package resource list is used to locate archives of the package "
"distribution system in use on the system. At this time, this manual page "
"documents only the packaging system used by the Debian GNU/Linux system. "
-"This control file is <filename>/etc/apt/sources.list</filename>."
+"This control file is located in <filename>/etc/apt/sources.list</filename>"
msgstr ""
"La liste des sources de paquets indique où trouver les archives du système "
"de distribution de paquets utilisé. Pour l'instant, cette page de manuel ne "
@@ -8757,22 +8531,12 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:39
-#, fuzzy
-#| msgid ""
-#| "The source list is designed to support any number of active sources and a "
-#| "variety of source media. The file lists one source per line, with the "
-#| "most preferred source listed first. The format of each line is: "
-#| "<literal>type uri args</literal> The first item, <literal>type</literal> "
-#| "determines the format for <literal>args</literal> <literal>uri</literal> "
-#| "is a Universal Resource Identifier (URI), which is a superset of the more "
-#| "specific and well-known Universal Resource Locator, or URL. The rest of "
-#| "the line can be marked as a comment by using a #."
msgid ""
"The source list is designed to support any number of active sources and a "
"variety of source media. The file lists one source per line, with the most "
"preferred source listed first. The format of each line is: <literal>type uri "
"args</literal> The first item, <literal>type</literal> determines the format "
-"for <literal>args</literal>. <literal>uri</literal> is a Universal Resource "
+"for <literal>args</literal> <literal>uri</literal> is a Universal Resource "
"Identifier (URI), which is a superset of the more specific and well-known "
"Universal Resource Locator, or URL. The rest of the line can be marked as a "
"comment by using a #."
@@ -8817,24 +8581,13 @@ msgstr "Les types deb et deb-src."
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:61
-#, fuzzy
-#| msgid ""
-#| "The <literal>deb</literal> type describes a typical two-level Debian "
-#| "archive, <filename>distribution/component</filename>. Typically, "
-#| "<literal>distribution</literal> is generally one of <literal>stable</"
-#| "literal> <literal>unstable</literal> or <literal>testing</literal> while "
-#| "component is one of <literal>main</literal> <literal>contrib</literal> "
-#| "<literal>non-free</literal> or <literal>non-us</literal> The <literal>deb-"
-#| "src</literal> type describes a debian distribution's source code in the "
-#| "same form as the <literal>deb</literal> type. A <literal>deb-src</"
-#| "literal> line is required to fetch source indexes."
msgid ""
"The <literal>deb</literal> type describes a typical two-level Debian "
"archive, <filename>distribution/component</filename>. Typically, "
"<literal>distribution</literal> is generally one of <literal>stable</"
"literal> <literal>unstable</literal> or <literal>testing</literal> while "
"component is one of <literal>main</literal> <literal>contrib</literal> "
-"<literal>non-free</literal> or <literal>non-us</literal>. The <literal>deb-"
+"<literal>non-free</literal> or <literal>non-us</literal> The <literal>deb-"
"src</literal> type describes a debian distribution's source code in the same "
"form as the <literal>deb</literal> type. A <literal>deb-src</literal> line "
"is required to fetch source indexes."
@@ -8852,13 +8605,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:73
-#, fuzzy
-#| msgid ""
-#| "The format for a <filename>sources.list</filename> entry using the "
-#| "<literal>deb</literal> and <literal>deb-src</literal> types are:"
msgid ""
"The format for a <filename>sources.list</filename> entry using the "
-"<literal>deb</literal> and <literal>deb-src</literal> types is:"
+"<literal>deb</literal> and <literal>deb-src</literal> types are:"
msgstr ""
"Le format d'une entrée dans <filename>sources.list</filename> utilisant les "
"types <literal>deb</literal> et <literal>deb-src</literal> est de la forme :"
@@ -8871,23 +8620,13 @@ msgstr "deb uri distribution [composant1] [composant2] [...]"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:78
-#, fuzzy
-#| msgid ""
-#| "The URI for the <literal>deb</literal> type must specify the base of the "
-#| "Debian distribution, from which APT will find the information it needs. "
-#| "<literal>distribution</literal> can specify an exact path, in which case "
-#| "the components must be omitted and <literal>distribution</literal> must "
-#| "end with a slash (/). This is useful for when only a particular sub-"
-#| "section of the archive denoted by the URI is of interest. If "
-#| "<literal>distribution</literal> does not specify an exact path, at least "
-#| "one <literal>component</literal> must be present."
msgid ""
"The URI for the <literal>deb</literal> type must specify the base of the "
"Debian distribution, from which APT will find the information it needs. "
"<literal>distribution</literal> can specify an exact path, in which case the "
"components must be omitted and <literal>distribution</literal> must end with "
-"a slash (/). This is useful for when the case only a particular sub-section "
-"of the archive denoted by the URI is of interest. If <literal>distribution</"
+"a slash (/). This is useful for when only a particular sub-section of the "
+"archive denoted by the URI is of interest. If <literal>distribution</"
"literal> does not specify an exact path, at least one <literal>component</"
"literal> must be present."
msgstr ""
@@ -9007,20 +8746,12 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: sources.list.5.xml:141
-#, fuzzy
-#| msgid ""
-#| "The http scheme specifies an HTTP server for the archive. If an "
-#| "environment variable <envar>http_proxy</envar> is set with the format "
-#| "http://server:port/, the proxy server specified in <envar>http_proxy</"
-#| "envar> will be used. Users of authenticated HTTP/1.1 proxies may use a "
-#| "string of the format http://user:pass@server:port/ Note that this is an "
-#| "insecure method of authentication."
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format http://server:"
"port/, the proxy server specified in <envar>http_proxy</envar> will be used. "
"Users of authenticated HTTP/1.1 proxies may use a string of the format "
-"http://user:pass@server:port/. Note that this is an insecure method of "
+"http://user:pass@server:port/ Note that this is an insecure method of "
"authentication."
msgstr ""
"Le procédé <literal>http</literal> indique un serveur HTTP comme archive. Si "
@@ -9092,24 +8823,6 @@ msgstr ""
"l'accès aux fichiers de la machine distante et le transfert, on utilise les "
"commandes standard <command>find</command> et <command>dd</command>."
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:178
-msgid "more recongnizable URI types"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:180
-msgid ""
-"APT can be extended with more methods shipped in other optional packages "
-"which should follow the nameing scheme <literal>apt-transport-"
-"<replaceable>method</replaceable></literal>. The APT team e.g. maintain "
-"also the <literal>apt-transport-https</literal> package which provides "
-"access methods for https-URIs with features similiar to the http method, but "
-"other methods for using e.g. debtorrent are also available, see "
-"<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></"
-"refentrytitle> <manvolnum>1</manvolnum></citerefentry>."
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:122
msgid ""
@@ -9120,7 +8833,7 @@ msgstr ""
"ssh et rsh. <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:194
+#: sources.list.5.xml:182
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
@@ -9129,37 +8842,37 @@ msgstr ""
"debian pour stable/main, stable/contrib et stable/non-free."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:196
+#: sources.list.5.xml:184
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr "deb file:/home/jason/debian stable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:198
+#: sources.list.5.xml:186
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
"Comme ci-dessus, excepté que cette ligne utilise la distribution "
"« unstable » (développement)."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:199
+#: sources.list.5.xml:187
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr "deb file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:201
+#: sources.list.5.xml:189
msgid "Source line for the above"
msgstr "La précédente ligne, mais pour les sources."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:202
+#: sources.list.5.xml:190
#, no-wrap
msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:204
+#: sources.list.5.xml:192
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -9168,13 +8881,13 @@ msgstr ""
"n'utiliser que la section hamm/main."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:194
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr "deb http://archive.debian.org/debian-archive hamm main"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:208
+#: sources.list.5.xml:196
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the stable/contrib area."
@@ -9183,24 +8896,18 @@ msgstr ""
"répertoire debian, et n'utiliser que la section stable/contrib."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:210
+#: sources.list.5.xml:198
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian stable contrib"
msgstr "deb ftp://ftp.debian.org/debian stable contrib"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:212
-#, fuzzy
-#| msgid ""
-#| "Uses FTP to access the archive at ftp.debian.org, under the debian "
-#| "directory, and uses only the unstable/contrib area. If this line appears "
-#| "as well as the one in the previous example in <filename>sources.list</"
-#| "filename>. a single FTP session will be used for both resource lines."
+#: sources.list.5.xml:200
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
-"well as the one in the previous example in <filename>sources.list</filename> "
-"a single FTP session will be used for both resource lines."
+"well as the one in the previous example in <filename>sources.list</"
+"filename>. a single FTP session will be used for both resource lines."
msgstr ""
"Utiliser FTP pour accéder à l'archive située à ftp.debian.org, dans le "
"répertoire debian, et n'utiliser que la section unstable/contrib. Si cette "
@@ -9208,13 +8915,13 @@ msgstr ""
"apparaissent, une seule session FTP sera utilisée pour les deux lignes."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:216
+#: sources.list.5.xml:204
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:218
+#: sources.list.5.xml:206
msgid ""
"Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US "
"directory."
@@ -9223,19 +8930,19 @@ msgstr ""
"répertoire debian-non-US."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:208
#, no-wrap
msgid "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free"
msgstr "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:229
+#: sources.list.5.xml:217
#, no-wrap
msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
msgstr "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:210
msgid ""
"Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US "
"directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -9254,1090 +8961,10 @@ msgstr ""
"\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:234
+#: sources.list.5.xml:222
msgid "&apt-cache; &apt-conf;"
msgstr "&apt-cache; &apt-conf;"
-#. type: <title></title>
-#: guide.sgml:4
-msgid "APT User's Guide"
-msgstr ""
-
-#. type: <author></author>
-#: guide.sgml:6 offline.sgml:6
-msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
-msgstr ""
-
-#. type: <version></version>
-#: guide.sgml:7
-msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
-msgstr ""
-
-#. type: <abstract></abstract>
-#: guide.sgml:11
-msgid ""
-"This document provides an overview of how to use the the APT package manager."
-msgstr ""
-
-#. type: <copyrightsummary></copyrightsummary>
-#: guide.sgml:15
-msgid "Copyright &copy; Jason Gunthorpe, 1998."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:21 offline.sgml:22
-msgid ""
-"\"APT\" and this document are free software; you can redistribute them and/"
-"or modify them under the terms of the GNU General Public License as "
-"published by the Free Software Foundation; either version 2 of the License, "
-"or (at your option) any later version."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:24 offline.sgml:25
-msgid ""
-"For more details, on Debian GNU/Linux systems, see the file /usr/share/"
-"common-licenses/GPL for the full license."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:32
-#, fuzzy
-#| msgid "generate"
-msgid "General"
-msgstr "generate"
-
-#. type: <p></p>
-#: guide.sgml:38
-msgid ""
-"The APT package currently contains two sections, the APT <prgn>dselect</"
-"prgn> method and the <prgn>apt-get</prgn> command line user interface. Both "
-"provide a way to install and remove packages as well as download new "
-"packages from the Internet."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:39
-msgid "Anatomy of the Package System"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:44
-msgid ""
-"The Debian packaging system has a large amount of information associated "
-"with each package to help assure that it integrates cleanly and easily into "
-"the system. The most prominent of its features is the dependency system."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:52
-msgid ""
-"The dependency system allows individual programs to make use of shared "
-"elements in the system such as libraries. It simplifies placing infrequently "
-"used portions of a program in separate packages to reduce the number of "
-"things the average user is required to install. Also, it allows for choices "
-"in mail transport agents, X servers and so on."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:57
-msgid ""
-"The first step to understanding the dependency system is to grasp the "
-"concept of a simple dependency. The meaning of a simple dependency is that a "
-"package requires another package to be installed at the same time to work "
-"properly."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:63
-msgid ""
-"For instance, mailcrypt is an emacs extension that aids in encrypting email "
-"with GPG. Without GPGP installed mail-crypt is useless, so mailcrypt has a "
-"simple dependency on GPG. Also, because it is an emacs extension it has a "
-"simple dependency on emacs, without emacs it is completely useless."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:73
-msgid ""
-"The other important dependency to understand is a conflicting dependency. It "
-"means that a package, when installed with another package, will not work and "
-"may possibly be extremely harmful to the system. As an example consider a "
-"mail transport agent such as sendmail, exim or qmail. It is not possible to "
-"have two mail transport agents installed because both need to listen to the "
-"network to receive mail. Attempting to install two will seriously damage the "
-"system so all mail transport agents have a conflicting dependency with all "
-"other mail transport agents."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:83
-msgid ""
-"As an added complication there is the possibility for a package to pretend "
-"to be another package. Consider that exim and sendmail for many intents are "
-"identical, they both deliver mail and understand a common interface. Hence, "
-"the package system has a way for them to declare that they are both mail-"
-"transport-agents. So, exim and sendmail both declare that they provide a "
-"mail-transport-agent and other packages that need a mail transport agent "
-"depend on mail-transport-agent. This can add a great deal of confusion when "
-"trying to manually fix packages."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:88
-msgid ""
-"At any given time a single dependency may be met by packages that are "
-"already installed or it may not be. APT attempts to help resolve dependency "
-"issues by providing a number of automatic algorithms that help in selecting "
-"packages for installation."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:102
-msgid ""
-"<prgn>apt-get</prgn> provides a simple way to install packages from the "
-"command line. Unlike <prgn>dpkg</prgn>, <prgn>apt-get</prgn> does not "
-"understand .deb files, it works with the package's proper name and can only "
-"install .deb archives from a <em>Source</em>."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:109
-msgid ""
-"The first <footnote><p>If you are using an http proxy server you must set "
-"the http_proxy environment variable first, see sources.list(5)</p></"
-"footnote> thing that should be done before using <prgn>apt-get</prgn> is to "
-"fetch the package lists from the <em>Sources</em> so that it knows what "
-"packages are available. This is done with <tt>apt-get update</tt>. For "
-"instance,"
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:116
-#, no-wrap
-msgid ""
-"# apt-get update\n"
-"Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
-"Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
-"Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
-msgstr ""
-
-#. type: <p><taglist>
-#: guide.sgml:120
-msgid "Once updated there are several commands that can be used:"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:131
-msgid ""
-"Upgrade will attempt to gently upgrade the whole system. Upgrade will never "
-"install a new package or remove an existing package, nor will it ever "
-"upgrade a package that might cause some other package to break. This can be "
-"used daily to relatively safely upgrade the system. Upgrade will list all of "
-"the packages that it could not upgrade, this usually means that they depend "
-"on new packages or conflict with some other package. <prgn>dselect</prgn> or "
-"<tt>apt-get install</tt> can be used to force these packages to install."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:140
-msgid ""
-"Install is used to install packages by name. The package is automatically "
-"fetched and installed. This can be useful if you already know the name of "
-"the package to install and do not want to go into a GUI to select it. Any "
-"number of packages may be passed to install, they will all be fetched. "
-"Install automatically attempts to resolve dependency problems with the "
-"listed packages and will print a summary and ask for confirmation if "
-"anything other than its arguments are changed."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:149
-msgid ""
-"Dist-upgrade is a complete upgrader designed to simplify upgrading between "
-"releases of Debian. It uses a sophisticated algorithm to determine the best "
-"set of packages to install, upgrade and remove to get as much of the system "
-"to the newest release. In some situations it may be desired to use dist-"
-"upgrade rather than spend the time manually resolving dependencies in "
-"<prgn>dselect</prgn>. Once dist-upgrade has completed then <prgn>dselect</"
-"prgn> can be used to install any packages that may have been left out."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:152
-msgid ""
-"It is important to closely look at what dist-upgrade is going to do, its "
-"decisions may sometimes be quite surprising."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:163
-msgid ""
-"<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
-"option is <tt>-d</tt> which does not install the fetched files. If the "
-"system has to download a large number of package it would be undesired to "
-"start installing them in case something goes wrong. When <tt>-d</tt> is used "
-"the downloaded archives can be installed by simply running the command that "
-"caused them to be downloaded again without <tt>-d</tt>."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:168
-#, fuzzy
-#| msgid "APT in DSelect"
-msgid "DSelect"
-msgstr "APT et DSelect"
-
-#. type: <p></p>
-#: guide.sgml:173
-msgid ""
-"The APT <prgn>dselect</prgn> method provides the complete APT system with "
-"the <prgn>dselect</prgn> package selection GUI. <prgn>dselect</prgn> is used "
-"to select the packages to be installed or removed and APT actually installs "
-"them."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:184
-msgid ""
-"To enable the APT method you need to to select [A]ccess in <prgn>dselect</"
-"prgn> and then choose the APT method. You will be prompted for a set of "
-"<em>Sources</em> which are places to fetch archives from. These can be "
-"remote Internet sites, local Debian mirrors or CDROMs. Each source can "
-"provide a fragment of the total Debian archive, APT will automatically "
-"combine them to form a complete set of packages. If you have a CDROM then it "
-"is a good idea to specify it first and then specify a mirror so that you "
-"have access to the latest bug fixes. APT will automatically use packages on "
-"your CDROM before downloading from the Internet."
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:198
-#, no-wrap
-msgid ""
-" Set up a list of distribution source locations\n"
-"\t \n"
-" Please give the base URL of the debian distribution.\n"
-" The access schemes I know about are: http file\n"
-"\t \n"
-" For example:\n"
-" file:/mnt/debian,\n"
-" ftp://ftp.debian.org/debian,\n"
-" http://ftp.de.debian.org/debian,\n"
-" \n"
-" \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:205
-msgid ""
-"The <em>Sources</em> setup starts by asking for the base of the Debian "
-"archive, defaulting to a HTTP mirror. Next it asks for the distribution to "
-"get."
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:212
-#, no-wrap
-msgid ""
-" Please give the distribution tag to get or a path to the\n"
-" package file ending in a /. The distribution\n"
-" tags are typically something like: stable unstable testing non-US\n"
-" \n"
-" Distribution [stable]:"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:222
-msgid ""
-"The distribution refers to the Debian version in the archive, <em>stable</"
-"em> refers to the latest released version and <em>unstable</em> refers to "
-"the developmental version. <em>non-US</em> is only available on some mirrors "
-"and refers to packages that contain encryption technology or other things "
-"that cannot be exported from the United States. Importing these packages "
-"into the US is legal however."
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:228
-#, no-wrap
-msgid ""
-" Please give the components to get\n"
-" The components are typically something like: main contrib non-free\n"
-" \n"
-" Components [main contrib non-free]:"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:236
-msgid ""
-"The components list refers to the list of sub distributions to fetch. The "
-"distribution is split up based on software licenses, main being DFSG free "
-"packages while contrib and non-free contain things that have various "
-"restrictions placed on their use and distribution."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:240
-msgid ""
-"Any number of sources can be added, the setup script will continue to prompt "
-"until you have specified all that you want."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:247
-msgid ""
-"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a super-set of "
-"<tt>apt-get update</tt> that makes the fetched information available to "
-"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
-"tt> has been run before."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:253
-msgid ""
-"You can then go on and make your selections using [S]elect and then perform "
-"the installation using [I]nstall. When using the APT method the [C]onfig and "
-"[R]emove commands have no meaning, the [I]nstall command performs both of "
-"them together."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:258
-msgid ""
-"By default APT will automatically remove the package (.deb) files once they "
-"have been successfully installed. To change this behavior place <tt>Dselect::"
-"clean \"prompt\";</tt> in /etc/apt/apt.conf."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:264
-msgid "The Interface"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:278
-msgid ""
-"Both that APT <prgn>dselect</prgn> method and <prgn>apt-get</prgn> share the "
-"same interface. It is a simple system that generally tells you what it will "
-"do and then goes and does it. <footnote><p>The <prgn>dselect</prgn> method "
-"actually is a set of wrapper scripts to <prgn>apt-get</prgn>. The method "
-"actually provides more functionality than is present in <prgn>apt-get</prgn> "
-"alone.</p></footnote> After printing out a summary of what will happen APT "
-"then will print out some informative status messages so that you can "
-"estimate how far along it is and how much is left to do."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:280
-msgid "Startup"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:284
-msgid ""
-"Before all operations except update, APT performs a number of actions to "
-"prepare its internal state. It also does some checks of the system's state. "
-"At any time these operations can be performed by running <tt>apt-get check</"
-"tt>."
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:289
-#, no-wrap
-msgid ""
-"# apt-get check\n"
-"Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:297
-msgid ""
-"The first thing it does is read all the package files into memory. APT uses "
-"a caching scheme so this operation will be faster the second time it is run. "
-"If some of the package files are not found then they will be ignored and a "
-"warning will be printed when apt-get exits."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:303
-msgid ""
-"The final operation performs a detailed analysis of the system's "
-"dependencies. It checks every dependency of every installed or unpacked "
-"package and considers if it is OK. Should this find a problem then a report "
-"will be printed out and <prgn>apt-get</prgn> will refuse to run."
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:320
-#, no-wrap
-msgid ""
-"# apt-get check\n"
-"Reading Package Lists... Done\n"
-"Building Dependency Tree... Done\n"
-"You might want to run apt-get -f install' to correct these.\n"
-"Sorry, but the following packages have unmet dependencies:\n"
-" 9fonts: Depends: xlib6g but it is not installed\n"
-" uucp: Depends: mailx but it is not installed\n"
-" blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n"
-" adduser: Depends: perl-base but it is not installed\n"
-" aumix: Depends: libgpmg1 but it is not installed\n"
-" debiandoc-sgml: Depends: sgml-base but it is not installed\n"
-" bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
-" cthugha: Depends: svgalibg1 but it is not installed\n"
-" Depends: xlib6g (>= 3.3-5) but it is not installed\n"
-" libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:329
-msgid ""
-"In this example the system has many problems, including a serious problem "
-"with libreadlineg2. For each package that has unmet dependencies a line is "
-"printed out indicating the package with the problem and the dependencies "
-"that are unmet. A short explanation of why the package has a dependency "
-"problem is also included."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:337
-msgid ""
-"There are two ways a system can get into a broken state like this. The first "
-"is caused by <prgn>dpkg</prgn> missing some subtle relationships between "
-"packages when performing upgrades. <footnote><p>APT however considers all "
-"known dependencies and attempts to prevent broken packages</p></footnote>. "
-"The second is if a package installation fails during an operation. In this "
-"situation a package may have been unpacked without its dependents being "
-"installed."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:345
-msgid ""
-"The second situation is much less serious than the first because APT places "
-"certain constraints on the order that packages are installed. In both cases "
-"supplying the <tt>-f</tt> option to <prgn>apt-get</prgn> will cause APT to "
-"deduce a possible solution to the problem and then continue on. The APT "
-"<prgn>dselect</prgn> method always supplies the <tt>-f</tt> option to allow "
-"for easy continuation of failed maintainer scripts."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:351
-msgid ""
-"However, if the <tt>-f</tt> option is used to correct a seriously broken "
-"system caused by the first case then it is possible that it will either fail "
-"immediately or the installation sequence will fail. In either case it is "
-"necessary to manually use dpkg (possibly with forcing options) to correct "
-"the situation enough to allow APT to proceed."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:356
-msgid "The Status Report"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:363
-msgid ""
-"Before proceeding <prgn>apt-get</prgn> will present a report on what will "
-"happen. Generally the report reflects the type of operation being performed "
-"but there are several common elements. In all cases the lists reflect the "
-"final state of things, taking into account the <tt>-f</tt> option and any "
-"other relevant activities to the command being executed."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:364
-msgid "The Extra Package list"
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:372
-#, no-wrap
-msgid ""
-"The following extra packages will be installed:\n"
-" libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n"
-" mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
-" bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
-" squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-" ssh"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:379
-msgid ""
-"The Extra Package list shows all of the packages that will be installed or "
-"upgraded in excess of the ones mentioned on the command line. It is only "
-"generated for an <tt>install</tt> command. The listed packages are often the "
-"result of an Auto Install."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:382
-msgid "The Packages to Remove"
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:389
-#, no-wrap
-msgid ""
-"The following packages will be REMOVED:\n"
-" xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
-" xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
-" xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-" nas xpilot xfig"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:399
-msgid ""
-"The Packages to Remove list shows all of the packages that will be removed "
-"from the system. It can be shown for any of the operations and should be "
-"given a careful inspection to ensure nothing important is to be taken off. "
-"The <tt>-f</tt> option is especially good at generating packages to remove "
-"so extreme care should be used in that case. The list may contain packages "
-"that are going to be removed because they are only partially installed, "
-"possibly due to an aborted installation."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:402
-msgid "The New Packages list"
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:406
-#, no-wrap
-msgid ""
-"The following NEW packages will installed:\n"
-" zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:411
-msgid ""
-"The New Packages list is simply a reminder of what will happen. The packages "
-"listed are not presently installed in the system but will be when APT is "
-"done."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:414
-msgid "The Kept Back list"
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:419
-#, no-wrap
-msgid ""
-"The following packages have been kept back\n"
-" compface man-db tetex-base msql libpaper svgalib1\n"
-" gs snmp arena lynx xpat2 groff xscreensaver"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:428
-msgid ""
-"Whenever the whole system is being upgraded there is the possibility that "
-"new versions of packages cannot be installed because they require new things "
-"or conflict with already installed things. In this case the package will "
-"appear in the Kept Back list. The best way to convince packages listed there "
-"to install is with <tt>apt-get install</tt> or by using <prgn>dselect</prgn> "
-"to resolve their problems."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:431
-msgid "Held Packages warning"
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:435
-#, no-wrap
-msgid ""
-"The following held packages will be changed:\n"
-" cvs"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:441
-msgid ""
-"Sometimes you can ask APT to install a package that is on hold, in such a "
-"case it prints out a warning that the held package is going to be changed. "
-"This should only happen during dist-upgrade or install."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:444
-msgid "Final summary"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:447
-msgid ""
-"Finally, APT will print out a summary of all the changes that will occur."
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:452
-#, no-wrap
-msgid ""
-"206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.\n"
-"12 packages not fully installed or removed.\n"
-"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:470
-msgid ""
-"The first line of the summary simply is a reduced version of all of the "
-"lists and includes the number of upgrades - that is packages already "
-"installed that have new versions available. The second line indicates the "
-"number of poorly configured packages, possibly the result of an aborted "
-"installation. The final line shows the space requirements that the "
-"installation needs. The first pair of numbers refer to the size of the "
-"archive files. The first number indicates the number of bytes that must be "
-"fetched from remote locations and the second indicates the total size of all "
-"the archives required. The next number indicates the size difference between "
-"the presently installed packages and the newly installed packages. It is "
-"roughly equivalent to the space required in /usr after everything is done. "
-"If a large number of packages are being removed then the value may indicate "
-"the amount of space that will be freed."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:473
-msgid ""
-"Some other reports can be generated by using the -u option to show packages "
-"to upgrade, they are similar to the previous examples."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:477
-msgid "The Status Display"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:481
-msgid ""
-"During the download of archives and package files APT prints out a series of "
-"status messages."
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:490
-#, no-wrap
-msgid ""
-"# apt-get update\n"
-"Get:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"
-"Get:2 http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
-"Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
-"Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
-"Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:500
-msgid ""
-"The lines starting with <em>Get</em> are printed out when APT begins to "
-"fetch a file while the last line indicates the progress of the download. The "
-"first percent value on the progress line indicates the total percent done of "
-"all files. Unfortunately since the size of the Package files is unknown "
-"<tt>apt-get update</tt> estimates the percent done which causes some "
-"inaccuracies."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:509
-msgid ""
-"The next section of the status line is repeated once for each download "
-"thread and indicates the operation being performed and some useful "
-"information about what is happening. Sometimes this section will simply read "
-"<em>Forking</em> which means the OS is loading the download module. The "
-"first word after the [ is the fetch number as shown on the history lines. "
-"The next word is the short form name of the object being downloaded. For "
-"archives it will contain the name of the package that is being fetched."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:524
-msgid ""
-"Inside of the single quote is an informative string indicating the progress "
-"of the negotiation phase of the download. Typically it progresses from "
-"<em>Connecting</em> to <em>Waiting for file</em> to <em>Downloading</em> or "
-"<em>Resuming</em>. The final value is the number of bytes downloaded from "
-"the remote site. Once the download begins this is represented as "
-"<tt>102/10.2k</tt> indicating that 102 bytes have been fetched and 10.2 "
-"kilobytes is expected. The total size is always shown in 4 figure notation "
-"to preserve space. After the size display is a percent meter for the file "
-"itself. The second last element is the instantaneous average speed. This "
-"values is updated every 5 seconds and reflects the rate of data transfer for "
-"that period. Finally is shown the estimated transfer time. This is updated "
-"regularly and reflects the time to complete everything at the shown transfer "
-"rate."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:530
-msgid ""
-"The status display updates every half second to provide a constant feedback "
-"on the download progress while the Get lines scroll back whenever a new file "
-"is started. Since the status display is constantly updated it is unsuitable "
-"for logging to a file, use the <tt>-q</tt> option to remove the status "
-"display."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:535
-msgid "Dpkg"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:542
-msgid ""
-"APT uses <prgn>dpkg</prgn> for installing the archives and will switch over "
-"to the <prgn>dpkg</prgn> interface once downloading is completed. "
-"<prgn>dpkg</prgn> will also ask a number of questions as it processes the "
-"packages and the packages themselves may also ask several questions. Before "
-"each question there is usually a description of what it is asking and the "
-"questions are too varied to discuss completely here."
-msgstr ""
-
-#. type: <title></title>
-#: offline.sgml:4
-msgid "Using APT Offline"
-msgstr ""
-
-#. type: <version></version>
-#: offline.sgml:7
-msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-msgstr ""
-
-#. type: <abstract></abstract>
-#: offline.sgml:12
-msgid ""
-"This document describes how to use APT in a non-networked environment, "
-"specifically a 'sneaker-net' approach for performing upgrades."
-msgstr ""
-
-#. type: <copyrightsummary></copyrightsummary>
-#: offline.sgml:16
-msgid "Copyright &copy; Jason Gunthorpe, 1999."
-msgstr ""
-
-#. type: <heading></heading>
-#: offline.sgml:32
-msgid "Introduction"
-msgstr ""
-
-#. type: <heading></heading>
-#: offline.sgml:34 offline.sgml:65 offline.sgml:180
-#, fuzzy
-#| msgid "OverrideDir"
-msgid "Overview"
-msgstr "OverrideDir"
-
-#. type: <p></p>
-#: offline.sgml:40
-msgid ""
-"Normally APT requires direct access to a Debian archive, either from a local "
-"media or through a network. Another common complaint is that a Debian "
-"machine is on a slow link, such as a modem and another machine has a very "
-"fast connection but they are physically distant."
-msgstr ""
-
-#. type: <p></p>
-#: offline.sgml:51
-msgid ""
-"The solution to this is to use large removable media such as a Zip disc or a "
-"SuperDisk disc. These discs are not large enough to store the entire Debian "
-"archive but can easily fit a subset large enough for most users. The idea is "
-"to use APT to generate a list of packages that are required and then fetch "
-"them onto the disc using another machine with good connectivity. It is even "
-"possible to use another Debian machine with APT or to use a completely "
-"different OS and a download tool like wget. Let <em>remote host</em> mean "
-"the machine downloading the packages, and <em>target host</em> the one with "
-"bad or no connection."
-msgstr ""
-
-#. type: <p></p>
-#: offline.sgml:57
-msgid ""
-"This is achieved by creatively manipulating the APT configuration file. The "
-"essential premis to tell APT to look on a disc for it's archive files. Note "
-"that the disc should be formated with a filesystem that can handle long file "
-"names such as ext2, fat32 or vfat."
-msgstr ""
-
-#. type: <heading></heading>
-#: offline.sgml:63
-msgid "Using APT on both machines"
-msgstr ""
-
-#. type: <p><example>
-#: offline.sgml:71
-msgid ""
-"APT being available on both machines gives the simplest configuration. The "
-"basic idea is to place a copy of the status file on the disc and use the "
-"remote machine to fetch the latest package files and decide which packages "
-"to download. The disk directory structure should look like:"
-msgstr ""
-
-#. type: <example></example>
-#: offline.sgml:80
-#, no-wrap
-msgid ""
-" /disc/\n"
-" archives/\n"
-" partial/\n"
-" lists/\n"
-" partial/\n"
-" status\n"
-" sources.list\n"
-" apt.conf"
-msgstr ""
-
-#. type: <heading></heading>
-#: offline.sgml:88
-#, fuzzy
-#| msgid "User configuration"
-msgid "The configuration file"
-msgstr "Configuration utilisateur"
-
-#. type: <p></p>
-#: offline.sgml:96
-msgid ""
-"The configuration file should tell APT to store its files on the disc and to "
-"use the configuration files on the disc as well. The sources.list should "
-"contain the proper sites that you wish to use from the remote machine, and "
-"the status file should be a copy of <em>/var/lib/dpkg/status</em> from the "
-"<em>target host</em>. Please note, if you are using a local archive you must "
-"use copy URIs, the syntax is identical to file URIs."
-msgstr ""
-
-#. type: <p><example>
-#: offline.sgml:100
-msgid ""
-"<em>apt.conf</em> must contain the necessary information to make APT use the "
-"disc:"
-msgstr ""
-
-#. type: <example></example>
-#: offline.sgml:124
-#, no-wrap
-msgid ""
-" APT\n"
-" {\n"
-" /* This is not necessary if the two machines are the same arch, it tells\n"
-" the remote APT what architecture the target machine is */\n"
-" Architecture \"i386\";\n"
-" \n"
-" Get::Download-Only \"true\";\n"
-" };\n"
-" \n"
-" Dir\n"
-" {\n"
-" /* Use the disc for state information and redirect the status file from\n"
-" the /var/lib/dpkg default */\n"
-" State \"/disc/\";\n"
-" State::status \"status\";\n"
-"\n"
-" // Binary caches will be stored locally\n"
-" Cache::archives \"/disc/archives/\";\n"
-" Cache \"/tmp/\";\n"
-" \n"
-" // Location of the source list.\n"
-" Etc \"/disc/\";\n"
-" };"
-msgstr ""
-
-#. type: </example></p>
-#: offline.sgml:129
-msgid ""
-"More details can be seen by examining the apt.conf man page and the sample "
-"configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>."
-msgstr ""
-
-#. type: <p><example>
-#: offline.sgml:136
-msgid ""
-"On the target machine the first thing to do is mount the disc and copy <em>/"
-"var/lib/dpkg/status</em> to it. You will also need to create the directories "
-"outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
-"em> Then take the disc to the remote machine and configure the sources.list. "
-"On the remote machine execute the following:"
-msgstr ""
-
-#. type: <example></example>
-#: offline.sgml:142
-#, no-wrap
-msgid ""
-" # export APT_CONFIG=\"/disc/apt.conf\"\n"
-" # apt-get update\n"
-" [ APT fetches the package files ]\n"
-" # apt-get dist-upgrade\n"
-" [ APT fetches all the packages needed to upgrade the target machine ]"
-msgstr ""
-
-#. type: </example></p>
-#: offline.sgml:149
-msgid ""
-"The dist-upgrade command can be replaced with any-other standard APT "
-"commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em> However this presents a problem in communicating "
-"your selections back to the local computer."
-msgstr ""
-
-#. type: <p><example>
-#: offline.sgml:153
-msgid ""
-"Now the disc contains all of the index files and archives needed to upgrade "
-"the target machine. Take the disc back and run:"
-msgstr ""
-
-#. type: <example></example>
-#: offline.sgml:159
-#, no-wrap
-msgid ""
-" # export APT_CONFIG=\"/disc/apt.conf\"\n"
-" # apt-get check\n"
-" [ APT generates a local copy of the cache files ]\n"
-" # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-" [ Or any other APT command ]"
-msgstr ""
-
-#. type: <p></p>
-#: offline.sgml:165
-msgid ""
-"It is necessary for proper function to re-specify the status file to be the "
-"local one. This is very important!"
-msgstr ""
-
-#. type: <p></p>
-#: offline.sgml:172
-msgid ""
-"If you are using dselect you can do the very risky operation of copying disc/"
-"status to /var/lib/dpkg/status so that any selections you made on the remote "
-"machine are updated. I highly recommend that people only make selections on "
-"the local machine - but this may not always be possible. DO NOT copy the "
-"status file if dpkg or APT have been run in the mean time!!"
-msgstr ""
-
-#. type: <heading></heading>
-#: offline.sgml:178
-msgid "Using APT and wget"
-msgstr ""
-
-#. type: <p></p>
-#: offline.sgml:185
-msgid ""
-"<em>wget</em> is a popular and portable download tool that can run on nearly "
-"any machine. Unlike the method above this requires that the Debian machine "
-"already has a list of available packages."
-msgstr ""
-
-#. type: <p></p>
-#: offline.sgml:190
-msgid ""
-"The basic idea is to create a disc that has only the archive files "
-"downloaded from the remote site. This is done by using the --print-uris "
-"option to apt-get and then preparing a wget script to actually fetch the "
-"packages."
-msgstr ""
-
-#. type: <heading></heading>
-#: offline.sgml:196
-#, fuzzy
-#| msgid "Options"
-msgid "Operation"
-msgstr "Options"
-
-#. type: <p><example>
-#: offline.sgml:200
-msgid ""
-"Unlike the previous technique no special configuration files are required. "
-"We merely use the standard APT commands to generate the file list."
-msgstr ""
-
-#. type: <example></example>
-#: offline.sgml:205
-#, no-wrap
-msgid ""
-" # apt-get dist-upgrade \n"
-" [ Press no when prompted, make sure you are happy with the actions ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
-msgstr ""
-
-#. type: </example></p>
-#: offline.sgml:210
-msgid ""
-"Any command other than dist-upgrade could be used here, including dselect-"
-"upgrade."
-msgstr ""
-
-#. type: <p></p>
-#: offline.sgml:216
-msgid ""
-"The /disc/wget-script file will now contain a list of wget commands to "
-"execute in order to fetch the necessary archives. This script should be run "
-"with the current directory as the disc's mount point so as to save the "
-"output on the disc."
-msgstr ""
-
-#. type: <p><example>
-#: offline.sgml:219
-msgid "The remote machine would do something like"
-msgstr ""
-
-#. type: <example></example>
-#: offline.sgml:223
-#, no-wrap
-msgid ""
-" # cd /disc\n"
-" # sh -x ./wget-script\n"
-" [ wait.. ]"
-msgstr ""
-
-#. type: </example><example>
-#: offline.sgml:228
-msgid ""
-"Once the archives are downloaded and the disc returned to the Debian machine "
-"installation can proceed using,"
-msgstr ""
-
-#. type: <example></example>
-#: offline.sgml:230
-#, no-wrap
-msgid " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
-msgstr ""
-
-#. type: </example></p>
-#: offline.sgml:234
-msgid "Which will use the already fetched archives on the disc."
-msgstr ""
-
-#~ msgid ""
-#~ "Disable Immediate Configuration; This dangerous option disables some of "
-#~ "APT's ordering code to cause it to make fewer dpkg calls. Doing so may be "
-#~ "necessary on some extremely slow single user systems but is very "
-#~ "dangerous and may cause package install scripts to fail or worse. Use at "
-#~ "your own risk."
-#~ msgstr ""
-#~ "Désactive la configuration immédiate ; cette dangereuse option désactive "
-#~ "une partie du code de mise en ordre de APT pour que ce dernier effectue "
-#~ "le moins d'appels possible à &dpkg;. Ça peut être nécessaire sur des "
-#~ "systèmes à un seul utilisateur extrêmement lents, mais cette option est "
-#~ "très dangereuse et peut faire échouer les scripts d'installation, voire "
-#~ "pire. Utilisez-la à vos risques et périls."
-
#~ msgid "<filename>/etc/apt/sources.list</filename>"
#~ msgstr "<filename>/etc/apt/sources.list</filename>"
diff --git a/doc/po/ja.po b/doc/po/ja.po
index b27325393..53684a0cd 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-10-29 01:51+0100\n"
+"POT-Creation-Date: 2009-12-01 19:13+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"
@@ -371,17 +371,11 @@ msgstr ""
#. type: Plain text
#: apt.ent:84
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY dpkg \"<citerefentry>\n"
-#| " <refentrytitle><command>dpkg</command></refentrytitle>\n"
-#| " <manvolnum>8</manvolnum>\n"
-#| " </citerefentry>\"\n"
-#| ">\n"
+#, no-wrap
msgid ""
"<!ENTITY dpkg \"<citerefentry>\n"
" <refentrytitle><command>dpkg</command></refentrytitle>\n"
-" <manvolnum>1</manvolnum>\n"
+" <manvolnum>8</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
msgstr ""
@@ -425,17 +419,11 @@ msgstr ""
#. type: Plain text
#: apt.ent:102
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY dpkg-scanpackages \"<citerefentry>\n"
-#| " <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n"
-#| " <manvolnum>8</manvolnum>\n"
-#| " </citerefentry>\"\n"
-#| ">\n"
+#, no-wrap
msgid ""
"<!ENTITY dpkg-scanpackages \"<citerefentry>\n"
" <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n"
-" <manvolnum>1</manvolnum>\n"
+" <manvolnum>8</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
msgstr ""
@@ -447,17 +435,11 @@ msgstr ""
#. type: Plain text
#: apt.ent:108
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY dpkg-scansources \"<citerefentry>\n"
-#| " <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n"
-#| " <manvolnum>8</manvolnum>\n"
-#| " </citerefentry>\"\n"
-#| ">\n"
+#, no-wrap
msgid ""
"<!ENTITY dpkg-scansources \"<citerefentry>\n"
" <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n"
-" <manvolnum>1</manvolnum>\n"
+" <manvolnum>8</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
msgstr ""
@@ -469,17 +451,11 @@ msgstr ""
#. type: Plain text
#: apt.ent:114
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY dselect \"<citerefentry>\n"
-#| " <refentrytitle><command>dselect</command></refentrytitle>\n"
-#| " <manvolnum>8</manvolnum>\n"
-#| " </citerefentry>\"\n"
-#| ">\n"
+#, no-wrap
msgid ""
"<!ENTITY dselect \"<citerefentry>\n"
" <refentrytitle><command>dselect</command></refentrytitle>\n"
-" <manvolnum>1</manvolnum>\n"
+" <manvolnum>8</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
msgstr ""
@@ -604,15 +580,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 +631,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 +650,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 +669,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 +933,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 +945,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 +994,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 +1007,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"
@@ -1386,17 +1329,10 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
#: apt-cache.8.xml:152
-#, fuzzy
-#| msgid ""
-#| "<literal>Missing</literal> is the number of package names that were "
-#| "referenced in a dependency but were not provided by any package. Missing "
-#| "packages may be in evidence if a full distribution is not accessed, or if "
-#| "a package (real or virtual) has been dropped from the distribution. "
-#| "Usually they are referenced from Conflicts or Breaks statements."
msgid ""
"<literal>Missing</literal> is the number of package names that were "
"referenced in a dependency but were not provided by any package. Missing "
-"packages may be an evidence if a full distribution is not accessed, or if a "
+"packages may be in evidence if a full distribution is not accessed, or if a "
"package (real or virtual) has been dropped from the distribution. Usually "
"they are referenced from Conflicts or Breaks statements."
msgstr ""
@@ -1589,12 +1525,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 "
@@ -1724,7 +1654,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89
-#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:456 apt.conf.5.xml:478
+#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:441 apt.conf.5.xml:463
msgid "options"
msgstr "オプション"
@@ -1974,7 +1904,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:988 apt_preferences.5.xml:615
+#: apt.conf.5.xml:973 apt_preferences.5.xml:615
msgid "Files"
msgstr "ファイル"
@@ -1988,8 +1918,8 @@ 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:563 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
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:979 apt_preferences.5.xml:622
+#: sources.list.5.xml:221
msgid "See Also"
msgstr "関連項目"
@@ -2499,15 +2429,10 @@ msgstr "<option>--tempdir</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-extracttemplates.1.xml:62
-#, fuzzy
-#| msgid ""
-#| "Temporary directory in which to write extracted debconf template files "
-#| "and config scripts Configuration Item: <literal>APT::ExtractTemplates::"
-#| "TempDir</literal>"
msgid ""
"Temporary directory in which to write extracted debconf template files and "
-"config scripts. Configuration Item: <literal>APT::ExtractTemplates::"
-"TempDir</literal>"
+"config scripts Configuration Item: <literal>APT::ExtractTemplates::TempDir</"
+"literal>"
msgstr ""
"抽出した debconf テンプレートファイルや設定スクリプトを書き出す一時ディレクト"
"リ。設定項目 - <literal>APT::ExtractTemplates::TempDir</literal>"
@@ -2538,25 +2463,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> "
@@ -2837,17 +2743,11 @@ msgstr "Dir セクション"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt-ftparchive.1.xml:159
-#, fuzzy
-#| msgid ""
-#| "The <literal>Dir</literal> section defines the standard directories "
-#| "needed to locate the files required during the generation process. These "
-#| "directories are prepended to certain relative paths defined in later "
-#| "sections to produce a complete an absolute path."
msgid ""
"The <literal>Dir</literal> section defines the standard directories needed "
"to locate the files required during the generation process. These "
-"directories are prepended certain relative paths defined in later sections "
-"to produce a complete an absolute path."
+"directories are prepended to certain relative paths defined in later "
+"sections to produce a complete an absolute path."
msgstr ""
"<literal>Dir</literal> セクションは、生成プロセスで必要なファイルを配置するた"
"めの、標準ディレクトリを定義します。このディレクトリは、完全な絶対パスを生成"
@@ -3707,8 +3607,8 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:552 apt.conf.5.xml:982 apt_preferences.5.xml:462
-#: sources.list.5.xml:193
+#: apt-ftparchive.1.xml:552 apt.conf.5.xml:967 apt_preferences.5.xml:462
+#: sources.list.5.xml:181
msgid "Examples"
msgstr "サンプル"
@@ -3750,8 +3650,8 @@ msgstr ""
"November 2008</date>"
# type: Content of: <refentry><refnamediv><refname>
-#. type: <heading></heading>
-#: apt-get.8.xml:22 apt-get.8.xml:29 guide.sgml:96
+#. type: Content of: <refentry><refnamediv><refname>
+#: apt-get.8.xml:22 apt-get.8.xml:29
msgid "apt-get"
msgstr "apt-get"
@@ -3764,37 +3664,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> "
@@ -3900,8 +3769,8 @@ msgstr ""
"のサイズを知ることができないため、全体の進捗メータは正しく表示されません。"
# type: <tag></tag>
-#. type: <tag></tag>
-#: apt-get.8.xml:147 guide.sgml:121
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:147
msgid "upgrade"
msgstr "upgrade"
@@ -3954,8 +3823,8 @@ msgstr ""
"ど)"
# type: <tag></tag>
-#. type: <tag></tag>
-#: apt-get.8.xml:170 guide.sgml:140
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:170
msgid "dist-upgrade"
msgstr "dist-upgrade"
@@ -3984,8 +3853,8 @@ msgstr ""
"さい。"
# type: <tag></tag>
-#. type: <tag></tag>
-#: apt-get.8.xml:183 guide.sgml:131
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:183
msgid "install"
msgstr "install"
@@ -4131,18 +4000,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 "
@@ -4175,7 +4032,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:266
msgid ""
-"If the <option>--compile</option> option is specified then the package will "
+"If the <option>--compile</option> options is specified then the package will "
"be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
"<option>--download-only</option> is specified then the source package will "
"not be unpacked."
@@ -4461,17 +4318,11 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:392
-#, fuzzy
-#| msgid ""
-#| "Simulate prints out a series of lines each one representing a dpkg "
-#| "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square "
-#| "brackets indicate broken packages with and empty set of square brackets "
-#| "meaning breaks that are of no consequence (rare)."
msgid ""
"Simulate prints out a series of lines each one representing a dpkg "
"operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
-"indicate broken packages and empty set of square brackets meaning breaks "
-"that are of no consequence (rare)."
+"indicate broken packages with and empty set of square brackets meaning "
+"breaks that are of no consequence (rare)."
msgstr ""
"シミュレートの結果、dpkg の動作を表す一連の行のそれぞれに、設定 (Conf)、削除 "
"(Remv)、展開 (Inst) を表示します。角カッコは壊れたパッケージを表し、(まれに) "
@@ -5146,9 +4997,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>"
@@ -5172,11 +5020,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"
@@ -5204,12 +5047,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 "
@@ -5265,13 +5102,9 @@ 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."
+"<literal>showauto</literal> is used to print a list of manually installed "
+"packages with each package on a new line."
msgstr ""
"<literal>autoremove</literal> は、依存関係を満たすために自動的にインストール"
"され、もう必要なくなったパッケージを削除するのに使用します。"
@@ -5279,7 +5112,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>"
@@ -5287,7 +5119,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>"
@@ -5297,11 +5128,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 "
@@ -5348,7 +5174,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>"
@@ -5364,7 +5189,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;"
@@ -5438,20 +5262,12 @@ msgstr "信頼済アーカイブ"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml:67
-#, fuzzy
-#| msgid ""
-#| "The chain of trust from an apt archive to the end user is made up of "
-#| "different steps. <command>apt-secure</command> is the last step in this "
-#| "chain, trusting an archive does not mean that the packages that you trust "
-#| "it do not contain malicious code but means that you trust the archive "
-#| "maintainer. Its the archive maintainer responsibility to ensure that the "
-#| "archive integrity is correct."
msgid ""
"The chain of trust from an apt archive to the end user is made up of "
"different steps. <command>apt-secure</command> is the last step in this "
"chain, trusting an archive does not mean that the packages that you trust it "
"do not contain malicious code but means that you trust the archive "
-"maintainer. It's the archive maintainer responsibility to ensure that the "
+"maintainer. Its the archive maintainer responsibility to ensure that the "
"archive integrity is correct."
msgstr ""
"apt アーカイブからエンドユーザまでの信頼の輪は、いくつかのステップで構成され"
@@ -5495,22 +5311,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml:92
-#, fuzzy
-#| msgid ""
-#| "Once the uploaded package is verified and included in the archive, the "
-#| "maintainer signature is stripped off, an MD5 sum of the package is "
-#| "computed and put in the Packages file. The MD5 sum of all of the packages "
-#| "files are then computed and put into the Release file. The Release file "
-#| "is then signed by the archive key (which is created once a year and "
-#| "distributed through the FTP server. This key is also on the Debian "
-#| "keyring."
msgid ""
"Once the uploaded package is verified and included in the archive, the "
"maintainer signature is stripped off, an MD5 sum of the package is computed "
"and put in the Packages file. The MD5 sum of all of the packages files are "
"then computed and put into the Release file. The Release file is then signed "
-"by the archive key (which is created once a year) and distributed through "
-"the FTP server. This key is also on the Debian keyring."
+"by the archive key (which is created once a year and distributed through the "
+"FTP server. This key is also on the Debian keyring."
msgstr ""
"アップロードされたパッケージごとに、検証してアーカイブに格納します。パッケー"
"ジは、メンテナの署名をはがされ、MD5 sum を計算されて、Packages ファイルに格納"
@@ -5643,13 +5450,8 @@ msgstr ""
# type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#: apt-secure.8.xml:160
-#, fuzzy
-#| msgid ""
-#| "<literal>Create a toplevel Release file</literal>. if it does not exist "
-#| "already. You can do this by running <command>apt-ftparchive release</"
-#| "command> (provided in apt-utils)."
msgid ""
-"<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
+"<literal>Create a toplevel Release file</literal>. if it does not exist "
"already. You can do this by running <command>apt-ftparchive release</"
"command> (provided in apt-utils)."
msgstr ""
@@ -5660,13 +5462,9 @@ msgstr ""
# type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#: apt-secure.8.xml:165
-#, fuzzy
-#| msgid ""
-#| "<literal>Sign it</literal>. You can do this by running <command>gpg -abs -"
-#| "o Release.gpg Release</command>."
msgid ""
-"<emphasis>Sign it</emphasis>. You can do this by running <command>gpg -abs -"
-"o Release.gpg Release</command>."
+"<literal>Sign it</literal>. You can do this by running <command>gpg -abs -o "
+"Release.gpg Release</command>."
msgstr ""
"<literal>署名</literal>します。<command>gpg -abs -o Release.gpg Release</"
"command> を実行して、署名してください。"
@@ -5674,13 +5472,8 @@ msgstr ""
# type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#: apt-secure.8.xml:168
-#, fuzzy
-#| msgid ""
-#| "<literal>Publish the key fingerprint</literal>, that way your users will "
-#| "know what key they need to import in order to authenticate the files in "
-#| "the archive."
msgid ""
-"<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
+"<literal>Publish the key fingerprint</literal>, that way your users will "
"know what key they need to import in order to authenticate the files in the "
"archive."
msgstr ""
@@ -5816,11 +5609,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 "
@@ -5874,18 +5662,11 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:50
-#, fuzzy
-#| msgid ""
-#| "The configuration file is organized in a tree with options organized into "
-#| "functional groups. option specification is given with a double colon "
-#| "notation, for instance <literal>APT::Get::Assume-Yes</literal> is an "
-#| "option within the APT tool group, for the Get tool. options do not "
-#| "inherit from their parent groups."
msgid ""
"The configuration file is organized in a tree with options organized into "
-"functional groups. Option specification is given with a double colon "
+"functional groups. option specification is given with a double colon "
"notation, for instance <literal>APT::Get::Assume-Yes</literal> is an option "
-"within the APT tool group, for the Get tool. Options do not inherit from "
+"within the APT tool group, for the Get tool. options do not inherit from "
"their parent groups."
msgstr ""
"設定ファイルは、機能グループごとに系統立てられたオプションを木構造で表しま"
@@ -5897,20 +5678,12 @@ 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 "
"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 "
+"of the form <literal>APT::Get::Assume-Yes \"true\";</literal> The trailing "
"semicolon and the quotes are required. The value must be on one line, and "
"there is no kind of string concatenation. It must not include inside "
"quotes. The behavior of the backslash \"\\\" and escaped characters inside "
@@ -5997,13 +5770,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</"
@@ -6033,12 +5799,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 "
@@ -6164,47 +5924,30 @@ msgstr ""
msgid "Immediate-Configure"
msgstr "Immediate-Configure"
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:159
msgid ""
-"Defaults to on which will cause APT to install essential and important "
-"packages as fast as possible in the install/upgrade operation. This is done "
-"to limit the effect of a failing &dpkg; call: If this option is disabled APT "
-"does treat an important package in the same way as an extra package: Between "
-"the unpacking of the important package A and his configuration can then be "
-"many other unpack or configuration calls, e.g. for package B which has no "
-"relation to A, but causes the dpkg call to fail (e.g. because maintainer "
-"script of package B generates an error) which results in a system state in "
-"which package A is unpacked but unconfigured - each package depending on A "
-"is now no longer guaranteed to work as their dependency on A is not longer "
-"satisfied. The immediate configuration marker is also applied to all "
-"dependencies which can generate a problem if the dependencies e.g. form a "
-"circle as a dependency with the immediate flag is comparable with a Pre-"
-"Dependency. So in theory it is possible that APT encounters a situation in "
-"which it is unable to perform immediate configuration, error out and refers "
-"to this option so the user can deactivate the immediate configuration "
-"temporary to be able to perform an install/upgrade again. Note the use of "
-"the word \"theory\" here as this problem was only encountered by now in real "
-"world a few times in non-stable distribution versions and caused by wrong "
-"dependencies of the package in question or by a system in an already broken "
-"state, so you should not blindly disable this option as the mentioned "
-"scenario above is not the only problem immediate configuration can help to "
-"prevent in the first place. Before a big operation like <literal>dist-"
-"upgrade</literal> is run with this option disabled it should be tried to "
-"explicitly <literal>install</literal> the package APT is unable to configure "
-"immediately, but please make sure to report your problem also to your "
-"distribution and to the APT team with the buglink below so they can work on "
-"improving or correcting the upgrade process."
+"Disable Immediate Configuration; This dangerous option disables some of "
+"APT's ordering code to cause it to make fewer dpkg calls. Doing so may be "
+"necessary on some extremely slow single user systems but is very dangerous "
+"and may cause package install scripts to fail or worse. Use at your own "
+"risk."
msgstr ""
+"即時設定無効 - この危険なオプションは、APT の要求コードを無効にして dpkg の呼"
+"び出しをほとんどしないようにします。これは、非常に遅いシングルユーザシステム"
+"では必要かもしれませんが、非常に危険で、パッケージのインストールスクリプトが"
+"失敗したり、もしくはもっと悪いことがおきるかもしれません。自己責任で使用して"
+"ください。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:181
+#: apt.conf.5.xml:166
msgid "Force-LoopBreak"
msgstr "Force-LoopBreak"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:182
+#: apt.conf.5.xml:167
msgid ""
"Never Enable this option unless you -really- know what you are doing. It "
"permits APT to temporarily remove an essential package to break a Conflicts/"
@@ -6222,13 +5965,13 @@ msgstr ""
"不可欠パッケージで動作します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:190
+#: apt.conf.5.xml:175
msgid "Cache-Limit"
msgstr "Cache-Limit"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:191
+#: apt.conf.5.xml:176
msgid ""
"APT uses a fixed size memory mapped cache file to store the 'available' "
"information. This sets the size of that cache (in bytes)."
@@ -6237,24 +5980,24 @@ msgstr ""
"ファイルを使用します。このオプションは、そのキャッシュサイズを指定します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:195
+#: apt.conf.5.xml:180
msgid "Build-Essential"
msgstr "Build-Essential"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:196
+#: apt.conf.5.xml:181
msgid "Defines which package(s) are considered essential build dependencies."
msgstr "構築依存関係で不可欠なパッケージを定義します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:184
msgid "Get"
msgstr "Get"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:200
+#: apt.conf.5.xml:185
msgid ""
"The Get subsection controls the &apt-get; tool, please see its documentation "
"for more information about the options here."
@@ -6263,13 +6006,13 @@ msgstr ""
"&apt-get; の文書を参照してください。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:204
+#: apt.conf.5.xml:189
msgid "Cache"
msgstr "Cache"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:205
+#: apt.conf.5.xml:190
msgid ""
"The Cache subsection controls the &apt-cache; tool, please see its "
"documentation for more information about the options here."
@@ -6278,13 +6021,13 @@ msgstr ""
"は &apt-cache; の文書を参照してください。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:209
+#: apt.conf.5.xml:194
msgid "CDROM"
msgstr "CDROM"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:210
+#: apt.conf.5.xml:195
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool, please see its "
"documentation for more information about the options here."
@@ -6294,17 +6037,17 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:216
+#: apt.conf.5.xml:201
msgid "The Acquire Group"
msgstr "Acquire グループ"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:206
msgid "PDiffs"
msgstr "PDiffs"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:222
+#: apt.conf.5.xml:207
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for Packages or "
"Sources files instead of downloading whole ones. True by default."
@@ -6314,13 +6057,13 @@ msgstr ""
"ルトでは True です。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:227
+#: apt.conf.5.xml:212
msgid "Queue-Mode"
msgstr "Queue-Mode"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:228
+#: apt.conf.5.xml:213
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
"literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -6335,13 +6078,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:235
+#: apt.conf.5.xml:220
msgid "Retries"
msgstr "Retries"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:221
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
@@ -6350,13 +6093,13 @@ msgstr ""
"えられた回数だけリトライを行います。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:240
+#: apt.conf.5.xml:225
msgid "Source-Symlinks"
msgstr "Source-Symlinks"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:241
+#: apt.conf.5.xml:226
msgid ""
"Use symlinks for source archives. If set to true then source archives will "
"be symlinked when possible instead of copying. True is the default."
@@ -6367,21 +6110,14 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:245 sources.list.5.xml:139
+#: apt.conf.5.xml:230 sources.list.5.xml:139
msgid "http"
msgstr "http"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:246
+#: apt.conf.5.xml:231
#, 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 "
@@ -6399,7 +6135,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:254
+#: apt.conf.5.xml:239
msgid ""
"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
"caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@ -6424,7 +6160,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:321
+#: apt.conf.5.xml:249 apt.conf.5.xml:306
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method, this applies to all things including connection timeout and data "
@@ -6436,19 +6172,10 @@ 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:267
-#, fuzzy
-#| msgid ""
-#| "One setting is provided to control the pipeline depth in cases where the "
-#| "remote server is not RFC conforming or buggy (such as Squid 2.0.2) "
-#| "<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to "
-#| "5 indicating how many outstanding requests APT should send. A value of "
-#| "zero MUST be specified if the remote host does not properly linger on TCP "
-#| "connections - otherwise data corruption will occur. Hosts which require "
-#| "this are in violation of RFC 2068."
+#: apt.conf.5.xml:252
msgid ""
"One setting is provided to control the pipeline depth in cases where the "
-"remote server is not RFC conforming or buggy (such as Squid 2.0.2). "
+"remote server is not RFC conforming or buggy (such as Squid 2.0.2) "
"<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to 5 "
"indicating how many outstanding requests APT should send. A value of zero "
"MUST be specified if the remote host does not properly linger on TCP "
@@ -6464,7 +6191,7 @@ msgstr ""
"ます。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:275
+#: apt.conf.5.xml:260
msgid ""
"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
"literal> which accepts integer values in kilobyte. The default value is 0 "
@@ -6475,12 +6202,12 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:281
+#: apt.conf.5.xml:266
msgid "https"
msgstr "https"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:282
+#: apt.conf.5.xml:267
msgid ""
"HTTPS URIs. Cache-control and proxy options are the same as for "
"<literal>http</literal> method. <literal>Pipeline-Depth</literal> option is "
@@ -6491,7 +6218,7 @@ msgstr ""
"していません。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:286
+#: apt.conf.5.xml:271
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -6513,26 +6240,14 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:304 sources.list.5.xml:150
+#: apt.conf.5.xml:289 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:305
+#: apt.conf.5.xml:290
#, 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 "
@@ -6562,7 +6277,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:324
+#: apt.conf.5.xml:309
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 "
@@ -6578,7 +6293,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:316
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 "
@@ -6592,7 +6307,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:336
+#: apt.conf.5.xml:321
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -6609,20 +6324,19 @@ msgstr ""
# type: Content of: <refentry><refnamediv><refname>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:343 sources.list.5.xml:132
+#: apt.conf.5.xml:328 sources.list.5.xml:132
msgid "cdrom"
msgstr "cdrom"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:349
+#: apt.conf.5.xml:334
#, 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:344
+#: apt.conf.5.xml:329
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 "
@@ -6643,13 +6357,13 @@ msgstr ""
"す。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:354
+#: apt.conf.5.xml:339
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:355
+#: apt.conf.5.xml:340
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
@@ -6660,18 +6374,18 @@ msgstr ""
"す。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:360
+#: apt.conf.5.xml:345
msgid "CompressionTypes"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:366
+#: apt.conf.5.xml:351
#, 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:361
+#: apt.conf.5.xml:346
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -6683,19 +6397,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:371
+#: apt.conf.5.xml:356
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:374
+#: apt.conf.5.xml:359
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:352
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 "
@@ -6712,13 +6426,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:378
+#: apt.conf.5.xml:363
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:376
+#: apt.conf.5.xml:361
msgid ""
"Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
"replaceable></literal> will be checked: If this setting exists the method "
@@ -6733,7 +6447,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:383
+#: apt.conf.5.xml:368
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 "
@@ -6744,7 +6458,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:217
+#: apt.conf.5.xml:202
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>"
@@ -6755,13 +6469,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:392
+#: apt.conf.5.xml:377
msgid "Directories"
msgstr "ディレクトリ"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:394
+#: apt.conf.5.xml:379
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -6781,7 +6495,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:401
+#: apt.conf.5.xml:386
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -6803,7 +6517,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:410
+#: apt.conf.5.xml:395
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -6818,7 +6532,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:416
+#: apt.conf.5.xml:401
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 "
@@ -6830,15 +6544,8 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:405
#, 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 "
@@ -6855,7 +6562,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:428
+#: apt.conf.5.xml:413
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -6876,13 +6583,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:441
+#: apt.conf.5.xml:426
msgid "APT in DSelect"
msgstr "DSelect での APT"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:443
+#: apt.conf.5.xml:428
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -6892,13 +6599,13 @@ msgstr ""
"設定項目で、デフォルトの動作を制御します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:447
+#: apt.conf.5.xml:432
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:448
+#: apt.conf.5.xml:433
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 "
@@ -6915,7 +6622,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:457
+#: apt.conf.5.xml:442
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the install phase."
@@ -6925,13 +6632,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:461
+#: apt.conf.5.xml:446
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:462
+#: apt.conf.5.xml:447
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the update phase."
@@ -6940,13 +6647,13 @@ msgstr ""
"されます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:466
+#: apt.conf.5.xml:451
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:467
+#: apt.conf.5.xml:452
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
@@ -6956,13 +6663,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:473
+#: apt.conf.5.xml:458
msgid "How APT calls dpkg"
msgstr "APT が dpkg を呼ぶ方法"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:474
+#: apt.conf.5.xml:459
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
@@ -6972,7 +6679,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:479
+#: apt.conf.5.xml:464
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 "
@@ -6982,18 +6689,18 @@ msgstr ""
"ければなりません。また、各リストは単一の引数として &dpkg; に渡されます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:484
+#: apt.conf.5.xml:469
msgid "Pre-Invoke"
msgstr "Pre-Invoke"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:484
+#: apt.conf.5.xml:469
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:485
+#: apt.conf.5.xml:470
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 "
@@ -7007,13 +6714,13 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:491
+#: apt.conf.5.xml:476
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:492
+#: apt.conf.5.xml:477
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 "
@@ -7029,7 +6736,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:498
+#: apt.conf.5.xml:483
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -7045,13 +6752,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:505
+#: apt.conf.5.xml:490
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:506
+#: apt.conf.5.xml:491
msgid ""
"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
"</filename>."
@@ -7061,13 +6768,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:510
+#: apt.conf.5.xml:495
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:511
+#: apt.conf.5.xml:496
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages, the "
"default is to disable signing and produce all binaries."
@@ -7076,12 +6783,12 @@ msgstr ""
"ます。デフォルトでは署名を無効にし、全バイナリを生成します。"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:516
+#: apt.conf.5.xml:501
msgid "dpkg trigger usage (and related options)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:502
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 "
@@ -7096,7 +6803,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:532
+#: apt.conf.5.xml:517
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -7106,7 +6813,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:526
+#: apt.conf.5.xml:511
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 "
@@ -7120,17 +6827,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:523
msgid "DPkg::NoTriggers"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:524
msgid ""
-"Add the no triggers flag to all dpkg calls (except the ConfigurePending "
+"Add the no triggers flag to all dpkg calls (expect the ConfigurePending "
"call). See &dpkg; if you are interested in what this actually means. In "
-"short: dpkg will not run the triggers when this flag is present unless it is "
-"explicitly called to do so in an extra call. Note that this option exists "
+"short: dpkg will not run the triggers then this flag is present unless it is "
+"explicit called to do so in an extra call. Note that this option exists "
"(undocumented) also in older apt versions with a slightly different meaning: "
"Previously these option only append --no-triggers to the configure calls to "
"dpkg - now apt will add these flag also to the unpack and remove calls."
@@ -7138,14 +6845,13 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:546
+#: apt.conf.5.xml:531
#, fuzzy
-#| msgid "Packages::Compress"
msgid "PackageManager::Configure"
msgstr "Packages::Compress"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:547
+#: apt.conf.5.xml:532
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
@@ -7154,37 +6860,37 @@ msgid ""
"to be configured before another package can be unpacked (Pre-Depends) and "
"let the rest configure by dpkg with a call generated by the next option. "
"\"<literal>no</literal>\" on the other hand will not configure anything and "
-"totally rely on dpkg for configuration (which will at the moment fail if a "
+"totally relay on dpkg for configuration (which will at the moment fail if a "
"Pre-Depends is encountered). Setting this option to another than the all "
-"value will implicitly activate also the next option per default as otherwise "
+"value will implicit activate also the next option per default as otherwise "
"the system could end in an unconfigured status which could be unbootable!"
msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:557
+#: apt.conf.5.xml:542
#, fuzzy
msgid "DPkg::ConfigurePending"
msgstr "ユーザの設定"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:558
+#: apt.conf.5.xml:543
msgid ""
"If this option is set apt will call <command>dpkg --configure --pending</"
"command> to let dpkg handle all required configurations and triggers. This "
"option is activated automatic per default if the previous option is not set "
"to <literal>all</literal>, but deactivating could be useful if you want to "
-"run APT multiple times in a row - e.g. in an installer. In these sceneries "
+"run APT multiple times in a row - e.g. in an installer. In this sceneries "
"you could deactivate this option in all but the last run."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:564
+#: apt.conf.5.xml:549
msgid "DPkg::TriggersPending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:565
+#: apt.conf.5.xml:550
msgid ""
"Useful for <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -7194,12 +6900,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:570
+#: apt.conf.5.xml:555
msgid "PackageManager::UnpackAll"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:571
+#: apt.conf.5.xml:556
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-"
@@ -7211,12 +6917,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:578
+#: apt.conf.5.xml:563
msgid "OrderList::Score::Immediate"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:586
+#: apt.conf.5.xml:571
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -7228,7 +6934,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:579
+#: apt.conf.5.xml:564
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 "
@@ -7242,12 +6948,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:599
+#: apt.conf.5.xml:584
msgid "Periodic and Archives options"
msgstr "Periodic オプションと Archives オプション"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:600
+#: apt.conf.5.xml:585
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -7261,12 +6967,12 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:608
+#: apt.conf.5.xml:593
msgid "Debug options"
msgstr "デバッグオプション"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:610
+#: apt.conf.5.xml:595
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -7277,7 +6983,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:621
+#: apt.conf.5.xml:606
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -7288,7 +6994,7 @@ msgstr ""
"にします。"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:629
+#: apt.conf.5.xml:614
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -7299,7 +7005,7 @@ msgstr ""
"literal>) を行う場合に使用します。"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:638
+#: apt.conf.5.xml:623
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -7309,66 +7015,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:646
+#: apt.conf.5.xml:631
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:656
+#: apt.conf.5.xml:641
msgid "A full list of debugging options to apt follows."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:646
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:665
+#: apt.conf.5.xml:650
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:672
+#: apt.conf.5.xml:657
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:676
+#: apt.conf.5.xml:661
msgid "Print information related to downloading packages using FTP."
msgstr "FTP を用いたパッケージのダウンロードに関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:683
+#: apt.conf.5.xml:668
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:687
+#: apt.conf.5.xml:672
msgid "Print information related to downloading packages using HTTP."
msgstr "HTTP を用いたパッケージのダウンロードに関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:694
+#: apt.conf.5.xml:679
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:698
+#: apt.conf.5.xml:683
msgid "Print information related to downloading packages using HTTPS."
msgstr "HTTPS を用いたパッケージのダウンロードに関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:690
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:709
+#: apt.conf.5.xml:694
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
@@ -7376,46 +7082,46 @@ msgstr ""
"<literal>gpg</literal> を用いた暗号署名の検証に関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:716
+#: apt.conf.5.xml:701
msgid "<literal>Debug::aptcdrom</literal>"
msgstr "<literal>Debug::aptcdrom</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:720
+#: apt.conf.5.xml:705
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:727
+#: apt.conf.5.xml:712
msgid "<literal>Debug::BuildDeps</literal>"
msgstr "<literal>Debug::BuildDeps</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:730
+#: apt.conf.5.xml:715
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:722
msgid "<literal>Debug::Hashes</literal>"
msgstr "<literal>Debug::Hashes</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:740
+#: apt.conf.5.xml:725
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:747
+#: apt.conf.5.xml:732
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr "<literal>Debug::IdentCDROM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:750
+#: apt.conf.5.xml:735
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 "
@@ -7423,93 +7129,93 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:743
msgid "<literal>Debug::NoLocking</literal>"
msgstr "<literal>Debug::NoLocking</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:761
+#: apt.conf.5.xml:746
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:769
+#: apt.conf.5.xml:754
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr "<literal>Debug::pkgAcquire</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:773
+#: apt.conf.5.xml:758
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:780
+#: apt.conf.5.xml:765
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:783
+#: apt.conf.5.xml:768
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:790
+#: apt.conf.5.xml:775
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:793
+#: apt.conf.5.xml:778
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:801
+#: apt.conf.5.xml:786
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:805
+#: apt.conf.5.xml:790
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:812
+#: apt.conf.5.xml:797
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:816
+#: apt.conf.5.xml:801
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:823
+#: apt.conf.5.xml:808
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr "<literal>Debug::pkgAutoRemove</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:827
+#: apt.conf.5.xml:812
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:834
+#: apt.conf.5.xml:819
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:837
+#: apt.conf.5.xml:822
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -7519,12 +7225,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:848
+#: apt.conf.5.xml:833
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:851
+#: apt.conf.5.xml:836
msgid ""
"Generate debug messages describing which package is marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -7541,91 +7247,91 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:870
+#: apt.conf.5.xml:855
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr "<literal>Debug::pkgInitConfig</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:873
+#: apt.conf.5.xml:858
msgid "Dump the default configuration to standard error on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:880
+#: apt.conf.5.xml:865
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr "<literal>Debug::pkgDPkgPM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:883
+#: apt.conf.5.xml:868
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:891
+#: apt.conf.5.xml:876
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:894
+#: apt.conf.5.xml:879
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:901
+#: apt.conf.5.xml:886
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr "<literal>Debug::pkgOrderList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:905
+#: apt.conf.5.xml:890
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:913
+#: apt.conf.5.xml:898
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr "<literal>Debug::pkgPackageManager</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:917
+#: apt.conf.5.xml:902
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:924
+#: apt.conf.5.xml:909
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr "<literal>Debug::pkgPolicy</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:928
+#: apt.conf.5.xml:913
msgid "Output the priority of each package list on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:934
+#: apt.conf.5.xml:919
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr "<literal>Debug::pkgProblemResolver</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:938
+#: apt.conf.5.xml:923
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:946
+#: apt.conf.5.xml:931
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:949
+#: apt.conf.5.xml:934
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 "
@@ -7633,12 +7339,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:957
+#: apt.conf.5.xml:942
msgid "<literal>Debug::sourceList</literal>"
msgstr "<literal>Debug::sourceList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:961
+#: apt.conf.5.xml:946
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
@@ -7646,7 +7352,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:983
+#: apt.conf.5.xml:968
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -7656,16 +7362,15 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:990
+#: apt.conf.5.xml:975
#, 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:995
+#: apt.conf.5.xml:980
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
@@ -7691,10 +7396,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 "
@@ -8929,7 +8630,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt_preferences.5.xml:617
#, fuzzy
-#| msgid "apt_preferences"
msgid "&file-preferences;"
msgstr "apt_preferences"
@@ -8954,17 +8654,11 @@ msgstr "APT 用パッケージリソースリスト"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:34
-#, fuzzy
-#| msgid ""
-#| "The package resource list is used to locate archives of the package "
-#| "distribution system in use on the system. At this time, this manual page "
-#| "documents only the packaging system used by the Debian GNU/Linux system. "
-#| "This control file is located in <filename>/etc/apt/sources.list</filename>"
msgid ""
"The package resource list is used to locate archives of the package "
"distribution system in use on the system. At this time, this manual page "
"documents only the packaging system used by the Debian GNU/Linux system. "
-"This control file is <filename>/etc/apt/sources.list</filename>."
+"This control file is located in <filename>/etc/apt/sources.list</filename>"
msgstr ""
"このパッケージリソースリストは、システムで使用するパッケージの保管場所を特定"
"するのに使用されます。今回このマニュアルページには、Debian GNU/Linux システム"
@@ -8974,22 +8668,12 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:39
-#, fuzzy
-#| msgid ""
-#| "The source list is designed to support any number of active sources and a "
-#| "variety of source media. The file lists one source per line, with the "
-#| "most preferred source listed first. The format of each line is: "
-#| "<literal>type uri args</literal> The first item, <literal>type</literal> "
-#| "determines the format for <literal>args</literal> <literal>uri</literal> "
-#| "is a Universal Resource Identifier (URI), which is a superset of the more "
-#| "specific and well-known Universal Resource Locator, or URL. The rest of "
-#| "the line can be marked as a comment by using a #."
msgid ""
"The source list is designed to support any number of active sources and a "
"variety of source media. The file lists one source per line, with the most "
"preferred source listed first. The format of each line is: <literal>type uri "
"args</literal> The first item, <literal>type</literal> determines the format "
-"for <literal>args</literal>. <literal>uri</literal> is a Universal Resource "
+"for <literal>args</literal> <literal>uri</literal> is a Universal Resource "
"Identifier (URI), which is a superset of the more specific and well-known "
"Universal Resource Locator, or URL. The rest of the line can be marked as a "
"comment by using a #."
@@ -9034,24 +8718,13 @@ msgstr "deb タイプと deb-src タイプ"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:61
-#, fuzzy
-#| msgid ""
-#| "The <literal>deb</literal> type describes a typical two-level Debian "
-#| "archive, <filename>distribution/component</filename>. Typically, "
-#| "<literal>distribution</literal> is generally one of <literal>stable</"
-#| "literal> <literal>unstable</literal> or <literal>testing</literal> while "
-#| "component is one of <literal>main</literal> <literal>contrib</literal> "
-#| "<literal>non-free</literal> or <literal>non-us</literal> The <literal>deb-"
-#| "src</literal> type describes a debian distribution's source code in the "
-#| "same form as the <literal>deb</literal> type. A <literal>deb-src</"
-#| "literal> line is required to fetch source indexes."
msgid ""
"The <literal>deb</literal> type describes a typical two-level Debian "
"archive, <filename>distribution/component</filename>. Typically, "
"<literal>distribution</literal> is generally one of <literal>stable</"
"literal> <literal>unstable</literal> or <literal>testing</literal> while "
"component is one of <literal>main</literal> <literal>contrib</literal> "
-"<literal>non-free</literal> or <literal>non-us</literal>. The <literal>deb-"
+"<literal>non-free</literal> or <literal>non-us</literal> The <literal>deb-"
"src</literal> type describes a debian distribution's source code in the same "
"form as the <literal>deb</literal> type. A <literal>deb-src</literal> line "
"is required to fetch source indexes."
@@ -9069,13 +8742,9 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:73
-#, fuzzy
-#| msgid ""
-#| "The format for a <filename>sources.list</filename> entry using the "
-#| "<literal>deb</literal> and <literal>deb-src</literal> types are:"
msgid ""
"The format for a <filename>sources.list</filename> entry using the "
-"<literal>deb</literal> and <literal>deb-src</literal> types is:"
+"<literal>deb</literal> and <literal>deb-src</literal> types are:"
msgstr ""
"<literal>deb</literal> タイプと <literal>deb-src</literal> タイプで使用する "
"<filename>sources.list</filename> エントリのフォーマットは、以下のようになり"
@@ -9090,23 +8759,13 @@ msgstr "deb uri distribution [component1] [component2] [...]"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:78
-#, fuzzy
-#| msgid ""
-#| "The URI for the <literal>deb</literal> type must specify the base of the "
-#| "Debian distribution, from which APT will find the information it needs. "
-#| "<literal>distribution</literal> can specify an exact path, in which case "
-#| "the components must be omitted and <literal>distribution</literal> must "
-#| "end with a slash (/). This is useful for when only a particular sub-"
-#| "section of the archive denoted by the URI is of interest. If "
-#| "<literal>distribution</literal> does not specify an exact path, at least "
-#| "one <literal>component</literal> must be present."
msgid ""
"The URI for the <literal>deb</literal> type must specify the base of the "
"Debian distribution, from which APT will find the information it needs. "
"<literal>distribution</literal> can specify an exact path, in which case the "
"components must be omitted and <literal>distribution</literal> must end with "
-"a slash (/). This is useful for when the case only a particular sub-section "
-"of the archive denoted by the URI is of interest. If <literal>distribution</"
+"a slash (/). This is useful for when only a particular sub-section of the "
+"archive denoted by the URI is of interest. If <literal>distribution</"
"literal> does not specify an exact path, at least one <literal>component</"
"literal> must be present."
msgstr ""
@@ -9231,20 +8890,12 @@ msgstr ""
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: sources.list.5.xml:141
-#, fuzzy
-#| msgid ""
-#| "The http scheme specifies an HTTP server for the archive. If an "
-#| "environment variable <envar>http_proxy</envar> is set with the format "
-#| "http://server:port/, the proxy server specified in <envar>http_proxy</"
-#| "envar> will be used. Users of authenticated HTTP/1.1 proxies may use a "
-#| "string of the format http://user:pass@server:port/ Note that this is an "
-#| "insecure method of authentication."
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format http://server:"
"port/, the proxy server specified in <envar>http_proxy</envar> will be used. "
"Users of authenticated HTTP/1.1 proxies may use a string of the format "
-"http://user:pass@server:port/. Note that this is an insecure method of "
+"http://user:pass@server:port/ Note that this is an insecure method of "
"authentication."
msgstr ""
"http スキームはアーカイブとして、HTTP サーバを指定します。環境変数 "
@@ -9316,24 +8967,6 @@ msgstr ""
"準の <command>find</command> コマンドや <command>dd</command> コマンドを使用"
"します。"
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:178
-msgid "more recongnizable URI types"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:180
-msgid ""
-"APT can be extended with more methods shipped in other optional packages "
-"which should follow the nameing scheme <literal>apt-transport-"
-"<replaceable>method</replaceable></literal>. The APT team e.g. maintain "
-"also the <literal>apt-transport-https</literal> package which provides "
-"access methods for https-URIs with features similiar to the http method, but "
-"other methods for using e.g. debtorrent are also available, see "
-"<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></"
-"refentrytitle> <manvolnum>1</manvolnum></citerefentry>."
-msgstr ""
-
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:122
@@ -9346,7 +8979,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:194
+#: sources.list.5.xml:182
msgid ""
"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
"stable/main, stable/contrib, and stable/non-free."
@@ -9355,38 +8988,38 @@ msgstr ""
"free 用のローカル (または NFS) アーカイブを使用します。"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:196
+#: sources.list.5.xml:184
#, no-wrap
msgid "deb file:/home/jason/debian stable main contrib non-free"
msgstr "deb file:/home/jason/debian stable main contrib non-free"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:198
+#: sources.list.5.xml:186
msgid "As above, except this uses the unstable (development) distribution."
msgstr "上記同様ですが、不安定版 (開発版) を使用します。"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:199
+#: sources.list.5.xml:187
#, no-wrap
msgid "deb file:/home/jason/debian unstable main contrib non-free"
msgstr "deb file:/home/jason/debian unstable main contrib non-free"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:201
+#: sources.list.5.xml:189
msgid "Source line for the above"
msgstr "上記のソース行"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:202
+#: sources.list.5.xml:190
#, no-wrap
msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:204
+#: sources.list.5.xml:192
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -9396,14 +9029,14 @@ msgstr ""
# type: <example></example>
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:194
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr "deb http://archive.debian.org/debian-archive hamm main"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:208
+#: sources.list.5.xml:196
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the stable/contrib area."
@@ -9413,25 +9046,19 @@ msgstr ""
# type: <example></example>
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:210
+#: sources.list.5.xml:198
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian stable contrib"
msgstr "deb ftp://ftp.debian.org/debian stable contrib"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:212
-#, fuzzy
-#| msgid ""
-#| "Uses FTP to access the archive at ftp.debian.org, under the debian "
-#| "directory, and uses only the unstable/contrib area. If this line appears "
-#| "as well as the one in the previous example in <filename>sources.list</"
-#| "filename>. a single FTP session will be used for both resource lines."
+#: sources.list.5.xml:200
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
-"well as the one in the previous example in <filename>sources.list</filename> "
-"a single FTP session will be used for both resource lines."
+"well as the one in the previous example in <filename>sources.list</"
+"filename>. a single FTP session will be used for both resource lines."
msgstr ""
"ftp.debian.org のアーカイブに FTP アクセスし、debian ディレクトリ以下の "
"unstable/contrib を使用します。<filename>sources.list</filename> に上記サンプ"
@@ -9440,14 +9067,14 @@ msgstr ""
# type: <example></example>
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:216
+#: sources.list.5.xml:204
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:218
+#: sources.list.5.xml:206
msgid ""
"Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US "
"directory."
@@ -9456,20 +9083,20 @@ msgstr ""
"下を使用します。"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:208
#, no-wrap
msgid "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free"
msgstr "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:229
+#: sources.list.5.xml:217
#, no-wrap
msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
msgstr "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:210
msgid ""
"Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US "
"directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -9488,1156 +9115,10 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:234
+#: sources.list.5.xml:222
msgid "&apt-cache; &apt-conf;"
msgstr "&apt-cache; &apt-conf;"
-#. type: <title></title>
-#: guide.sgml:4
-msgid "APT User's Guide"
-msgstr ""
-
-# type: <author></author>
-#. type: <author></author>
-#: guide.sgml:6 offline.sgml:6
-msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
-msgstr "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
-
-#. type: <version></version>
-#: guide.sgml:7
-msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
-msgstr ""
-
-#. type: <abstract></abstract>
-#: guide.sgml:11
-msgid ""
-"This document provides an overview of how to use the the APT package manager."
-msgstr ""
-
-# type: <copyrightsummary></copyrightsummary>
-#. type: <copyrightsummary></copyrightsummary>
-#: guide.sgml:15
-#, fuzzy
-msgid "Copyright &copy; Jason Gunthorpe, 1998."
-msgstr "Copyright &copy; Jason Gunthorpe, 1999."
-
-#. type: <p></p>
-#: guide.sgml:21 offline.sgml:22
-msgid ""
-"\"APT\" and this document are free software; you can redistribute them and/"
-"or modify them under the terms of the GNU General Public License as "
-"published by the Free Software Foundation; either version 2 of the License, "
-"or (at your option) any later version."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:24 offline.sgml:25
-msgid ""
-"For more details, on Debian GNU/Linux systems, see the file /usr/share/"
-"common-licenses/GPL for the full license."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:32
-#, fuzzy
-msgid "General"
-msgstr "generate"
-
-#. type: <p></p>
-#: guide.sgml:38
-msgid ""
-"The APT package currently contains two sections, the APT <prgn>dselect</"
-"prgn> method and the <prgn>apt-get</prgn> command line user interface. Both "
-"provide a way to install and remove packages as well as download new "
-"packages from the Internet."
-msgstr ""
-
-# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#. type: <heading></heading>
-#: guide.sgml:39
-#, fuzzy
-msgid "Anatomy of the Package System"
-msgstr "パッケージ名"
-
-#. type: <p></p>
-#: guide.sgml:44
-msgid ""
-"The Debian packaging system has a large amount of information associated "
-"with each package to help assure that it integrates cleanly and easily into "
-"the system. The most prominent of its features is the dependency system."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:52
-msgid ""
-"The dependency system allows individual programs to make use of shared "
-"elements in the system such as libraries. It simplifies placing infrequently "
-"used portions of a program in separate packages to reduce the number of "
-"things the average user is required to install. Also, it allows for choices "
-"in mail transport agents, X servers and so on."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:57
-msgid ""
-"The first step to understanding the dependency system is to grasp the "
-"concept of a simple dependency. The meaning of a simple dependency is that a "
-"package requires another package to be installed at the same time to work "
-"properly."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:63
-msgid ""
-"For instance, mailcrypt is an emacs extension that aids in encrypting email "
-"with GPG. Without GPGP installed mail-crypt is useless, so mailcrypt has a "
-"simple dependency on GPG. Also, because it is an emacs extension it has a "
-"simple dependency on emacs, without emacs it is completely useless."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:73
-msgid ""
-"The other important dependency to understand is a conflicting dependency. It "
-"means that a package, when installed with another package, will not work and "
-"may possibly be extremely harmful to the system. As an example consider a "
-"mail transport agent such as sendmail, exim or qmail. It is not possible to "
-"have two mail transport agents installed because both need to listen to the "
-"network to receive mail. Attempting to install two will seriously damage the "
-"system so all mail transport agents have a conflicting dependency with all "
-"other mail transport agents."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:83
-msgid ""
-"As an added complication there is the possibility for a package to pretend "
-"to be another package. Consider that exim and sendmail for many intents are "
-"identical, they both deliver mail and understand a common interface. Hence, "
-"the package system has a way for them to declare that they are both mail-"
-"transport-agents. So, exim and sendmail both declare that they provide a "
-"mail-transport-agent and other packages that need a mail transport agent "
-"depend on mail-transport-agent. This can add a great deal of confusion when "
-"trying to manually fix packages."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:88
-msgid ""
-"At any given time a single dependency may be met by packages that are "
-"already installed or it may not be. APT attempts to help resolve dependency "
-"issues by providing a number of automatic algorithms that help in selecting "
-"packages for installation."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:102
-msgid ""
-"<prgn>apt-get</prgn> provides a simple way to install packages from the "
-"command line. Unlike <prgn>dpkg</prgn>, <prgn>apt-get</prgn> does not "
-"understand .deb files, it works with the package's proper name and can only "
-"install .deb archives from a <em>Source</em>."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:109
-msgid ""
-"The first <footnote><p>If you are using an http proxy server you must set "
-"the http_proxy environment variable first, see sources.list(5)</p></"
-"footnote> thing that should be done before using <prgn>apt-get</prgn> is to "
-"fetch the package lists from the <em>Sources</em> so that it knows what "
-"packages are available. This is done with <tt>apt-get update</tt>. For "
-"instance,"
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:116
-#, no-wrap
-msgid ""
-"# apt-get update\n"
-"Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
-"Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
-"Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
-msgstr ""
-
-#. type: <p><taglist>
-#: guide.sgml:120
-msgid "Once updated there are several commands that can be used:"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:131
-msgid ""
-"Upgrade will attempt to gently upgrade the whole system. Upgrade will never "
-"install a new package or remove an existing package, nor will it ever "
-"upgrade a package that might cause some other package to break. This can be "
-"used daily to relatively safely upgrade the system. Upgrade will list all of "
-"the packages that it could not upgrade, this usually means that they depend "
-"on new packages or conflict with some other package. <prgn>dselect</prgn> or "
-"<tt>apt-get install</tt> can be used to force these packages to install."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:140
-msgid ""
-"Install is used to install packages by name. The package is automatically "
-"fetched and installed. This can be useful if you already know the name of "
-"the package to install and do not want to go into a GUI to select it. Any "
-"number of packages may be passed to install, they will all be fetched. "
-"Install automatically attempts to resolve dependency problems with the "
-"listed packages and will print a summary and ask for confirmation if "
-"anything other than its arguments are changed."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:149
-msgid ""
-"Dist-upgrade is a complete upgrader designed to simplify upgrading between "
-"releases of Debian. It uses a sophisticated algorithm to determine the best "
-"set of packages to install, upgrade and remove to get as much of the system "
-"to the newest release. In some situations it may be desired to use dist-"
-"upgrade rather than spend the time manually resolving dependencies in "
-"<prgn>dselect</prgn>. Once dist-upgrade has completed then <prgn>dselect</"
-"prgn> can be used to install any packages that may have been left out."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:152
-msgid ""
-"It is important to closely look at what dist-upgrade is going to do, its "
-"decisions may sometimes be quite surprising."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:163
-msgid ""
-"<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
-"option is <tt>-d</tt> which does not install the fetched files. If the "
-"system has to download a large number of package it would be undesired to "
-"start installing them in case something goes wrong. When <tt>-d</tt> is used "
-"the downloaded archives can be installed by simply running the command that "
-"caused them to be downloaded again without <tt>-d</tt>."
-msgstr ""
-
-# type: Content of: <refentry><refsect1><title>
-#. type: <heading></heading>
-#: guide.sgml:168
-msgid "DSelect"
-msgstr "DSelect"
-
-#. type: <p></p>
-#: guide.sgml:173
-msgid ""
-"The APT <prgn>dselect</prgn> method provides the complete APT system with "
-"the <prgn>dselect</prgn> package selection GUI. <prgn>dselect</prgn> is used "
-"to select the packages to be installed or removed and APT actually installs "
-"them."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:184
-msgid ""
-"To enable the APT method you need to to select [A]ccess in <prgn>dselect</"
-"prgn> and then choose the APT method. You will be prompted for a set of "
-"<em>Sources</em> which are places to fetch archives from. These can be "
-"remote Internet sites, local Debian mirrors or CDROMs. Each source can "
-"provide a fragment of the total Debian archive, APT will automatically "
-"combine them to form a complete set of packages. If you have a CDROM then it "
-"is a good idea to specify it first and then specify a mirror so that you "
-"have access to the latest bug fixes. APT will automatically use packages on "
-"your CDROM before downloading from the Internet."
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:198
-#, no-wrap
-msgid ""
-" Set up a list of distribution source locations\n"
-"\t \n"
-" Please give the base URL of the debian distribution.\n"
-" The access schemes I know about are: http file\n"
-"\t \n"
-" For example:\n"
-" file:/mnt/debian,\n"
-" ftp://ftp.debian.org/debian,\n"
-" http://ftp.de.debian.org/debian,\n"
-" \n"
-" \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:205
-msgid ""
-"The <em>Sources</em> setup starts by asking for the base of the Debian "
-"archive, defaulting to a HTTP mirror. Next it asks for the distribution to "
-"get."
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:212
-#, no-wrap
-msgid ""
-" Please give the distribution tag to get or a path to the\n"
-" package file ending in a /. The distribution\n"
-" tags are typically something like: stable unstable testing non-US\n"
-" \n"
-" Distribution [stable]:"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:222
-msgid ""
-"The distribution refers to the Debian version in the archive, <em>stable</"
-"em> refers to the latest released version and <em>unstable</em> refers to "
-"the developmental version. <em>non-US</em> is only available on some mirrors "
-"and refers to packages that contain encryption technology or other things "
-"that cannot be exported from the United States. Importing these packages "
-"into the US is legal however."
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:228
-#, no-wrap
-msgid ""
-" Please give the components to get\n"
-" The components are typically something like: main contrib non-free\n"
-" \n"
-" Components [main contrib non-free]:"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:236
-msgid ""
-"The components list refers to the list of sub distributions to fetch. The "
-"distribution is split up based on software licenses, main being DFSG free "
-"packages while contrib and non-free contain things that have various "
-"restrictions placed on their use and distribution."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:240
-msgid ""
-"Any number of sources can be added, the setup script will continue to prompt "
-"until you have specified all that you want."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:247
-msgid ""
-"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a super-set of "
-"<tt>apt-get update</tt> that makes the fetched information available to "
-"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
-"tt> has been run before."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:253
-msgid ""
-"You can then go on and make your selections using [S]elect and then perform "
-"the installation using [I]nstall. When using the APT method the [C]onfig and "
-"[R]emove commands have no meaning, the [I]nstall command performs both of "
-"them together."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:258
-msgid ""
-"By default APT will automatically remove the package (.deb) files once they "
-"have been successfully installed. To change this behavior place <tt>Dselect::"
-"clean \"prompt\";</tt> in /etc/apt/apt.conf."
-msgstr ""
-
-# type: <tag></tag>
-#. type: <heading></heading>
-#: guide.sgml:264
-#, fuzzy
-msgid "The Interface"
-msgstr "メソッドインスタンス"
-
-#. type: <p></p>
-#: guide.sgml:278
-msgid ""
-"Both that APT <prgn>dselect</prgn> method and <prgn>apt-get</prgn> share the "
-"same interface. It is a simple system that generally tells you what it will "
-"do and then goes and does it. <footnote><p>The <prgn>dselect</prgn> method "
-"actually is a set of wrapper scripts to <prgn>apt-get</prgn>. The method "
-"actually provides more functionality than is present in <prgn>apt-get</prgn> "
-"alone.</p></footnote> After printing out a summary of what will happen APT "
-"then will print out some informative status messages so that you can "
-"estimate how far along it is and how much is left to do."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:280
-msgid "Startup"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:284
-msgid ""
-"Before all operations except update, APT performs a number of actions to "
-"prepare its internal state. It also does some checks of the system's state. "
-"At any time these operations can be performed by running <tt>apt-get check</"
-"tt>."
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:289
-#, no-wrap
-msgid ""
-"# apt-get check\n"
-"Reading Package Lists... Done\n"
-"Building Dependency Tree... Done"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:297
-msgid ""
-"The first thing it does is read all the package files into memory. APT uses "
-"a caching scheme so this operation will be faster the second time it is run. "
-"If some of the package files are not found then they will be ignored and a "
-"warning will be printed when apt-get exits."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:303
-msgid ""
-"The final operation performs a detailed analysis of the system's "
-"dependencies. It checks every dependency of every installed or unpacked "
-"package and considers if it is OK. Should this find a problem then a report "
-"will be printed out and <prgn>apt-get</prgn> will refuse to run."
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:320
-#, no-wrap
-msgid ""
-"# apt-get check\n"
-"Reading Package Lists... Done\n"
-"Building Dependency Tree... Done\n"
-"You might want to run apt-get -f install' to correct these.\n"
-"Sorry, but the following packages have unmet dependencies:\n"
-" 9fonts: Depends: xlib6g but it is not installed\n"
-" uucp: Depends: mailx but it is not installed\n"
-" blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n"
-" adduser: Depends: perl-base but it is not installed\n"
-" aumix: Depends: libgpmg1 but it is not installed\n"
-" debiandoc-sgml: Depends: sgml-base but it is not installed\n"
-" bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
-" cthugha: Depends: svgalibg1 but it is not installed\n"
-" Depends: xlib6g (>= 3.3-5) but it is not installed\n"
-" libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:329
-msgid ""
-"In this example the system has many problems, including a serious problem "
-"with libreadlineg2. For each package that has unmet dependencies a line is "
-"printed out indicating the package with the problem and the dependencies "
-"that are unmet. A short explanation of why the package has a dependency "
-"problem is also included."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:337
-msgid ""
-"There are two ways a system can get into a broken state like this. The first "
-"is caused by <prgn>dpkg</prgn> missing some subtle relationships between "
-"packages when performing upgrades. <footnote><p>APT however considers all "
-"known dependencies and attempts to prevent broken packages</p></footnote>. "
-"The second is if a package installation fails during an operation. In this "
-"situation a package may have been unpacked without its dependents being "
-"installed."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:345
-msgid ""
-"The second situation is much less serious than the first because APT places "
-"certain constraints on the order that packages are installed. In both cases "
-"supplying the <tt>-f</tt> option to <prgn>apt-get</prgn> will cause APT to "
-"deduce a possible solution to the problem and then continue on. The APT "
-"<prgn>dselect</prgn> method always supplies the <tt>-f</tt> option to allow "
-"for easy continuation of failed maintainer scripts."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:351
-msgid ""
-"However, if the <tt>-f</tt> option is used to correct a seriously broken "
-"system caused by the first case then it is possible that it will either fail "
-"immediately or the installation sequence will fail. In either case it is "
-"necessary to manually use dpkg (possibly with forcing options) to correct "
-"the situation enough to allow APT to proceed."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:356
-msgid "The Status Report"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:363
-msgid ""
-"Before proceeding <prgn>apt-get</prgn> will present a report on what will "
-"happen. Generally the report reflects the type of operation being performed "
-"but there are several common elements. In all cases the lists reflect the "
-"final state of things, taking into account the <tt>-f</tt> option and any "
-"other relevant activities to the command being executed."
-msgstr ""
-
-# type: <tag></tag>
-#. type: <heading></heading>
-#: guide.sgml:364
-#, fuzzy
-msgid "The Extra Package list"
-msgstr "NextPackage"
-
-#. type: <example></example>
-#: guide.sgml:372
-#, no-wrap
-msgid ""
-"The following extra packages will be installed:\n"
-" libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n"
-" mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
-" bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
-" squake pgp-i python-base debmake ldso perl libreadlineg2\n"
-" ssh"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:379
-msgid ""
-"The Extra Package list shows all of the packages that will be installed or "
-"upgraded in excess of the ones mentioned on the command line. It is only "
-"generated for an <tt>install</tt> command. The listed packages are often the "
-"result of an Auto Install."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:382
-msgid "The Packages to Remove"
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:389
-#, no-wrap
-msgid ""
-"The following packages will be REMOVED:\n"
-" xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
-" xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
-" xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
-" nas xpilot xfig"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:399
-msgid ""
-"The Packages to Remove list shows all of the packages that will be removed "
-"from the system. It can be shown for any of the operations and should be "
-"given a careful inspection to ensure nothing important is to be taken off. "
-"The <tt>-f</tt> option is especially good at generating packages to remove "
-"so extreme care should be used in that case. The list may contain packages "
-"that are going to be removed because they are only partially installed, "
-"possibly due to an aborted installation."
-msgstr ""
-
-# type: <tag></tag>
-#. type: <heading></heading>
-#: guide.sgml:402
-#, fuzzy
-msgid "The New Packages list"
-msgstr "NextPackage"
-
-#. type: <example></example>
-#: guide.sgml:406
-#, no-wrap
-msgid ""
-"The following NEW packages will installed:\n"
-" zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:411
-msgid ""
-"The New Packages list is simply a reminder of what will happen. The packages "
-"listed are not presently installed in the system but will be when APT is "
-"done."
-msgstr ""
-
-# type: <tag></tag>
-#. type: <heading></heading>
-#: guide.sgml:414
-#, fuzzy
-msgid "The Kept Back list"
-msgstr "NextPackage"
-
-#. type: <example></example>
-#: guide.sgml:419
-#, no-wrap
-msgid ""
-"The following packages have been kept back\n"
-" compface man-db tetex-base msql libpaper svgalib1\n"
-" gs snmp arena lynx xpat2 groff xscreensaver"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:428
-msgid ""
-"Whenever the whole system is being upgraded there is the possibility that "
-"new versions of packages cannot be installed because they require new things "
-"or conflict with already installed things. In this case the package will "
-"appear in the Kept Back list. The best way to convince packages listed there "
-"to install is with <tt>apt-get install</tt> or by using <prgn>dselect</prgn> "
-"to resolve their problems."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:431
-msgid "Held Packages warning"
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:435
-#, no-wrap
-msgid ""
-"The following held packages will be changed:\n"
-" cvs"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:441
-msgid ""
-"Sometimes you can ask APT to install a package that is on hold, in such a "
-"case it prints out a warning that the held package is going to be changed. "
-"This should only happen during dist-upgrade or install."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:444
-msgid "Final summary"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:447
-msgid ""
-"Finally, APT will print out a summary of all the changes that will occur."
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:452
-#, no-wrap
-msgid ""
-"206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.\n"
-"12 packages not fully installed or removed.\n"
-"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:470
-msgid ""
-"The first line of the summary simply is a reduced version of all of the "
-"lists and includes the number of upgrades - that is packages already "
-"installed that have new versions available. The second line indicates the "
-"number of poorly configured packages, possibly the result of an aborted "
-"installation. The final line shows the space requirements that the "
-"installation needs. The first pair of numbers refer to the size of the "
-"archive files. The first number indicates the number of bytes that must be "
-"fetched from remote locations and the second indicates the total size of all "
-"the archives required. The next number indicates the size difference between "
-"the presently installed packages and the newly installed packages. It is "
-"roughly equivalent to the space required in /usr after everything is done. "
-"If a large number of packages are being removed then the value may indicate "
-"the amount of space that will be freed."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:473
-msgid ""
-"Some other reports can be generated by using the -u option to show packages "
-"to upgrade, they are similar to the previous examples."
-msgstr ""
-
-#. type: <heading></heading>
-#: guide.sgml:477
-msgid "The Status Display"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:481
-msgid ""
-"During the download of archives and package files APT prints out a series of "
-"status messages."
-msgstr ""
-
-#. type: <example></example>
-#: guide.sgml:490
-#, no-wrap
-msgid ""
-"# apt-get update\n"
-"Get:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"
-"Get:2 http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
-"Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
-"Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
-"Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
-"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:500
-msgid ""
-"The lines starting with <em>Get</em> are printed out when APT begins to "
-"fetch a file while the last line indicates the progress of the download. The "
-"first percent value on the progress line indicates the total percent done of "
-"all files. Unfortunately since the size of the Package files is unknown "
-"<tt>apt-get update</tt> estimates the percent done which causes some "
-"inaccuracies."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:509
-msgid ""
-"The next section of the status line is repeated once for each download "
-"thread and indicates the operation being performed and some useful "
-"information about what is happening. Sometimes this section will simply read "
-"<em>Forking</em> which means the OS is loading the download module. The "
-"first word after the [ is the fetch number as shown on the history lines. "
-"The next word is the short form name of the object being downloaded. For "
-"archives it will contain the name of the package that is being fetched."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:524
-msgid ""
-"Inside of the single quote is an informative string indicating the progress "
-"of the negotiation phase of the download. Typically it progresses from "
-"<em>Connecting</em> to <em>Waiting for file</em> to <em>Downloading</em> or "
-"<em>Resuming</em>. The final value is the number of bytes downloaded from "
-"the remote site. Once the download begins this is represented as "
-"<tt>102/10.2k</tt> indicating that 102 bytes have been fetched and 10.2 "
-"kilobytes is expected. The total size is always shown in 4 figure notation "
-"to preserve space. After the size display is a percent meter for the file "
-"itself. The second last element is the instantaneous average speed. This "
-"values is updated every 5 seconds and reflects the rate of data transfer for "
-"that period. Finally is shown the estimated transfer time. This is updated "
-"regularly and reflects the time to complete everything at the shown transfer "
-"rate."
-msgstr ""
-
-#. type: <p></p>
-#: guide.sgml:530
-msgid ""
-"The status display updates every half second to provide a constant feedback "
-"on the download progress while the Get lines scroll back whenever a new file "
-"is started. Since the status display is constantly updated it is unsuitable "
-"for logging to a file, use the <tt>-q</tt> option to remove the status "
-"display."
-msgstr ""
-
-# type: <heading></heading>
-#. type: <heading></heading>
-#: guide.sgml:535
-msgid "Dpkg"
-msgstr "Dpkg"
-
-#. type: <p></p>
-#: guide.sgml:542
-msgid ""
-"APT uses <prgn>dpkg</prgn> for installing the archives and will switch over "
-"to the <prgn>dpkg</prgn> interface once downloading is completed. "
-"<prgn>dpkg</prgn> will also ask a number of questions as it processes the "
-"packages and the packages themselves may also ask several questions. Before "
-"each question there is usually a description of what it is asking and the "
-"questions are too varied to discuss completely here."
-msgstr ""
-
-# type: <title></title>
-#. type: <title></title>
-#: offline.sgml:4
-msgid "Using APT Offline"
-msgstr "オフラインでの APT の使用法"
-
-#. type: <version></version>
-#: offline.sgml:7
-msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-msgstr ""
-
-# type: <abstract></abstract>
-#. type: <abstract></abstract>
-#: offline.sgml:12
-msgid ""
-"This document describes how to use APT in a non-networked environment, "
-"specifically a 'sneaker-net' approach for performing upgrades."
-msgstr ""
-"このドキュメントはネットワークがない環境での APT の使用方法を説明しています。"
-"具体的には、アップグレード時に「スニーカーネット」アプローチです。"
-
-# type: <copyrightsummary></copyrightsummary>
-#. type: <copyrightsummary></copyrightsummary>
-#: offline.sgml:16
-msgid "Copyright &copy; Jason Gunthorpe, 1999."
-msgstr "Copyright &copy; Jason Gunthorpe, 1999."
-
-# type: Content of: <refentry><refsect1><title>
-#. type: <heading></heading>
-#: offline.sgml:32
-msgid "Introduction"
-msgstr "はじめに"
-
-#. type: <heading></heading>
-#: offline.sgml:34 offline.sgml:65 offline.sgml:180
-#, fuzzy
-msgid "Overview"
-msgstr "OverrideDir"
-
-#. type: <p></p>
-#: offline.sgml:40
-msgid ""
-"Normally APT requires direct access to a Debian archive, either from a local "
-"media or through a network. Another common complaint is that a Debian "
-"machine is on a slow link, such as a modem and another machine has a very "
-"fast connection but they are physically distant."
-msgstr ""
-
-#. type: <p></p>
-#: offline.sgml:51
-msgid ""
-"The solution to this is to use large removable media such as a Zip disc or a "
-"SuperDisk disc. These discs are not large enough to store the entire Debian "
-"archive but can easily fit a subset large enough for most users. The idea is "
-"to use APT to generate a list of packages that are required and then fetch "
-"them onto the disc using another machine with good connectivity. It is even "
-"possible to use another Debian machine with APT or to use a completely "
-"different OS and a download tool like wget. Let <em>remote host</em> mean "
-"the machine downloading the packages, and <em>target host</em> the one with "
-"bad or no connection."
-msgstr ""
-
-#. type: <p></p>
-#: offline.sgml:57
-msgid ""
-"This is achieved by creatively manipulating the APT configuration file. The "
-"essential premis to tell APT to look on a disc for it's archive files. Note "
-"that the disc should be formated with a filesystem that can handle long file "
-"names such as ext2, fat32 or vfat."
-msgstr ""
-
-# type: <title></title>
-#. type: <heading></heading>
-#: offline.sgml:63
-#, fuzzy
-msgid "Using APT on both machines"
-msgstr "オフラインでの APT の使用法"
-
-#. type: <p><example>
-#: offline.sgml:71
-msgid ""
-"APT being available on both machines gives the simplest configuration. The "
-"basic idea is to place a copy of the status file on the disc and use the "
-"remote machine to fetch the latest package files and decide which packages "
-"to download. The disk directory structure should look like:"
-msgstr ""
-
-# type: <example></example>
-#. type: <example></example>
-#: offline.sgml:80
-#, no-wrap
-msgid ""
-" /disc/\n"
-" archives/\n"
-" partial/\n"
-" lists/\n"
-" partial/\n"
-" status\n"
-" sources.list\n"
-" apt.conf"
-msgstr ""
-" /disc/\n"
-" archives/\n"
-" partial/\n"
-" lists/\n"
-" partial/\n"
-" status\n"
-" sources.list\n"
-" apt.conf"
-
-# type: Content of: <refentry><refsect1><title>
-#. type: <heading></heading>
-#: offline.sgml:88
-#, fuzzy
-msgid "The configuration file"
-msgstr "ユーザの設定"
-
-#. type: <p></p>
-#: offline.sgml:96
-msgid ""
-"The configuration file should tell APT to store its files on the disc and to "
-"use the configuration files on the disc as well. The sources.list should "
-"contain the proper sites that you wish to use from the remote machine, and "
-"the status file should be a copy of <em>/var/lib/dpkg/status</em> from the "
-"<em>target host</em>. Please note, if you are using a local archive you must "
-"use copy URIs, the syntax is identical to file URIs."
-msgstr ""
-
-#. type: <p><example>
-#: offline.sgml:100
-msgid ""
-"<em>apt.conf</em> must contain the necessary information to make APT use the "
-"disc:"
-msgstr ""
-
-# type: <example></example>
-#. type: <example></example>
-#: offline.sgml:124
-#, fuzzy, no-wrap
-msgid ""
-" APT\n"
-" {\n"
-" /* This is not necessary if the two machines are the same arch, it tells\n"
-" the remote APT what architecture the target machine is */\n"
-" Architecture \"i386\";\n"
-" \n"
-" Get::Download-Only \"true\";\n"
-" };\n"
-" \n"
-" Dir\n"
-" {\n"
-" /* Use the disc for state information and redirect the status file from\n"
-" the /var/lib/dpkg default */\n"
-" State \"/disc/\";\n"
-" State::status \"status\";\n"
-"\n"
-" // Binary caches will be stored locally\n"
-" Cache::archives \"/disc/archives/\";\n"
-" Cache \"/tmp/\";\n"
-" \n"
-" // Location of the source list.\n"
-" Etc \"/disc/\";\n"
-" };"
-msgstr ""
-" APT\n"
-" {\n"
-" /* This is not necessary if the two machines are the same arch, it tells\n"
-" the remote APT what architecture the Debian machine is */\n"
-" Architecture \"i386\";\n"
-" \n"
-" Get::Download-Only \"true\";\n"
-" };\n"
-" \n"
-" Dir\n"
-" {\n"
-" /* Use the disc for state information and redirect the status file from\n"
-" the /var/lib/dpkg default */\n"
-" State \"/disc/\";\n"
-" State::status \"status\";\n"
-"\n"
-" // Binary caches will be stored locally\n"
-" Cache::archives \"/disc/archives/\";\n"
-" Cache \"/tmp/\";\n"
-" \n"
-" // Location of the source list.\n"
-" Etc \"/disc/\";\n"
-" };"
-
-#. type: </example></p>
-#: offline.sgml:129
-msgid ""
-"More details can be seen by examining the apt.conf man page and the sample "
-"configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>."
-msgstr ""
-
-#. type: <p><example>
-#: offline.sgml:136
-msgid ""
-"On the target machine the first thing to do is mount the disc and copy <em>/"
-"var/lib/dpkg/status</em> to it. You will also need to create the directories "
-"outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
-"em> Then take the disc to the remote machine and configure the sources.list. "
-"On the remote machine execute the following:"
-msgstr ""
-
-# type: <example></example>
-#. type: <example></example>
-#: offline.sgml:142
-#, fuzzy, no-wrap
-msgid ""
-" # export APT_CONFIG=\"/disc/apt.conf\"\n"
-" # apt-get update\n"
-" [ APT fetches the package files ]\n"
-" # apt-get dist-upgrade\n"
-" [ APT fetches all the packages needed to upgrade the target machine ]"
-msgstr ""
-" # export APT_CONFIG=\"/disc/apt.conf\"\n"
-" # apt-get update\n"
-" [ パッケージファイルを取得します ]\n"
-" # apt-get dist-upgrade\n"
-" [ アップグレードが必要な全パッケージを取得します ]"
-
-#. type: </example></p>
-#: offline.sgml:149
-msgid ""
-"The dist-upgrade command can be replaced with any-other standard APT "
-"commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em> However this presents a problem in communicating "
-"your selections back to the local computer."
-msgstr ""
-
-#. type: <p><example>
-#: offline.sgml:153
-msgid ""
-"Now the disc contains all of the index files and archives needed to upgrade "
-"the target machine. Take the disc back and run:"
-msgstr ""
-
-# type: <example></example>
-#. type: <example></example>
-#: offline.sgml:159
-#, fuzzy, no-wrap
-msgid ""
-" # export APT_CONFIG=\"/disc/apt.conf\"\n"
-" # apt-get check\n"
-" [ APT generates a local copy of the cache files ]\n"
-" # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
-" [ Or any other APT command ]"
-msgstr ""
-" # export APT_CONFIG=\"/disc/apt.conf\"\n"
-" # apt-get update\n"
-" [ パッケージファイルを取得します ]\n"
-" # apt-get dist-upgrade\n"
-" [ アップグレードが必要な全パッケージを取得します ]"
-
-#. type: <p></p>
-#: offline.sgml:165
-msgid ""
-"It is necessary for proper function to re-specify the status file to be the "
-"local one. This is very important!"
-msgstr ""
-
-#. type: <p></p>
-#: offline.sgml:172
-msgid ""
-"If you are using dselect you can do the very risky operation of copying disc/"
-"status to /var/lib/dpkg/status so that any selections you made on the remote "
-"machine are updated. I highly recommend that people only make selections on "
-"the local machine - but this may not always be possible. DO NOT copy the "
-"status file if dpkg or APT have been run in the mean time!!"
-msgstr ""
-
-# type: <title></title>
-#. type: <heading></heading>
-#: offline.sgml:178
-#, fuzzy
-msgid "Using APT and wget"
-msgstr "オフラインでの APT の使用法"
-
-#. type: <p></p>
-#: offline.sgml:185
-msgid ""
-"<em>wget</em> is a popular and portable download tool that can run on nearly "
-"any machine. Unlike the method above this requires that the Debian machine "
-"already has a list of available packages."
-msgstr ""
-
-#. type: <p></p>
-#: offline.sgml:190
-msgid ""
-"The basic idea is to create a disc that has only the archive files "
-"downloaded from the remote site. This is done by using the --print-uris "
-"option to apt-get and then preparing a wget script to actually fetch the "
-"packages."
-msgstr ""
-
-# type: Content of: <refentry><refsect1><title>
-#. type: <heading></heading>
-#: offline.sgml:196
-#, fuzzy
-msgid "Operation"
-msgstr "オプション"
-
-#. type: <p><example>
-#: offline.sgml:200
-msgid ""
-"Unlike the previous technique no special configuration files are required. "
-"We merely use the standard APT commands to generate the file list."
-msgstr ""
-
-#. type: <example></example>
-#: offline.sgml:205
-#, no-wrap
-msgid ""
-" # apt-get dist-upgrade \n"
-" [ Press no when prompted, make sure you are happy with the actions ]\n"
-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
-msgstr ""
-
-#. type: </example></p>
-#: offline.sgml:210
-msgid ""
-"Any command other than dist-upgrade could be used here, including dselect-"
-"upgrade."
-msgstr ""
-
-#. type: <p></p>
-#: offline.sgml:216
-msgid ""
-"The /disc/wget-script file will now contain a list of wget commands to "
-"execute in order to fetch the necessary archives. This script should be run "
-"with the current directory as the disc's mount point so as to save the "
-"output on the disc."
-msgstr ""
-
-#. type: <p><example>
-#: offline.sgml:219
-msgid "The remote machine would do something like"
-msgstr ""
-
-#. type: <example></example>
-#: offline.sgml:223
-#, no-wrap
-msgid ""
-" # cd /disc\n"
-" # sh -x ./wget-script\n"
-" [ wait.. ]"
-msgstr ""
-
-#. type: </example><example>
-#: offline.sgml:228
-msgid ""
-"Once the archives are downloaded and the disc returned to the Debian machine "
-"installation can proceed using,"
-msgstr ""
-
-#. type: <example></example>
-#: offline.sgml:230
-#, no-wrap
-msgid " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
-msgstr ""
-
-#. type: </example></p>
-#: offline.sgml:234
-msgid "Which will use the already fetched archives on the disc."
-msgstr ""
-
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#~ msgid ""
-#~ "Disable Immediate Configuration; This dangerous option disables some of "
-#~ "APT's ordering code to cause it to make fewer dpkg calls. Doing so may be "
-#~ "necessary on some extremely slow single user systems but is very "
-#~ "dangerous and may cause package install scripts to fail or worse. Use at "
-#~ "your own risk."
-#~ msgstr ""
-#~ "即時設定無効 - この危険なオプションは、APT の要求コードを無効にして dpkg "
-#~ "の呼び出しをほとんどしないようにします。これは、非常に遅いシングルユーザシ"
-#~ "ステムでは必要かもしれませんが、非常に危険で、パッケージのインストールスク"
-#~ "リプトが失敗したり、もしくはもっと悪いことがおきるかもしれません。自己責任"
-#~ "で使用してください。"
-
# type: Content of: <refentry><refnamediv><refname>
#, fuzzy
#~ msgid "NoConfigure"
@@ -10699,10 +9180,18 @@ msgstr ""
#~ msgid "<filename>&cachedir;/archives/partial/</filename>"
#~ msgstr "<filename>&cachedir;/archives/partial/</filename>"
+# type: <author></author>
+#~ msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
+#~ msgstr "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
+
# type: <copyrightsummary></copyrightsummary>
#~ msgid "Copyright &copy; Jason Gunthorpe, 1997-1998."
#~ msgstr "Copyright &copy; Jason Gunthorpe, 1997-1998."
+# type: Content of: <refentry><refsect1><title>
+#~ msgid "Introduction"
+#~ msgstr "はじめに"
+
# type: Content of: <refentry><refnamediv><refpurpose>
#, fuzzy
#~ msgid "Note on Pointer access"
@@ -11288,6 +9777,10 @@ msgstr ""
#~ msgstr "Copyright &copy; Jason Gunthorpe, 1997-1998."
#, fuzzy
+#~ msgid "General"
+#~ msgstr "generate"
+
+#, fuzzy
#~ msgid ""
#~ "deb <var>uri</var> <var>distribution</var> <var>component</var> "
#~ "[<var>component</var> ...]"
@@ -11370,6 +9863,34 @@ msgstr ""
#~ msgid "The Release File"
#~ msgstr "ソースオーバーライドファイル"
+# type: <copyrightsummary></copyrightsummary>
+#, fuzzy
+#~ msgid "Copyright &copy; Jason Gunthorpe, 1998."
+#~ msgstr "Copyright &copy; Jason Gunthorpe, 1999."
+
+# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
+#, fuzzy
+#~ msgid "Anatomy of the Package System"
+#~ msgstr "パッケージ名"
+
+# type: Content of: <refentry><refsect1><title>
+#~ msgid "DSelect"
+#~ msgstr "DSelect"
+
+# type: <tag></tag>
+#, fuzzy
+#~ msgid "The Extra Package list"
+#~ msgstr "NextPackage"
+
+# type: <heading></heading>
+#~ msgid "Dpkg"
+#~ msgstr "Dpkg"
+
+# type: <tag></tag>
+#, fuzzy
+#~ msgid "APT Method Interface"
+#~ msgstr "メソッドインスタンス"
+
# type: Content of: <refentry><refsect1><title>
#~ msgid "Global configuration"
#~ msgstr "共通設定"
@@ -11400,6 +9921,10 @@ msgstr ""
#~ msgid "Specification"
#~ msgstr "仕様"
+#, fuzzy
+#~ msgid "Overview"
+#~ msgstr "OverrideDir"
+
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#, fuzzy
#~ msgid "601 Configuration - Sends the configuration space"
@@ -11462,5 +9987,147 @@ msgstr ""
#~ msgid "Notes"
#~ msgstr "contents"
+# type: <title></title>
+#~ msgid "Using APT Offline"
+#~ msgstr "オフラインでの APT の使用法"
+
+# type: <abstract></abstract>
+#~ msgid ""
+#~ "This document describes how to use APT in a non-networked environment, "
+#~ "specifically a 'sneaker-net' approach for performing upgrades."
+#~ msgstr ""
+#~ "このドキュメントはネットワークがない環境での APT の使用方法を説明していま"
+#~ "す。具体的には、アップグレード時に「スニーカーネット」アプローチです。"
+
+# type: <copyrightsummary></copyrightsummary>
+#~ msgid "Copyright &copy; Jason Gunthorpe, 1999."
+#~ msgstr "Copyright &copy; Jason Gunthorpe, 1999."
+
+# type: <title></title>
+#, fuzzy
+#~ msgid "Using APT on both machines"
+#~ msgstr "オフラインでの APT の使用法"
+
+# type: <example></example>
+#~ msgid ""
+#~ " /disc/\n"
+#~ " archives/\n"
+#~ " partial/\n"
+#~ " lists/\n"
+#~ " partial/\n"
+#~ " status\n"
+#~ " sources.list\n"
+#~ " apt.conf"
+#~ msgstr ""
+#~ " /disc/\n"
+#~ " archives/\n"
+#~ " partial/\n"
+#~ " lists/\n"
+#~ " partial/\n"
+#~ " status\n"
+#~ " sources.list\n"
+#~ " apt.conf"
+
+# type: Content of: <refentry><refsect1><title>
+#, fuzzy
+#~ msgid "The configuration file"
+#~ msgstr "ユーザの設定"
+
+# type: <example></example>
+#, fuzzy
+#~ msgid ""
+#~ " APT\n"
+#~ " {\n"
+#~ " /* This is not necessary if the two machines are the same arch, it "
+#~ "tells\n"
+#~ " the remote APT what architecture the target machine is */\n"
+#~ " Architecture \"i386\";\n"
+#~ " \n"
+#~ " Get::Download-Only \"true\";\n"
+#~ " };\n"
+#~ " \n"
+#~ " Dir\n"
+#~ " {\n"
+#~ " /* Use the disc for state information and redirect the status file "
+#~ "from\n"
+#~ " the /var/lib/dpkg default */\n"
+#~ " State \"/disc/\";\n"
+#~ " State::status \"status\";\n"
+#~ "\n"
+#~ " // Binary caches will be stored locally\n"
+#~ " Cache::archives \"/disc/archives/\";\n"
+#~ " Cache \"/tmp/\";\n"
+#~ " \n"
+#~ " // Location of the source list.\n"
+#~ " Etc \"/disc/\";\n"
+#~ " };"
+#~ msgstr ""
+#~ " APT\n"
+#~ " {\n"
+#~ " /* This is not necessary if the two machines are the same arch, it "
+#~ "tells\n"
+#~ " the remote APT what architecture the Debian machine is */\n"
+#~ " Architecture \"i386\";\n"
+#~ " \n"
+#~ " Get::Download-Only \"true\";\n"
+#~ " };\n"
+#~ " \n"
+#~ " Dir\n"
+#~ " {\n"
+#~ " /* Use the disc for state information and redirect the status file "
+#~ "from\n"
+#~ " the /var/lib/dpkg default */\n"
+#~ " State \"/disc/\";\n"
+#~ " State::status \"status\";\n"
+#~ "\n"
+#~ " // Binary caches will be stored locally\n"
+#~ " Cache::archives \"/disc/archives/\";\n"
+#~ " Cache \"/tmp/\";\n"
+#~ " \n"
+#~ " // Location of the source list.\n"
+#~ " Etc \"/disc/\";\n"
+#~ " };"
+
+# type: <example></example>
+#, fuzzy
+#~ msgid ""
+#~ " # export APT_CONFIG=\"/disc/apt.conf\"\n"
+#~ " # apt-get update\n"
+#~ " [ APT fetches the package files ]\n"
+#~ " # apt-get dist-upgrade\n"
+#~ " [ APT fetches all the packages needed to upgrade the target machine ]"
+#~ msgstr ""
+#~ " # export APT_CONFIG=\"/disc/apt.conf\"\n"
+#~ " # apt-get update\n"
+#~ " [ パッケージファイルを取得します ]\n"
+#~ " # apt-get dist-upgrade\n"
+#~ " [ アップグレードが必要な全パッケージを取得します ]"
+
+# type: <example></example>
+#, fuzzy
+#~ msgid ""
+#~ " # export APT_CONFIG=\"/disc/apt.conf\"\n"
+#~ " # apt-get check\n"
+#~ " [ APT generates a local copy of the cache files ]\n"
+#~ " # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-"
+#~ "upgrade\n"
+#~ " [ Or any other APT command ]"
+#~ msgstr ""
+#~ " # export APT_CONFIG=\"/disc/apt.conf\"\n"
+#~ " # apt-get update\n"
+#~ " [ パッケージファイルを取得します ]\n"
+#~ " # apt-get dist-upgrade\n"
+#~ " [ アップグレードが必要な全パッケージを取得します ]"
+
+# type: <title></title>
+#, fuzzy
+#~ msgid "Using APT and wget"
+#~ msgstr "オフラインでの APT の使用法"
+
+# type: Content of: <refentry><refsect1><title>
+#, fuzzy
+#~ msgid "Operation"
+#~ msgstr "オプション"
+
#~ msgid "<literal>Debug::Vendor</literal>"
#~ msgstr "<literal>Debug::Vendor</literal>"
diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc
index 3b1e80631..d0dea7768 100644
--- a/ftparchive/apt-ftparchive.cc
+++ b/ftparchive/apt-ftparchive.cc
@@ -898,6 +898,7 @@ bool Clean(CommandLine &CmdL)
int main(int argc, const char *argv[])
{
+ setlocale(LC_ALL, "");
CommandLine::Args Args[] = {
{'h',"help","help",0},
{0,"md5","APT::FTPArchive::MD5",0},
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 461a98406..3b210f6b6 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: Debian APT-HTTP/1.3 ("VERSION")\r\n\r\n";
if (Debug == true)
diff --git a/methods/https.cc b/methods/https.cc
index 79e6fea3f..86d7f3a6b 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>
@@ -126,8 +127,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);
@@ -135,7 +138,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.
@@ -213,8 +215,10 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
// set timeout
int timeout = _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->FindI("Acquire::https::AllowRedirect", true);
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 46910b1a2..f20aa2241 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-10-20 08:28+0200\n"
+"POT-Creation-Date: 2008-09-22 21:18+0200\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"
@@ -21,7 +21,7 @@ msgid "Package %s version %s has an unmet dep:\n"
msgstr ""
#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
-#: cmdline/apt-cache.cc:797 cmdline/apt-cache.cc:1021
+#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
#, c-format
msgid "Unable to locate package %s"
@@ -91,7 +91,7 @@ msgstr ""
msgid "Total space accounted for: "
msgstr ""
-#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1221
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
#, c-format
msgid "Package file %s is out of sync."
msgstr ""
@@ -149,14 +149,14 @@ msgstr ""
msgid " %4i %s\n"
msgstr ""
-#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 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:2573 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr ""
-#: cmdline/apt-cache.cc:1725
+#: cmdline/apt-cache.cc:1726
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -179,8 +179,8 @@ msgid ""
" show - Show a readable record for the package\n"
" depends - Show raw dependency information for a package\n"
" rdepends - Show reverse dependency information for a package\n"
-" pkgnames - List the names of all packages in the system\n"
-" dotty - Generate package graphs for GraphViz\n"
+" pkgnames - List the names of all packages\n"
+" dotty - Generate package graphs for GraphVis\n"
" xvcg - Generate package graphs for xvcg\n"
" policy - Show policy settings\n"
"\n"
@@ -195,15 +195,15 @@ msgid ""
"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgstr ""
-#: cmdline/apt-cdrom.cc:77
-msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
msgstr ""
-#: cmdline/apt-cdrom.cc:92
+#: cmdline/apt-cdrom.cc:93
msgid "Please insert a Disc in the drive and press enter"
msgstr ""
-#: cmdline/apt-cdrom.cc:114
+#: cmdline/apt-cdrom.cc:117
msgid "Repeat this process for the rest of the CDs in your set."
msgstr ""
@@ -246,7 +246,8 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815
+#: apt-pkg/pkgcachegen.cc:830
#, c-format
msgid "Unable to write to %s"
msgstr ""
@@ -545,222 +546,221 @@ msgstr ""
msgid "Failed to rename %s to %s"
msgstr ""
-#: cmdline/apt-get.cc:127
+#: cmdline/apt-get.cc:124
msgid "Y"
msgstr ""
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:241
msgid "The following packages have unmet dependencies:"
msgstr ""
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:331
#, c-format
msgid "but %s is installed"
msgstr ""
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:333
#, c-format
msgid "but %s is to be installed"
msgstr ""
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:340
msgid "but it is not installable"
msgstr ""
-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:342
msgid "but it is a virtual package"
msgstr ""
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:345
msgid "but it is not installed"
msgstr ""
-#: cmdline/apt-get.cc:348
+#: cmdline/apt-get.cc:345
msgid "but it is not going to be installed"
msgstr ""
-#: cmdline/apt-get.cc:353
+#: cmdline/apt-get.cc:350
msgid " or"
msgstr ""
-#: cmdline/apt-get.cc:382
+#: cmdline/apt-get.cc:379
msgid "The following NEW packages will be installed:"
msgstr ""
-#: cmdline/apt-get.cc:408
+#: cmdline/apt-get.cc:405
msgid "The following packages will be REMOVED:"
msgstr ""
-#: cmdline/apt-get.cc:430
+#: cmdline/apt-get.cc:427
msgid "The following packages have been kept back:"
msgstr ""
-#: cmdline/apt-get.cc:451
+#: cmdline/apt-get.cc:448
msgid "The following packages will be upgraded:"
msgstr ""
-#: cmdline/apt-get.cc:472
+#: cmdline/apt-get.cc:469
msgid "The following packages will be DOWNGRADED:"
msgstr ""
-#: cmdline/apt-get.cc:492
+#: cmdline/apt-get.cc:489
msgid "The following held packages will be changed:"
msgstr ""
-#: cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:542
#, c-format
msgid "%s (due to %s) "
msgstr ""
-#: cmdline/apt-get.cc:553
+#: cmdline/apt-get.cc:550
msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
-#: cmdline/apt-get.cc:584
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr ""
-#: cmdline/apt-get.cc:588
+#: cmdline/apt-get.cc:585
#, c-format
msgid "%lu reinstalled, "
msgstr ""
-#: cmdline/apt-get.cc:590
+#: cmdline/apt-get.cc:587
#, c-format
msgid "%lu downgraded, "
msgstr ""
-#: cmdline/apt-get.cc:592
+#: cmdline/apt-get.cc:589
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr ""
-#: cmdline/apt-get.cc:596
+#: cmdline/apt-get.cc:593
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr ""
-#: cmdline/apt-get.cc:669
+#: cmdline/apt-get.cc:667
msgid "Correcting dependencies..."
msgstr ""
-#: cmdline/apt-get.cc:672
+#: cmdline/apt-get.cc:670
msgid " failed."
msgstr ""
-#: cmdline/apt-get.cc:675
+#: cmdline/apt-get.cc:673
msgid "Unable to correct dependencies"
msgstr ""
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:676
msgid "Unable to minimize the upgrade set"
msgstr ""
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:678
msgid " Done"
msgstr ""
-#: cmdline/apt-get.cc:684
+#: cmdline/apt-get.cc:682
msgid "You might want to run `apt-get -f install' to correct these."
msgstr ""
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:685
msgid "Unmet dependencies. Try using -f."
msgstr ""
-#: cmdline/apt-get.cc:712
+#: cmdline/apt-get.cc:707
msgid "WARNING: The following packages cannot be authenticated!"
msgstr ""
-#: cmdline/apt-get.cc:716
+#: cmdline/apt-get.cc:711
msgid "Authentication warning overridden.\n"
msgstr ""
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:718
msgid "Install these packages without verification [y/N]? "
msgstr ""
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:720
msgid "Some packages could not be authenticated"
msgstr ""
-#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
msgid "There are problems and -y was used without --force-yes"
msgstr ""
-#: cmdline/apt-get.cc:775
+#: cmdline/apt-get.cc:773
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
-#: cmdline/apt-get.cc:784
+#: cmdline/apt-get.cc:782
msgid "Packages need to be removed but remove is disabled."
msgstr ""
-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:793
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:809 cmdline/apt-get.cc:1990 cmdline/apt-get.cc:2023
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:819 cmdline/apt-get.cc:2071 cmdline/apt-get.cc:2317
#: apt-pkg/cachefile.cc:65
msgid "The list of sources could not be read."
msgstr ""
-#: cmdline/apt-get.cc:836
+#: cmdline/apt-get.cc:834
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
-#: cmdline/apt-get.cc:841
+#: cmdline/apt-get.cc:839
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:842
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:847
#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr ""
-#: cmdline/apt-get.cc:852
+#: cmdline/apt-get.cc:850
#, c-format
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:864 cmdline/apt-get.cc:2166
#, c-format
msgid "Couldn't determine free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:880
+#: cmdline/apt-get.cc:871
#, c-format
msgid "You don't have enough free space in %s."
msgstr ""
-#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
-#: cmdline/apt-get.cc:898
+#: cmdline/apt-get.cc:889
msgid "Yes, do as I say!"
msgstr ""
-#: cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:891
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -768,74 +768,75 @@ msgid ""
" ?] "
msgstr ""
-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925
+#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
msgid "Abort."
msgstr ""
-#: cmdline/apt-get.cc:921
+#: cmdline/apt-get.cc:912
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:984 cmdline/apt-get.cc:2214 apt-pkg/algorithms.cc:1344
+#: apt-pkg/algorithms.cc:1389
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1011
+#: cmdline/apt-get.cc:1002
msgid "Some files failed to download"
msgstr ""
-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2223
msgid "Download complete and in download only mode"
msgstr ""
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1009
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
msgstr ""
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1013
msgid "--fix-missing and media swapping is not currently supported"
msgstr ""
-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1018
msgid "Unable to correct missing packages."
msgstr ""
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1019
msgid "Aborting install."
msgstr ""
-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1053
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1097
+#: cmdline/apt-get.cc:1063
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
-#: cmdline/apt-get.cc:1115
+#: cmdline/apt-get.cc:1081
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr ""
-#: cmdline/apt-get.cc:1126
+#: cmdline/apt-get.cc:1092
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr ""
-#: cmdline/apt-get.cc:1138
+#: cmdline/apt-get.cc:1104
msgid " [Installed]"
msgstr ""
-#: cmdline/apt-get.cc:1143
+#: cmdline/apt-get.cc:1109
msgid "You should explicitly select one to install."
msgstr ""
-#: cmdline/apt-get.cc:1148
+#: cmdline/apt-get.cc:1114
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -843,142 +844,111 @@ msgid ""
"is only available from another source\n"
msgstr ""
-#: cmdline/apt-get.cc:1167
+#: cmdline/apt-get.cc:1133
msgid "However the following packages replace it:"
msgstr ""
-#: cmdline/apt-get.cc:1170
+#: cmdline/apt-get.cc:1136
#, c-format
msgid "Package %s has no installation candidate"
msgstr ""
-#: cmdline/apt-get.cc:1190
+#: cmdline/apt-get.cc:1156
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
-#: cmdline/apt-get.cc:1198
+#: cmdline/apt-get.cc:1164
#, c-format
msgid "%s is already the newest version.\n"
msgstr ""
-#: cmdline/apt-get.cc:1227
+#: cmdline/apt-get.cc:1193
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr ""
-#: cmdline/apt-get.cc:1229
+#: cmdline/apt-get.cc:1195
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr ""
-#: cmdline/apt-get.cc:1235
+#: cmdline/apt-get.cc:1201
#, c-format
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
-#, 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
-#, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1338
msgid "The update command takes no arguments"
msgstr ""
-#: cmdline/apt-get.cc:1396
+#: cmdline/apt-get.cc:1351
msgid "Unable to lock the list directory"
msgstr ""
-#: cmdline/apt-get.cc:1452
+#: cmdline/apt-get.cc:1403
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1501
+#: cmdline/apt-get.cc:1435
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr ""
-#: cmdline/apt-get.cc:1503
-#, c-format
-msgid "%lu packages were automatically installed and are no longer required.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1504
+#: cmdline/apt-get.cc:1437
msgid "Use 'apt-get autoremove' to remove them."
msgstr ""
-#: cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1442
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << endl;
-#. }
-#.
-#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1733
msgid "The following information may help to resolve the situation:"
msgstr ""
-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1449
msgid "Internal Error, AutoRemover broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1468
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1590
+#: cmdline/apt-get.cc:1523
#, c-format
msgid "Couldn't find task %s"
msgstr ""
-#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
+#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:1728
+#: cmdline/apt-get.cc:1661
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1759
+#: cmdline/apt-get.cc:1692
#, c-format
msgid "%s set to manually installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:1772
+#: cmdline/apt-get.cc:1705
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
-#: cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1708
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:1720
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 +956,160 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1805
+#: cmdline/apt-get.cc:1728
+msgid ""
+"Since you only requested a single operation it is extremely likely that\n"
+"the package is simply not installable and a bug report against\n"
+"that package should be filed."
+msgstr ""
+
+#: cmdline/apt-get.cc:1736
msgid "Broken packages"
msgstr ""
-#: cmdline/apt-get.cc:1834
+#: cmdline/apt-get.cc:1765
msgid "The following extra packages will be installed:"
msgstr ""
-#: cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1854
msgid "Suggested packages:"
msgstr ""
-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1855
msgid "Recommended packages:"
msgstr ""
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1883
msgid "Calculating upgrade... "
msgstr ""
-#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1886 methods/ftp.cc:702 methods/connect.cc:112
+#: methods/ftp.cc:707 methods/ftp.cc:708
msgid "Failed"
msgstr ""
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1891
msgid "Done"
msgstr ""
-#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
+#: cmdline/apt-get.cc:1958 cmdline/apt-get.cc:1966
msgid "Internal error, problem resolver broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:2136
+#: cmdline/apt-get.cc:2066
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:2096 cmdline/apt-get.cc:2335
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:2215
+#: cmdline/apt-get.cc:2145
#, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:2250
+#: cmdline/apt-get.cc:2173
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:2256
+#: cmdline/apt-get.cc:2179
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2182
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2188
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2219
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:2324
+#: cmdline/apt-get.cc:2247
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2336
+#: cmdline/apt-get.cc:2259
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2337
+#: cmdline/apt-get.cc:2260
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2373
+#: cmdline/apt-get.cc:2296
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2389
+#: cmdline/apt-get.cc:2312
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2417
+#: cmdline/apt-get.cc:2340
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2437
+#: cmdline/apt-get.cc:2360
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2489
+#: cmdline/apt-get.cc:2412
#, 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:2465
#, 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:2501
#, 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:2528
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2542
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2626
+#: cmdline/apt-get.cc:2546
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2658
+#: cmdline/apt-get.cc:2578
msgid "Supported modules:"
msgstr ""
-#: cmdline/apt-get.cc:2699
+#: cmdline/apt-get.cc:2619
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1147,7 +1125,7 @@ msgid ""
" install - Install new packages (pkg is libc6 not libc6.deb)\n"
" remove - Remove packages\n"
" autoremove - Remove automatically all unused packages\n"
-" purge - Remove packages and config files\n"
+" purge - Remove and purge packages\n"
" source - Download source archives\n"
" build-dep - Configure build-dependencies for source packages\n"
" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
@@ -1175,14 +1153,6 @@ msgid ""
" This APT has Super Cow Powers.\n"
msgstr ""
-#: cmdline/apt-get.cc:2866
-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 ""
-
#: cmdline/acqprogress.cc:55
msgid "Hit "
msgstr ""
@@ -1249,11 +1219,11 @@ msgid "Do you want to erase any previously downloaded .deb files?"
msgstr ""
#: dselect/install:101
-msgid "Some errors occurred while unpacking. Packages that were installed"
+msgid "Some errors occurred while unpacking. I'm going to configure the"
msgstr ""
#: dselect/install:102
-msgid "will be configured. This may result in duplicate errors"
+msgid "packages that were installed. This may result in duplicate errors"
msgstr ""
#: dselect/install:103
@@ -1298,12 +1268,7 @@ msgstr ""
msgid "Error reading archive member header"
msgstr ""
-#: apt-inst/contrib/arfile.cc:90
-#, c-format
-msgid "Invalid archive member header %s"
-msgstr ""
-
-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102
msgid "Invalid archive member header"
msgstr ""
@@ -1405,11 +1370,15 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: 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/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
+#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/contrib/configuration.cc:822 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/policy.cc:281
+#: apt-pkg/policy.cc:287 apt-pkg/contrib/configuration.cc:843
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98
#, c-format
msgid "Unable to read %s"
msgstr ""
@@ -1439,7 +1408,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr ""
#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748
+#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822
+#: apt-pkg/pkgcachegen.cc:945 apt-pkg/pkgcachegen.cc:763
#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
#: apt-pkg/pkgcachegen.cc:961
msgid "Reading package lists"
@@ -1541,31 +1512,37 @@ msgstr ""
msgid "Unparsable control file"
msgstr ""
-#: methods/cdrom.cc:200
+#: apt-inst/contrib/arfile.cc:90
+#, c-format
+msgid "Invalid archive member header %s"
+msgstr ""
+
+#: methods/cdrom.cc:114 methods/cdrom.cc:200
#, c-format
msgid "Unable to read the cdrom database %s"
msgstr ""
-#: methods/cdrom.cc:209
+#: methods/cdrom.cc:123 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 ""
-#: methods/cdrom.cc:219
+#: methods/cdrom.cc:131 methods/cdrom.cc:219
msgid "Wrong CD-ROM"
msgstr ""
-#: methods/cdrom.cc:245
+#: methods/cdrom.cc:166 methods/cdrom.cc:245
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr ""
-#: methods/cdrom.cc:250
+#: methods/cdrom.cc:171 methods/cdrom.cc:250
msgid "Disk not found."
msgstr ""
-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:258
msgid "File not found"
msgstr ""
@@ -1583,147 +1560,157 @@ 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:162 methods/ftp.cc:167 methods/ftp.cc:168
msgid "Logging in"
msgstr ""
-#: methods/ftp.cc:173
+#: methods/ftp.cc:168 methods/ftp.cc:173 methods/ftp.cc:174
msgid "Unable to determine the peer name"
msgstr ""
-#: methods/ftp.cc:178
+#: methods/ftp.cc:173 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:204 methods/ftp.cc:232 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:210 methods/ftp.cc:215 methods/ftp.cc:216
#, c-format
msgid "USER failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:222
+#: methods/ftp.cc:217 methods/ftp.cc:222 methods/ftp.cc:223
#, c-format
msgid "PASS failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:242
+#: methods/ftp.cc:237 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:265 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:291 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:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:334 methods/ftp.cc:445 methods/ftp.cc:335 methods/ftp.cc:446
msgid "Connection timeout"
msgstr ""
-#: methods/ftp.cc:340
+#: methods/ftp.cc:335 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:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:541 methods/ftp.cc:344
+#: apt-pkg/contrib/fileutl.cc:543
msgid "Read error"
msgstr ""
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:345 methods/rsh.cc:197 methods/ftp.cc:350 methods/ftp.cc:351
msgid "A response overflowed the buffer."
msgstr ""
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:362 methods/ftp.cc:374 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:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:580 methods/ftp.cc:452
+#: apt-pkg/contrib/fileutl.cc:582
msgid "Write error"
msgstr ""
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 methods/ftp.cc:692
+#: methods/ftp.cc:698 methods/ftp.cc:734 methods/ftp.cc:699 methods/ftp.cc:735
msgid "Could not create a socket"
msgstr ""
-#: methods/ftp.cc:703
+#: methods/ftp.cc:698 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:704 methods/ftp.cc:709 methods/ftp.cc:710
msgid "Could not connect passive socket."
msgstr ""
-#: methods/ftp.cc:727
+#: methods/ftp.cc:722 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:736 methods/ftp.cc:741 methods/ftp.cc:742
msgid "Could not bind a socket"
msgstr ""
-#: methods/ftp.cc:745
+#: methods/ftp.cc:740 methods/ftp.cc:745 methods/ftp.cc:746
msgid "Could not listen on the socket"
msgstr ""
-#: methods/ftp.cc:752
+#: methods/ftp.cc:747 methods/ftp.cc:752 methods/ftp.cc:753
msgid "Could not determine the socket's name"
msgstr ""
-#: methods/ftp.cc:784
+#: methods/ftp.cc:779 methods/ftp.cc:784 methods/ftp.cc:785
msgid "Unable to send PORT command"
msgstr ""
-#: methods/ftp.cc:794
+#: methods/ftp.cc:789 methods/ftp.cc:794 methods/ftp.cc:795
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr ""
-#: methods/ftp.cc:803
+#: methods/ftp.cc:798 methods/ftp.cc:803 methods/ftp.cc:804
#, c-format
msgid "EPRT failed, server said: %s"
msgstr ""
-#: methods/ftp.cc:823
+#: methods/ftp.cc:818 methods/ftp.cc:823 methods/ftp.cc:824
msgid "Data socket connect timed out"
msgstr ""
-#: methods/ftp.cc:830
+#: methods/ftp.cc:825 methods/ftp.cc:830 methods/ftp.cc:831
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:996 methods/ftp.cc:870
+#: methods/http.cc:999
msgid "Problem hashing file"
msgstr ""
-#: methods/ftp.cc:882
+#: methods/ftp.cc:877 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:892 methods/rsh.cc:322 methods/ftp.cc:897 methods/ftp.cc:898
msgid "Data socket timed out"
msgstr ""
-#: methods/ftp.cc:927
+#: methods/ftp.cc:922 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:997 methods/ftp.cc:1002 methods/ftp.cc:1005
msgid "Query"
msgstr ""
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1109 methods/ftp.cc:1114 methods/ftp.cc:1117
msgid "Unable to invoke "
msgstr ""
@@ -1781,41 +1768,41 @@ msgstr ""
#: methods/connect.cc:240
#, c-format
-msgid "Unable to connect to %s:%s:"
+msgid "Unable to connect to %s %s:"
msgstr ""
-#: methods/gpgv.cc:71
+#: methods/gpgv.cc:65 methods/gpgv.cc:71
#, c-format
msgid "Couldn't access keyring: '%s'"
msgstr ""
-#: methods/gpgv.cc:107
+#: methods/gpgv.cc:101 methods/gpgv.cc:107
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
-#: methods/gpgv.cc:223
+#: methods/gpgv.cc:205 methods/gpgv.cc:223
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:228
+#: methods/gpgv.cc:210 methods/gpgv.cc:228
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:232
+#: methods/gpgv.cc:214 methods/gpgv.cc:232
#, c-format
msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
msgstr ""
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:219 methods/gpgv.cc:237
msgid "Unknown error executing gpgv"
msgstr ""
-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:250 methods/gpgv.cc:271 methods/gpgv.cc:278
msgid "The following signatures were invalid:\n"
msgstr ""
-#: methods/gpgv.cc:285
+#: methods/gpgv.cc:257 methods/gpgv.cc:285
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1831,173 +1818,160 @@ msgstr ""
msgid "Read error from %s process"
msgstr ""
-#: methods/http.cc:384
+#: methods/http.cc:377 methods/http.cc:384 methods/http.cc:385
msgid "Waiting for headers"
msgstr ""
-#: methods/http.cc:530
+#: methods/http.cc:523 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:531 methods/http.cc:538 methods/http.cc:539
msgid "Bad header line"
msgstr ""
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:550 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:586 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:601 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:603 methods/http.cc:610 methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr ""
-#: methods/http.cc:634
+#: methods/http.cc:627 methods/http.cc:634 methods/http.cc:635
msgid "Unknown date format"
msgstr ""
-#: methods/http.cc:787
+#: methods/http.cc:774 methods/http.cc:787 methods/http.cc:790
msgid "Select failed"
msgstr ""
-#: methods/http.cc:792
+#: methods/http.cc:779 methods/http.cc:792 methods/http.cc:795
msgid "Connection timed out"
msgstr ""
-#: methods/http.cc:815
+#: methods/http.cc:802 methods/http.cc:815 methods/http.cc:818
msgid "Error writing to output file"
msgstr ""
-#: methods/http.cc:846
+#: methods/http.cc:833 methods/http.cc:846 methods/http.cc:849
msgid "Error writing to file"
msgstr ""
-#: methods/http.cc:874
+#: methods/http.cc:861 methods/http.cc:874 methods/http.cc:877
msgid "Error writing to the file"
msgstr ""
-#: methods/http.cc:888
+#: methods/http.cc:875 methods/http.cc:888 methods/http.cc:891
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:890
+#: methods/http.cc:877 methods/http.cc:890 methods/http.cc:893
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 methods/http.cc:981
+#: apt-pkg/contrib/mmap.cc:215 methods/http.cc:984
msgid "Failed to truncate file"
msgstr ""
-#: methods/http.cc:1146
+#: methods/http.cc:1105 methods/http.cc:1146 methods/http.cc:1149
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1163 methods/http.cc:1218
+#: methods/http.cc:1122 methods/http.cc:1177 methods/http.cc:1163
+#: methods/http.cc:1218 methods/http.cc:1166 methods/http.cc:1221
msgid "Connection failed"
msgstr ""
-#: methods/http.cc:1310
+#: methods/http.cc:1229 methods/http.cc:1310 methods/http.cc:1313
msgid "Internal error"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:76
+#: apt-pkg/contrib/mmap.cc:80 apt-pkg/contrib/mmap.cc:76
msgid "Can't mmap an empty file"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:85 apt-pkg/contrib/mmap.cc:81
+#: apt-pkg/contrib/mmap.cc:187
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr ""
-#: 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 ""
-
-#. 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 ""
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:353
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:360
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:365
-#, c-format
-msgid "%lis"
+#: apt-pkg/contrib/mmap.cc:213
+msgid "Dynamic MMap ran out of room"
msgstr ""
+#: apt-pkg/contrib/strutl.cc:1014 apt-pkg/contrib/strutl.cc:1029
#: apt-pkg/contrib/strutl.cc:1040
#, c-format
msgid "Selection %s not found"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:439 apt-pkg/contrib/configuration.cc:458
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:497 apt-pkg/contrib/configuration.cc:516
#, c-format
msgid "Opening configuration file %s"
msgstr ""
+#: apt-pkg/contrib/configuration.cc:662 apt-pkg/contrib/configuration.cc:663
#: apt-pkg/contrib/configuration.cc:684
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr ""
+#: apt-pkg/contrib/configuration.cc:681 apt-pkg/contrib/configuration.cc:682
#: apt-pkg/contrib/configuration.cc:703
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr ""
+#: apt-pkg/contrib/configuration.cc:698 apt-pkg/contrib/configuration.cc:699
#: apt-pkg/contrib/configuration.cc:720
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr ""
+#: apt-pkg/contrib/configuration.cc:738 apt-pkg/contrib/configuration.cc:739
#: apt-pkg/contrib/configuration.cc:760
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
+#: apt-pkg/contrib/configuration.cc:745 apt-pkg/contrib/configuration.cc:746
#: apt-pkg/contrib/configuration.cc:767
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr ""
+#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755
#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr ""
+#: apt-pkg/contrib/configuration.cc:758 apt-pkg/contrib/configuration.cc:759
#: apt-pkg/contrib/configuration.cc:780
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr ""
+#: apt-pkg/contrib/configuration.cc:809 apt-pkg/contrib/configuration.cc:810
#: apt-pkg/contrib/configuration.cc:831
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
@@ -2064,13 +2038,15 @@ msgstr ""
msgid "Unable to stat the mount point %s"
msgstr ""
+#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
+#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40
#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/contrib/cdromutl.cc:187
#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:39
#, c-format
msgid "Unable to change to %s"
msgstr ""
-#: apt-pkg/contrib/cdromutl.cc:195
+#: apt-pkg/contrib/cdromutl.cc:188 apt-pkg/contrib/cdromutl.cc:195
msgid "Failed to stat the cdrom"
msgstr ""
@@ -2099,152 +2075,154 @@ msgstr ""
msgid "Waited for %s but it wasn't there"
msgstr ""
+#: apt-pkg/contrib/fileutl.cc:454 apt-pkg/contrib/fileutl.cc:455
#: apt-pkg/contrib/fileutl.cc:456
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:458
-#, c-format
-msgid "Sub-process %s received signal %u."
-msgstr ""
-
+#: apt-pkg/contrib/fileutl.cc:457 apt-pkg/contrib/fileutl.cc:460
#: apt-pkg/contrib/fileutl.cc:462
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr ""
+#: apt-pkg/contrib/fileutl.cc:459 apt-pkg/contrib/fileutl.cc:462
#: apt-pkg/contrib/fileutl.cc:464
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr ""
+#: apt-pkg/contrib/fileutl.cc:503 apt-pkg/contrib/fileutl.cc:506
#: apt-pkg/contrib/fileutl.cc:508
#, c-format
msgid "Could not open file %s"
msgstr ""
+#: apt-pkg/contrib/fileutl.cc:559 apt-pkg/contrib/fileutl.cc:562
#: apt-pkg/contrib/fileutl.cc:564
#, c-format
msgid "read, still have %lu to read but none left"
msgstr ""
+#: apt-pkg/contrib/fileutl.cc:589 apt-pkg/contrib/fileutl.cc:592
#: apt-pkg/contrib/fileutl.cc:594
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr ""
+#: apt-pkg/contrib/fileutl.cc:664 apt-pkg/contrib/fileutl.cc:667
#: apt-pkg/contrib/fileutl.cc:669
msgid "Problem closing the file"
msgstr ""
+#: apt-pkg/contrib/fileutl.cc:670 apt-pkg/contrib/fileutl.cc:673
#: apt-pkg/contrib/fileutl.cc:675
msgid "Problem unlinking the file"
msgstr ""
+#: apt-pkg/contrib/fileutl.cc:681 apt-pkg/contrib/fileutl.cc:684
#: apt-pkg/contrib/fileutl.cc:686
msgid "Problem syncing the file"
msgstr ""
-#: apt-pkg/pkgcache.cc:133
+#: apt-pkg/pkgcache.cc:132 apt-pkg/pkgcache.cc:133
msgid "Empty package cache"
msgstr ""
-#: apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:138 apt-pkg/pkgcache.cc:139
msgid "The package cache file is corrupted"
msgstr ""
-#: apt-pkg/pkgcache.cc:144
+#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:144
msgid "The package cache file is an incompatible version"
msgstr ""
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:149
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr ""
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:154
msgid "The package cache was built for a different architecture"
msgstr ""
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:224 apt-pkg/pkgcache.cc:225
msgid "Depends"
msgstr ""
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:224 apt-pkg/pkgcache.cc:225
msgid "PreDepends"
msgstr ""
-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:224 apt-pkg/pkgcache.cc:225
msgid "Suggests"
msgstr ""
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:225 apt-pkg/pkgcache.cc:226
msgid "Recommends"
msgstr ""
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:225 apt-pkg/pkgcache.cc:226
msgid "Conflicts"
msgstr ""
-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:225 apt-pkg/pkgcache.cc:226
msgid "Replaces"
msgstr ""
-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:226 apt-pkg/pkgcache.cc:227
msgid "Obsoletes"
msgstr ""
-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:226 apt-pkg/pkgcache.cc:227
msgid "Breaks"
msgstr ""
-#: apt-pkg/pkgcache.cc:227
-msgid "Enhances"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:237 apt-pkg/pkgcache.cc:238
msgid "important"
msgstr ""
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:237 apt-pkg/pkgcache.cc:238
msgid "required"
msgstr ""
-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:237 apt-pkg/pkgcache.cc:238
msgid "standard"
msgstr ""
-#: apt-pkg/pkgcache.cc:239
+#: apt-pkg/pkgcache.cc:238 apt-pkg/pkgcache.cc:239
msgid "optional"
msgstr ""
-#: apt-pkg/pkgcache.cc:239
+#: apt-pkg/pkgcache.cc:238 apt-pkg/pkgcache.cc:239
msgid "extra"
msgstr ""
-#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
+#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:123
+#: apt-pkg/depcache.cc:152
msgid "Building dependency tree"
msgstr ""
-#: apt-pkg/depcache.cc:124
+#: apt-pkg/depcache.cc:122 apt-pkg/depcache.cc:124
msgid "Candidate versions"
msgstr ""
-#: apt-pkg/depcache.cc:153
+#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:153
msgid "Dependency generation"
msgstr ""
+#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
#: apt-pkg/depcache.cc:173 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
msgid "Reading state information"
msgstr ""
-#: apt-pkg/depcache.cc:223
+#: apt-pkg/depcache.cc:219 apt-pkg/depcache.cc:223
#, c-format
msgid "Failed to open StateFile %s"
msgstr ""
-#: apt-pkg/depcache.cc:229
+#: apt-pkg/depcache.cc:225 apt-pkg/depcache.cc:229
#, c-format
msgid "Failed to write temporary StateFile %s"
msgstr ""
@@ -2284,39 +2262,35 @@ msgstr ""
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:206
#, c-format
msgid "Opening %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 apt-pkg/sourcelist.cc:223
+#: apt-pkg/cdrom.cc:445
#, c-format
msgid "Line %u too long in source list %s."
msgstr ""
-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:236 apt-pkg/sourcelist.cc:243
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr ""
-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:240 apt-pkg/sourcelist.cc:247
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr ""
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
#, c-format
msgid "Malformed line %u in source list %s (vendor id)"
msgstr ""
-#: 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:428 apt-pkg/packagemanager.cc:436
+#: apt-pkg/packagemanager.cc:440
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2324,58 +2298,52 @@ msgid ""
"you really want to do it, activate the APT::Force-LoopBreak option."
msgstr ""
-#: 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"
msgstr ""
-#: apt-pkg/algorithms.cc:248
+#: apt-pkg/algorithms.cc:247 apt-pkg/algorithms.cc:248
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
-#: apt-pkg/algorithms.cc:1138
+#: apt-pkg/algorithms.cc:1106 apt-pkg/algorithms.cc:1138
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
-#: apt-pkg/algorithms.cc:1140
+#: apt-pkg/algorithms.cc:1108 apt-pkg/algorithms.cc:1140
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
+#: apt-pkg/algorithms.cc:1370 apt-pkg/algorithms.cc:1372
#: apt-pkg/algorithms.cc:1415 apt-pkg/algorithms.cc:1417
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
msgstr ""
-#: apt-pkg/acquire.cc:60
+#: apt-pkg/acquire.cc:59 apt-pkg/acquire.cc:60
#, c-format
msgid "Lists directory %spartial is missing."
msgstr ""
-#: apt-pkg/acquire.cc:64
+#: apt-pkg/acquire.cc:63 apt-pkg/acquire.cc:64
#, c-format
msgid "Archive directory %spartial is missing."
msgstr ""
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:826
+#: apt-pkg/acquire.cc:828 apt-pkg/acquire.cc:826
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:830 apt-pkg/acquire.cc:828
#, c-format
msgid "Retrieving file %li of %li"
msgstr ""
@@ -2390,21 +2358,21 @@ msgstr ""
msgid "Method %s did not start correctly"
msgstr ""
-#: apt-pkg/acquire-worker.cc:413
+#: apt-pkg/acquire-worker.cc:399 apt-pkg/acquire-worker.cc:413
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:124 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:140 apt-pkg/init.cc:148 apt-pkg/init.cc:149
msgid "Unable to determine a suitable packaging system type"
msgstr ""
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:57 apt-pkg/clean.cc:56
#, c-format
msgid "Unable to stat %s."
msgstr ""
@@ -2421,130 +2389,135 @@ msgstr ""
msgid "You may want to run apt-get update to correct these problems"
msgstr ""
-#: apt-pkg/policy.cc:347
-#, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
+#: apt-pkg/policy.cc:267
+msgid "Invalid record in the preferences file, no Package header"
msgstr ""
-#: apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:289 apt-pkg/policy.cc:369
#, c-format
msgid "Did not understand pin type %s"
msgstr ""
-#: apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:297 apt-pkg/policy.cc:377
msgid "No priority (or zero) specified for pin"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:72 apt-pkg/pkgcachegen.cc:74
msgid "Cache has an incompatible versioning system"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:115 apt-pkg/pkgcachegen.cc:117
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:132
+#: apt-pkg/pkgcachegen.cc:130 apt-pkg/pkgcachegen.cc:132
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:166
+#: apt-pkg/pkgcachegen.cc:153 apt-pkg/pkgcachegen.cc:166
#, c-format
msgid "Error occurred while processing %s (NewFileDesc1)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:191
+#: apt-pkg/pkgcachegen.cc:178 apt-pkg/pkgcachegen.cc:191
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:195
+#: apt-pkg/pkgcachegen.cc:182 apt-pkg/pkgcachegen.cc:195
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:226
+#: apt-pkg/pkgcachegen.cc:213 apt-pkg/pkgcachegen.cc:226
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:230
+#: apt-pkg/pkgcachegen.cc:217 apt-pkg/pkgcachegen.cc:230
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:221 apt-pkg/pkgcachegen.cc:234
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:258
+#: apt-pkg/pkgcachegen.cc:245 apt-pkg/pkgcachegen.cc:258
#, c-format
msgid "Error occurred while processing %s (NewFileDesc2)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:264
+#: apt-pkg/pkgcachegen.cc:251 apt-pkg/pkgcachegen.cc:264
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:267
+#: apt-pkg/pkgcachegen.cc:254 apt-pkg/pkgcachegen.cc:267
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:270
+#: apt-pkg/pkgcachegen.cc:257 apt-pkg/pkgcachegen.cc:270
msgid "Wow, you exceeded the number of descriptions this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:260 apt-pkg/pkgcachegen.cc:273
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:301
+#: apt-pkg/pkgcachegen.cc:288 apt-pkg/pkgcachegen.cc:301
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:314
+#: apt-pkg/pkgcachegen.cc:301 apt-pkg/pkgcachegen.cc:314
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:320
+#: apt-pkg/pkgcachegen.cc:307 apt-pkg/pkgcachegen.cc:320
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:678 apt-pkg/pkgcachegen.cc:693
#, c-format
msgid "Couldn't stat source package list %s"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:778
+#: apt-pkg/pkgcachegen.cc:763 apt-pkg/pkgcachegen.cc:778
msgid "Collecting File Provides"
msgstr ""
+#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897
#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
msgid "IO Error saving source cache"
msgstr ""
-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:127 apt-pkg/acquire-item.cc:128
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr ""
+#: apt-pkg/acquire-item.cc:401 apt-pkg/acquire-item.cc:394
#: apt-pkg/acquire-item.cc:395
msgid "MD5Sum mismatch"
msgstr ""
+#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408
+#: apt-pkg/acquire-item.cc:644 apt-pkg/acquire-item.cc:1406
#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
msgid "Hash Sum mismatch"
msgstr ""
+#: apt-pkg/acquire-item.cc:1100 apt-pkg/acquire-item.cc:1101
#: apt-pkg/acquire-item.cc:1106
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
+#: apt-pkg/acquire-item.cc:1213 apt-pkg/acquire-item.cc:1211
#: apt-pkg/acquire-item.cc:1216
#, c-format
msgid ""
@@ -2552,6 +2525,7 @@ msgid ""
"to manually fix this package. (due to missing arch)"
msgstr ""
+#: apt-pkg/acquire-item.cc:1272 apt-pkg/acquire-item.cc:1270
#: apt-pkg/acquire-item.cc:1275
#, c-format
msgid ""
@@ -2559,209 +2533,287 @@ msgid ""
"manually fix this package."
msgstr ""
+#: apt-pkg/acquire-item.cc:1313 apt-pkg/acquire-item.cc:1311
#: apt-pkg/acquire-item.cc:1316
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
+#: apt-pkg/acquire-item.cc:1400 apt-pkg/acquire-item.cc:1398
#: apt-pkg/acquire-item.cc:1403
msgid "Size mismatch"
msgstr ""
-#: apt-pkg/indexrecords.cc:40
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:47
-#, c-format
-msgid "No sections in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:81
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
#: apt-pkg/vendorlist.cc:66
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr ""
-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:529 apt-pkg/cdrom.cc:525
#, c-format
msgid ""
"Using CD-ROM mount point %s\n"
"Mounting CD-ROM\n"
msgstr ""
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:622
+#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 apt-pkg/cdrom.cc:534
+#: apt-pkg/cdrom.cc:622
msgid "Identifying.. "
msgstr ""
-#: apt-pkg/cdrom.cc:559
+#: apt-pkg/cdrom.cc:563 apt-pkg/cdrom.cc:559
#, c-format
msgid "Stored label: %s\n"
msgstr ""
-#: apt-pkg/cdrom.cc:566 apt-pkg/cdrom.cc:836
+#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 apt-pkg/cdrom.cc:566
+#: apt-pkg/cdrom.cc:836
msgid "Unmounting CD-ROM...\n"
msgstr ""
-#: apt-pkg/cdrom.cc:585
+#: apt-pkg/cdrom.cc:590 apt-pkg/cdrom.cc:585
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr ""
-#: apt-pkg/cdrom.cc:603
+#: apt-pkg/cdrom.cc:608 apt-pkg/cdrom.cc:603
msgid "Unmounting CD-ROM\n"
msgstr ""
-#: apt-pkg/cdrom.cc:607
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:607
msgid "Waiting for disc...\n"
msgstr ""
#. Mount the new CDROM
-#: apt-pkg/cdrom.cc:615
+#: apt-pkg/cdrom.cc:620 apt-pkg/cdrom.cc:615
msgid "Mounting CD-ROM...\n"
msgstr ""
-#: apt-pkg/cdrom.cc:633
+#: apt-pkg/cdrom.cc:638 apt-pkg/cdrom.cc:633
msgid "Scanning disc for index files..\n"
msgstr ""
-#: apt-pkg/cdrom.cc:673
+#: apt-pkg/cdrom.cc:678 apt-pkg/cdrom.cc:673
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
"zu signatures\n"
msgstr ""
-#: apt-pkg/cdrom.cc:684
-msgid ""
-"Unable to locate any package files, perhaps this is not a Debian Disc or the "
-"wrong architecture?"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:715 apt-pkg/cdrom.cc:710
#, c-format
msgid "Found label '%s'\n"
msgstr ""
-#: apt-pkg/cdrom.cc:739
+#: apt-pkg/cdrom.cc:744 apt-pkg/cdrom.cc:739
msgid "That is not a valid name, try again.\n"
msgstr ""
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:760 apt-pkg/cdrom.cc:755
#, c-format
msgid ""
"This disc is called: \n"
"'%s'\n"
msgstr ""
-#: apt-pkg/cdrom.cc:759
+#: apt-pkg/cdrom.cc:764 apt-pkg/cdrom.cc:759
msgid "Copying package lists..."
msgstr ""
-#: apt-pkg/cdrom.cc:785
+#: apt-pkg/cdrom.cc:790 apt-pkg/cdrom.cc:785
msgid "Writing new source list\n"
msgstr ""
-#: apt-pkg/cdrom.cc:794
+#: apt-pkg/cdrom.cc:799 apt-pkg/cdrom.cc:794
msgid "Source list entries for this disc are:\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:832 apt-pkg/indexcopy.cc:835
#, c-format
msgid "Wrote %i records.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:834 apt-pkg/indexcopy.cc:837
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:837 apt-pkg/indexcopy.cc:840
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:840 apt-pkg/indexcopy.cc:843
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/deb/dpkgpm.cc:486 apt-pkg/deb/dpkgpm.cc:546
+#: apt-pkg/deb/dpkgpm.cc:558
#, c-format
-msgid "Installing %s"
+msgid "Directory '%s' missing"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:570 apt-pkg/deb/dpkgpm.cc:635
+#: apt-pkg/deb/dpkgpm.cc:654
+#, c-format
+msgid "Preparing %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:571 apt-pkg/deb/dpkgpm.cc:636
+#: apt-pkg/deb/dpkgpm.cc:655
+#, c-format
+msgid "Unpacking %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:641
+#: apt-pkg/deb/dpkgpm.cc:660
+#, c-format
+msgid "Preparing to configure %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:577 apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
+#: 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:579 apt-pkg/deb/dpkgpm.cc:580
+#, c-format
+msgid "Processing triggers for %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:582 apt-pkg/deb/dpkgpm.cc:643
+#: apt-pkg/deb/dpkgpm.cc:662
+#, c-format
+msgid "Installed %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:587 apt-pkg/deb/dpkgpm.cc:589
+#: apt-pkg/deb/dpkgpm.cc:590 apt-pkg/deb/dpkgpm.cc:648
+#: apt-pkg/deb/dpkgpm.cc:667
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:592 apt-pkg/deb/dpkgpm.cc:607
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
+#: apt-pkg/deb/dpkgpm.cc:668
#, c-format
msgid "Removing %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/deb/dpkgpm.cc:593 apt-pkg/deb/dpkgpm.cc:650
+#: apt-pkg/deb/dpkgpm.cc:669
+#, c-format
+msgid "Removed %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:598 apt-pkg/deb/dpkgpm.cc:655
+#: apt-pkg/deb/dpkgpm.cc:674
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:599 apt-pkg/deb/dpkgpm.cc:656
+#: apt-pkg/deb/dpkgpm.cc:675
+#, c-format
+msgid "Completely removed %s"
+msgstr ""
+
+#. populate the "processing" map
+#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:49
+#, c-format
+msgid "Installing %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:608 apt-pkg/deb/dpkgpm.cc:52 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:759 apt-pkg/deb/dpkgpm.cc:822
+#: apt-pkg/deb/dpkgpm.cc:879
+msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
+msgstr ""
+
+#: methods/rred.cc:219
+msgid "Could not patch file"
+msgstr ""
+
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:234
#, c-format
-msgid "Directory '%s' missing"
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:653
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335 apt-pkg/contrib/strutl.cc:346
#, c-format
-msgid "Preparing %s"
+msgid "%lid %lih %limin %lis"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:654
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342 apt-pkg/contrib/strutl.cc:353
#, c-format
-msgid "Unpacking %s"
+msgid "%lih %limin %lis"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:659
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349 apt-pkg/contrib/strutl.cc:360
#, c-format
-msgid "Preparing to configure %s"
+msgid "%limin %lis"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:661
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354 apt-pkg/contrib/strutl.cc:365
#, c-format
-msgid "Installed %s"
+msgid "%lis"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/contrib/fileutl.cc:457 apt-pkg/contrib/fileutl.cc:458
#, c-format
-msgid "Preparing for removal of %s"
+msgid "Sub-process %s received signal %u."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/policy.cc:347
#, c-format
-msgid "Removed %s"
+msgid "Invalid record in the preferences file %s, no Package header"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/indexrecords.cc:40
#, c-format
-msgid "Preparing to completely remove %s"
+msgid "Unable to parse Release file %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/indexrecords.cc:47
#, c-format
-msgid "Completely removed %s"
+msgid "No sections in Release file %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:878
-msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:684
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:851 apt-pkg/deb/dpkgpm.cc:908
msgid "Running dpkg"
msgstr ""
@@ -2787,10 +2839,46 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#: methods/rred.cc:219
-msgid "Could not patch file"
+#: methods/connect.cc:193
+#, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
msgstr ""
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
+#: methods/connect.cc:240
+#, c-format
+msgid "Unable to connect to %s:%s:"
+msgstr ""
+
+#: 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:478
+#, 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/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:52
+#, c-format
+msgid "Completely removing %s"
msgstr ""
diff --git a/po/it.po b/po/it.po
index 0673df460..46fbf62af 100644
--- a/po/it.po
+++ b/po/it.po
@@ -2,14 +2,14 @@
# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 The Free Software Foundation, Inc.
# This file is distributed under the same license as the apt package.
# Samuele Giovanni Tonon <samu@debian.org>, 2002.
-# Milo Casagrande <milo@ubuntu.com>, 2009
#
+# Milo Casagrande <milo@ubuntu.com>, 2009.
msgid ""
msgstr ""
-"Project-Id-Version: apt 0.7.20\n"
+"Project-Id-Version: apt 0.7.23.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-09-27 17:32+0200\n"
-"PO-Revision-Date: 2009-06-04 13:23+0200\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"
"MIME-Version: 1.0\n"
@@ -236,9 +236,8 @@ msgstr ""
"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 "Dare un nome a questo disco, tipo \"Debian 5.0 Disco 1\""
+msgstr "Dare un nome a questo disco, tipo \"Debian 5.0.3 Disco 1\""
#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
@@ -1031,11 +1030,11 @@ msgstr ""
"richiesti:"
#: cmdline/apt-get.cc:1505
-#, fuzzy, c-format
+#, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
msgstr ""
-"I seguenti pacchetti sono stati installati automaticamente e non sono più "
-"richiesti:"
+"%lu pacchetti sono stati installati automaticamente e non sono più "
+"richiesti.\n"
#: cmdline/apt-get.cc:1506
msgid "Use 'apt-get autoremove' to remove them."
@@ -1271,7 +1270,6 @@ msgid "Supported modules:"
msgstr "Moduli supportati:"
#: cmdline/apt-get.cc:2697
-#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1364,6 +1362,10 @@ msgid ""
" Keep also in mind that locking is deactivated,\n"
" so don't depend on the relevance to the real current situation!"
msgstr ""
+"Nota: questa è solo una simulazione.\n"
+" apt-get necessita dei privilegi di root per la normale esecuzione.\n"
+" Inoltre, il meccanismo di blocco non è attivato e non è quindi\n"
+" utile dare importanza a tutto ciò per una situazione reale."
#: cmdline/acqprogress.cc:55
msgid "Hit "
@@ -1448,29 +1450,25 @@ msgstr "Eliminare tutti i file .deb precedentemente scaricati?"
# matter where sentences start, but it has to fit in just these four lines, and
# at only 80 characters per line, if possible.
#: dselect/install:101
-#, fuzzy
msgid "Some errors occurred while unpacking. Packages that were installed"
msgstr ""
-"Si sono verificati alcuni errori nell'estrazione. Verrà tentato di "
-"configurare "
+"Si sono verificati alcuni errori nell'estrazione. Verrà tentata la "
+"configurazione "
#: dselect/install:102
-#, fuzzy
msgid "will be configured. This may result in duplicate errors"
-msgstr ""
-"i pacchetti che sono stati installati. Questo potrebbe generare molteplici "
+msgstr "dei pacchetti installati. Questo potrebbe generare errori duplicati "
#: dselect/install:103
msgid "or errors caused by missing dependencies. This is OK, only the errors"
-msgstr ""
-"errori o errori causati da dipendenze mancanti. Questo non causa problemi, "
+msgstr "o errori causati da dipendenze mancanti. Questo non causa problemi, "
#: dselect/install:104
msgid ""
"above this message are important. Please fix them and run [I]nstall again"
msgstr ""
"gli errori precedenti sono importanti. Correggerli e rieseguire "
-"l'installazione"
+"l'installazione [I]"
#: dselect/update:30
msgid "Merging available information"
@@ -1506,9 +1504,9 @@ msgid "Error reading archive member header"
msgstr "Errore nel leggere l'intestazione member dell'archivio"
#: apt-inst/contrib/arfile.cc:90
-#, fuzzy, c-format
+#, c-format
msgid "Invalid archive member header %s"
-msgstr "Intestazione member dell'archivio non valida"
+msgstr "Intestazione member dell'archivio %s non valida"
#: apt-inst/contrib/arfile.cc:102
msgid "Invalid archive member header"
@@ -1998,9 +1996,9 @@ msgstr ""
"Si è verificato qualcosa di anormale nella risoluzione di \"%s:%s\" (%i)"
#: methods/connect.cc:240
-#, fuzzy, c-format
+#, c-format
msgid "Unable to connect to %s:%s:"
-msgstr "Impossibile connettersi a %s %s:"
+msgstr "Impossibile connettersi a %s:%s:"
#: methods/gpgv.cc:71
#, c-format
@@ -2335,9 +2333,9 @@ msgid "Sub-process %s received a segmentation fault."
msgstr "Il sottoprocesso %s ha ricevuto un segmentation fault."
#: apt-pkg/contrib/fileutl.cc:458
-#, fuzzy, c-format
+#, c-format
msgid "Sub-process %s received signal %u."
-msgstr "Il sottoprocesso %s ha ricevuto un segmentation fault."
+msgstr "Il sottoprocesso %s ha ricevuto il segnale %u."
#: apt-pkg/contrib/fileutl.cc:462
#, c-format
@@ -2432,7 +2430,7 @@ msgstr "Rompe"
#: apt-pkg/pkgcache.cc:227
msgid "Enhances"
-msgstr ""
+msgstr "Migliora"
#: apt-pkg/pkgcache.cc:238
msgid "important"
@@ -2653,9 +2651,11 @@ msgstr ""
"È consigliato eseguire \"apt-get update\" per correggere questi problemi"
#: apt-pkg/policy.cc:347
-#, fuzzy, c-format
+#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "Campo non valido nel file delle preferenze: manca l'header \"Package\""
+msgstr ""
+"Campo non valido nel file delle preferenze %s, manca l'intestazione \"Package"
+"\""
#: apt-pkg/policy.cc:369
#, c-format
@@ -2813,19 +2813,19 @@ msgid "Size mismatch"
msgstr "Le dimensioni non corrispondono"
#: apt-pkg/indexrecords.cc:40
-#, fuzzy, c-format
+#, c-format
msgid "Unable to parse Release file %s"
-msgstr "Impossibile analizzare il file di pacchetto %s (1)"
+msgstr "Impossibile analizzare il file Release %s"
#: apt-pkg/indexrecords.cc:47
-#, fuzzy, c-format
+#, c-format
msgid "No sections in Release file %s"
-msgstr "Nota, viene selezionato %s al posto di %s\n"
+msgstr "Nessuna sezione nel file Release %s"
#: apt-pkg/indexrecords.cc:81
#, c-format
msgid "No Hash entry in Release file %s"
-msgstr ""
+msgstr "Nessuna voce Hash nel file Release %s"
#: apt-pkg/vendorlist.cc:66
#, c-format
@@ -2890,6 +2890,8 @@ msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
msgstr ""
+"Impossibile trovare alcun file di pacchetto. Questo potrebbe non essere un "
+"disco Debian o potrebbe essere l'architettura errata."
#: apt-pkg/cdrom.cc:710
#, c-format
@@ -3015,7 +3017,7 @@ msgstr ""
#: apt-pkg/deb/dpkgpm.cc:907
msgid "Running dpkg"
-msgstr ""
+msgstr "Esecuzione di dpkg"
#: apt-pkg/deb/debsystem.cc:70
#, c-format
@@ -3023,17 +3025,23 @@ msgid ""
"Unable to lock the administration directory (%s), is another process using "
"it?"
msgstr ""
+"Impossibile acquisire il blocco sulla directory di amministrazione (%s). Un "
+"altro processo potrebbe tenerla occupata."
#: apt-pkg/deb/debsystem.cc:73
-#, fuzzy, c-format
+#, c-format
msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Impossibile bloccare la directory"
+msgstr ""
+"Impossibile acquisire il blocco sulla directory di amministrazione (%s). È "
+"necessario essere root."
#: apt-pkg/deb/debsystem.cc:82
msgid ""
"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
"the problem. "
msgstr ""
+"dpkg è stato interrotto. È necessario eseguire \"dpkg --configure -a\" per "
+"correggere il problema. "
#: apt-pkg/deb/debsystem.cc:100
msgid "Not locked"
@@ -3046,9 +3054,3 @@ msgstr "Impossibile applicare la patch al file"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Connessione chiusa prematuramente"
-
-#~ msgid "%4i %s\n"
-#~ msgstr "%4i %s\n"
-
-#~ msgid "Processing triggers for %s"
-#~ msgstr "Elaborazione opzioni addizionali per %s"
diff --git a/po/sk.po b/po/sk.po
index a1f81dd43..4e86e2f00 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-09-27 17:32+0200\n"
-"PO-Revision-Date: 2009-07-21 12:45+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"
@@ -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"
@@ -1014,10 +1013,10 @@ msgstr ""
"Nasledovné balíky boli nainštalované automaticky a už viac nie sú potrebné:"
#: cmdline/apt-get.cc:1505
-#, fuzzy, c-format
+#, 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:1506
msgid "Use 'apt-get autoremove' to remove them."
@@ -1422,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"
@@ -1475,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"
@@ -1963,9 +1961,9 @@ 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
@@ -2295,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
@@ -2605,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
@@ -2759,19 +2757,19 @@ 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
@@ -2836,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
@@ -2960,25 +2960,27 @@ msgstr ""
#: apt-pkg/deb/dpkgpm.cc:907
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"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e53f71554..753bba073 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-09-27 17:32+0200\n"
-"PO-Revision-Date: 2009-06-01 15:54+0800\n"
-"Last-Translator: Deng Xiyue <manphiz-guest@users.alioth.debian.org>\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
@@ -155,7 +156,7 @@ msgstr " %4i %s\n"
#: 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
@@ -526,7 +526,7 @@ msgstr " 达到了 DeLink 的上限 %sB。\n"
#: ftparchive/writer.cc:387
msgid "Archive had no package field"
-msgstr "存档没有包含软件包(package)字段"
+msgstr "归档文件没有包含 package 字段"
#: ftparchive/writer.cc:395 ftparchive/writer.cc:610
#, c-format
@@ -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
@@ -654,12 +654,12 @@ 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,7 +786,7 @@ 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"
@@ -810,16 +810,16 @@ msgstr "内部错误，Ordering 未能完成"
#: 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: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
@@ -844,20 +844,20 @@ msgstr "解压缩后将会空出 %sB 的空间。\n"
#: 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:876
#, c-format
msgid "You don't have enough free space in %s."
-msgstr "您在 %s 中没有足够的空余空间。"
+msgstr "您在 %s 上没有足够的可用空间。"
#: 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:894
msgid "Yes, do as I say!"
-msgstr "Yes, do as I say!"
+msgstr "是，按我说的做！"
#: cmdline/apt-get.cc:896
#, c-format
@@ -885,7 +885,7 @@ msgstr "无法下载 %s %s\n"
#: cmdline/apt-get.cc:1007
msgid "Some files failed to download"
-msgstr "有一些文件下载失败"
+msgstr "有一些文件无法下载"
#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298
msgid "Download complete and in download only mode"
@@ -901,7 +901,7 @@ msgstr ""
#: 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:1023
msgid "Unable to correct missing packages."
@@ -909,7 +909,7 @@ msgstr "无法更正缺少的软件包。"
#: cmdline/apt-get.cc:1024
msgid "Aborting install."
-msgstr "放弃安装。"
+msgstr "中止安装。"
#: cmdline/apt-get.cc:1082
#, c-format
@@ -952,7 +952,7 @@ msgstr ""
#: cmdline/apt-get.cc:1163
msgid "However the following packages replace it:"
-msgstr "可是下列的软件包取代了它："
+msgstr "可是下列软件包取代了它："
#: cmdline/apt-get.cc:1166
#, c-format
@@ -987,11 +987,11 @@ msgstr "选定了版本为 %s (%s) 的 %s\n"
#: cmdline/apt-get.cc:1348
#, c-format
msgid "No source package '%s' picking '%s' instead\n"
-msgstr ""
+msgstr "没有源代码包“%s”，使用“%s”代替\n"
#: cmdline/apt-get.cc:1385
msgid "The update command takes no arguments"
-msgstr " update 命令是不需任何参数的"
+msgstr " update 命令不需要参数"
#: cmdline/apt-get.cc:1398
msgid "Unable to lock the list directory"
@@ -1005,12 +1005,12 @@ msgstr "我们不应该进行删除，无法启动自动删除器"
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
-msgstr "下列软件包是自动安装的并且现在不再被使用了："
+msgstr "下列软件包是自动安装的并且现在不需要了："
#: cmdline/apt-get.cc:1505
-#, fuzzy, c-format
+#, c-format
msgid "%lu packages were automatically installed and are no longer required.\n"
-msgstr "下列软件包是自动安装的并且现在不再被使用了："
+msgstr "%lu 个自动安装的的软件包现在不需要了\n"
#: cmdline/apt-get.cc:1506
msgid "Use 'apt-get autoremove' to remove them."
@@ -1020,7 +1020,7 @@ msgstr "使用'apt-get autoremove'来删除它们"
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)
@@ -1034,15 +1034,15 @@ msgstr "似乎自动删除器毁掉了一些软件，这不应该发生。请向
#.
#: 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:1518
msgid "Internal Error, AutoRemover broke stuff"
-msgstr "内部错误，自动删除器坏事了"
+msgstr "内部错误，自动删除工具坏事了"
#: cmdline/apt-get.cc:1537
msgid "Internal error, AllUpgrade broke stuff"
-msgstr "内部错误，全部升级坏事了"
+msgstr "内部错误，全部升级工具坏事了"
#: cmdline/apt-get.cc:1592
#, c-format
@@ -1083,13 +1083,13 @@ msgid ""
"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:1807
msgid "Broken packages"
-msgstr "无法安装的软件包"
+msgstr "破损的软件包"
#: cmdline/apt-get.cc:1836
msgid "The following extra packages will be installed:"
@@ -1105,7 +1105,7 @@ msgstr "推荐安装的软件包："
#: cmdline/apt-get.cc:1955
msgid "Calculating upgrade... "
-msgstr "正在筹划升级... "
+msgstr "正在对升级进行计算... "
#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112
msgid "Failed"
@@ -1117,7 +1117,7 @@ msgstr "完成"
#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038
msgid "Internal error, problem resolver broke stuff"
-msgstr "内部错误，问题解决器坏事了"
+msgstr "内部错误，问题解决工具坏事了"
#: cmdline/apt-get.cc:2138
msgid "Must specify at least one package to fetch source for"
@@ -1136,7 +1136,7 @@ msgstr "忽略已下载过的文件“%s”\n"
#: 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:2254
#, c-format
@@ -1160,7 +1160,7 @@ msgstr "有一些包文件无法下载。"
#: 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:2334
#, c-format
@@ -1183,12 +1183,12 @@ msgstr "子进程出错"
#: cmdline/apt-get.cc:2387
msgid "Must specify at least one package to check builddeps for"
-msgstr "要检查生成软件包的构建依赖关系(builddeps)，必须指定至少一个软件包"
+msgstr "要检查生成软件包的构建依赖关系，必须指定至少一个软件包"
#: 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:2435
#, c-format
@@ -1214,7 +1214,7 @@ msgstr ""
#: 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:2603
#, c-format
@@ -1232,10 +1232,9 @@ msgstr "无法处理构建依赖关系"
#: cmdline/apt-get.cc:2656
msgid "Supported modules:"
-msgstr "被支持模块："
+msgstr "支持的模块："
#: cmdline/apt-get.cc:2697
-#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1279,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"
@@ -1307,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"
@@ -1316,7 +1315,7 @@ 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:2864
msgid ""
@@ -1325,6 +1324,9 @@ msgid ""
" 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 "
@@ -1361,7 +1363,7 @@ msgid ""
msgstr ""
"更换介质：请把标有\n"
"“%s”\n"
-"的碟片插入驱动器“%s”再按回车键\n"
+"的盘片插入驱动器“%s”再按回车键\n"
#: cmdline/apt-sortpkgs.cc:86
msgid "Unknown package record!"
@@ -1405,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"
@@ -1425,7 +1425,7 @@ msgstr "这个提示之前的错误消息才值得您注意。请更正它们，
#: dselect/update:30
msgid "Merging available information"
-msgstr "正在合并现有信息"
+msgstr "正在合并可用信息"
#: apt-inst/contrib/extracttar.cc:114
msgid "Failed to create pipes"
@@ -1441,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
@@ -1450,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"
@@ -1479,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"
@@ -1492,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
@@ -1517,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
@@ -1527,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
@@ -1545,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
@@ -1624,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
@@ -1639,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
@@ -1653,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"
@@ -1672,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
@@ -1695,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"
@@ -1704,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
@@ -1725,7 +1725,7 @@ 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"
@@ -1760,17 +1760,17 @@ msgstr "无法获知本地主机名"
#: methods/ftp.cc:209 methods/ftp.cc:237
#, c-format
msgid "The server refused the connection and said: %s"
-msgstr "服务器拒绝了我们的连接，它响应道：%s"
+msgstr "服务器拒绝了我们的连接，响应信息为：%s"
#: methods/ftp.cc:215
#, c-format
msgid "USER failed, server said: %s"
-msgstr "USER 指令出错，服务器响应道：%s"
+msgstr "USER 指令出错，服务器响应信息为：%s"
#: methods/ftp.cc:222
#, c-format
msgid "PASS failed, server said: %s"
-msgstr "PASS 指令出错，服务器响应道：%s"
+msgstr "PASS 指令出错，服务器响应信息为：%s"
#: methods/ftp.cc:242
msgid ""
@@ -1782,12 +1782,12 @@ msgstr ""
#: methods/ftp.cc:270
#, c-format
msgid "Login script command '%s' failed, server said: %s"
-msgstr "登录脚本命令“%s”出错，服务器响应道：%s"
+msgstr "登录脚本命令“%s”出错，服务器响应信息为：%s"
#: methods/ftp.cc:296
#, 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
msgid "Connection timeout"
@@ -1811,11 +1811,11 @@ msgstr "协议有误"
#: methods/ftp.cc:451 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
msgid "Could not create a socket"
-msgstr "不能创建套接字"
+msgstr "无法创建套接字"
#: methods/ftp.cc:703
msgid "Could not connect data socket, connection timed out"
@@ -1827,7 +1827,7 @@ msgstr "无法连接被动模式的套接字。"
#: methods/ftp.cc:727
msgid "getaddrinfo was unable to get a listening socket"
-msgstr "getaddrinfo 无法得到侦听套接字"
+msgstr "getaddrinfo 无法得到监听套接字"
#: methods/ftp.cc:741
msgid "Could not bind a socket"
@@ -1835,7 +1835,7 @@ msgstr "无法绑定套接字"
#: methods/ftp.cc:745
msgid "Could not listen on the socket"
-msgstr "无法在套接字上侦听"
+msgstr "无法在套接字上监听"
#: methods/ftp.cc:752
msgid "Could not determine the socket's name"
@@ -1853,7 +1853,7 @@ msgstr "无法识别的地址族 %u (AF_*)"
#: methods/ftp.cc:803
#, c-format
msgid "EPRT failed, server said: %s"
-msgstr "EPRT 指令出错，服务器响应道：%s"
+msgstr "EPRT 指令出错，服务器响应信息为：%s"
#: methods/ftp.cc:823
msgid "Data socket connect timed out"
@@ -1865,12 +1865,12 @@ msgstr "无法接受连接"
#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303
msgid "Problem hashing file"
-msgstr "把文件加入散列表时出错"
+msgstr "把文件加入哈希表时出错"
#: methods/ftp.cc:882
#, c-format
msgid "Unable to fetch file, server said '%s'"
-msgstr "无法获取文件，服务器响应道“%s”"
+msgstr "无法获取文件，服务器响应信息为“%s”"
#: methods/ftp.cc:897 methods/rsh.cc:322
msgid "Data socket timed out"
@@ -1879,7 +1879,7 @@ msgstr "数据套接字超时"
#: methods/ftp.cc:927
#, c-format
msgid "Data transfer failed, server said '%s'"
-msgstr "数据传送出错，服务器响应道“%s”"
+msgstr "数据传送出错，服务器响应信息为“%s”"
#. Get the files information
#: methods/ftp.cc:1002
@@ -1940,26 +1940,26 @@ msgstr "暂时不能解析域名“%s”"
#: methods/connect.cc:193
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
-msgstr "解析“%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."
@@ -1968,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"
@@ -1982,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
@@ -2001,27 +2001,27 @@ msgstr "正在等待报头"
#: methods/http.cc:530
#, c-format
msgid "Got a single header line over %u chars"
-msgstr "受到了一行报头条目，它的长度超过了 %u 个字符"
+msgstr "接收到一行报头行，它的长度超过了 %u 个字符"
#: methods/http.cc:538
msgid "Bad header line"
-msgstr "错误的报头条目"
+msgstr "错误的报头行"
#: methods/http.cc:557 methods/http.cc:564
msgid "The HTTP server sent an invalid reply header"
-msgstr "该 http 服务器发送了一个无效的应答报头"
+msgstr "该 HTTP 服务器发送了一个无效的应答报头"
#: methods/http.cc:593
msgid "The HTTP server sent an invalid Content-Length header"
-msgstr "该 http 服务器发送了一个无效的 Content-Length 报头"
+msgstr "该 HTTP 服务器发送了一个无效的 Content-Length 报头"
#: methods/http.cc:608
msgid "The HTTP server sent an invalid Content-Range header"
-msgstr "该 http 服务器发送了一个无效的 Content-Range 报头"
+msgstr "该 HTTP 服务器发送了一个无效的 Content-Range 报头"
#: methods/http.cc:610
msgid "This HTTP server has broken range support"
-msgstr "该 http 服务器的 range 支持不正常"
+msgstr "该 HTTP 服务器的 range 支持不正常"
#: methods/http.cc:634
msgid "Unknown date format"
@@ -2033,7 +2033,7 @@ msgstr "select 调用出错"
#: methods/http.cc:792
msgid "Connection timed out"
-msgstr "连接服务器超时"
+msgstr "连接超时"
#: methods/http.cc:815
msgid "Error writing to output file"
@@ -2041,11 +2041,11 @@ msgstr "写输出文件时出错"
#: methods/http.cc:846
msgid "Error writing to file"
-msgstr "写文件时出错"
+msgstr "写入文件出错"
#: methods/http.cc:874
msgid "Error writing to the file"
-msgstr "写文件时出错"
+msgstr "写入文件出错"
#: methods/http.cc:888
msgid "Error reading from server. Remote end closed connection"
@@ -2057,7 +2057,7 @@ msgstr "从服务器读取数据出错"
#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215
msgid "Failed to truncate file"
-msgstr "截断文件失败"
+msgstr "无法截断文件"
#: methods/http.cc:1146
msgid "Bad header data"
@@ -2086,37 +2086,37 @@ 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)"
#. 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
@@ -2171,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
@@ -2181,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
@@ -2192,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
@@ -2212,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
@@ -2237,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
@@ -2270,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
@@ -2282,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
@@ -2292,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"
@@ -2317,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"
@@ -2326,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"
@@ -2366,7 +2366,7 @@ msgstr "破坏"
#: apt-pkg/pkgcache.cc:227
msgid "Enhances"
-msgstr ""
+msgstr "增强"
#: apt-pkg/pkgcache.cc:238
msgid "important"
@@ -2374,7 +2374,7 @@ msgstr "重要"
#: apt-pkg/pkgcache.cc:238
msgid "required"
-msgstr "必要"
+msgstr "必需"
#: apt-pkg/pkgcache.cc:238
msgid "standard"
@@ -2427,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
@@ -2457,22 +2457,22 @@ 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)"
+msgstr "在源列表中 %2$s 中第 %1$u 行的格式有误(供应商 ID)"
#: apt-pkg/packagemanager.cc:436
#, c-format
@@ -2520,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
@@ -2552,7 +2552,7 @@ 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
#, c-format
@@ -2570,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."
@@ -2581,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"
@@ -2645,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
@@ -2685,7 +2685,7 @@ 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
@@ -2702,7 +2702,7 @@ msgstr "Hash 校验和不符"
#: 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:1216
#, c-format
@@ -2732,19 +2732,19 @@ 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
@@ -2767,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"
@@ -2793,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
@@ -2809,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
@@ -2817,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
@@ -2825,7 +2827,7 @@ msgid ""
"This disc is called: \n"
"'%s'\n"
msgstr ""
-"这张光盘现在的名字是：\n"
+"这张盘片现在的名字是：\n"
"“%s”\n"
#: apt-pkg/cdrom.cc:759
@@ -2834,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
@@ -2853,12 +2855,12 @@ 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/deb/dpkgpm.cc:49
#, c-format
@@ -2927,33 +2929,33 @@ msgstr "完全删除了 %s"
#: apt-pkg/deb/dpkgpm.cc:878
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
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 ""
+msgstr "未锁定"
#: methods/rred.cc:219
msgid "Could not patch file"
@@ -2981,7 +2983,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"
@@ -2993,7 +2995,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)时出错"
@@ -3002,7 +3004,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 %"
@@ -3030,5 +3032,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-04 22:27:12 +0000