summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.bzrignore1
-rw-r--r--apt-pkg/aptconfiguration.cc56
-rw-r--r--apt-pkg/contrib/configuration.cc27
-rw-r--r--apt-pkg/contrib/configuration.h3
-rw-r--r--apt-pkg/contrib/strutl.cc15
-rw-r--r--apt-pkg/deb/dpkgpm.cc121
-rw-r--r--apt-pkg/deb/dpkgpm.h2
-rw-r--r--apt-pkg/orderlist.cc63
-rw-r--r--apt-pkg/packagemanager.cc37
-rw-r--r--buildlib/po4a_manpage.mak2
-rw-r--r--buildlib/sizetable3
-rw-r--r--debian/changelog24
-rw-r--r--debian/control2
-rwxr-xr-xdebian/prerm15
-rw-r--r--doc/apt-cache.8.xml17
-rw-r--r--doc/apt-get.8.xml55
-rw-r--r--doc/apt.conf.5.xml125
-rw-r--r--doc/apt.ent64
-rw-r--r--doc/apt_preferences.5.xml10
-rw-r--r--doc/examples/configure-index24
-rw-r--r--doc/fr/style.fr.xsl9
-rw-r--r--doc/manpage-style.xsl (renamed from doc/ja/style.ja.xsl)2
-rw-r--r--doc/po/apt-doc.pot2240
-rw-r--r--doc/po/fr.po3955
-rw-r--r--doc/po/ja.po2548
-rw-r--r--methods/rred.cc2
-rw-r--r--po/apt-all.pot62
27 files changed, 5648 insertions, 3836 deletions
diff --git a/.bzrignore b/.bzrignore
index bad8837c6..d004d22f0 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -22,6 +22,7 @@ doc/*/apt.ent
# older translation methods translate in this files
# so we can not ignore it for all translations now
doc/ja/*.xml
+doc/fr/*.xml
# FIXME: files generated by deprecated sgml man pages
doc/es/manpage.links
diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc
index 1a8e8262f..45ae9bed5 100644
--- a/apt-pkg/aptconfiguration.cc
+++ b/apt-pkg/aptconfiguration.cc
@@ -14,6 +14,7 @@
#include <vector>
#include <string>
+#include <algorithm>
/*}}}*/
namespace APT {
// getCompressionTypes - Return Vector of usbale compressiontypes /*{{{*/
@@ -29,41 +30,52 @@ const Configuration::getCompressionTypes(bool const &Cached) {
types.clear();
}
+ // setup the defaults for the compressiontypes => method mapping
+ _config->CndSet("Acquire::CompressionTypes::bz2","bzip2");
+ _config->CndSet("Acquire::CompressionTypes::lzma","lzma");
+ _config->CndSet("Acquire::CompressionTypes::gz","gzip");
+
// Set default application paths to check for optional compression types
_config->CndSet("Dir::Bin::lzma", "/usr/bin/lzma");
_config->CndSet("Dir::Bin::bzip2", "/bin/bzip2");
- ::Configuration::Item const *Opts = _config->Tree("Acquire::CompressionTypes");
- if (Opts != 0)
- Opts = Opts->Child;
+ // accept non-list order as override setting for config settings on commandline
+ std::string const overrideOrder = _config->Find("Acquire::CompressionTypes::Order","");
+ if (overrideOrder.empty() == false)
+ types.push_back(overrideOrder);
- // at first, move over the options to setup at least the default options
- bool foundLzma=false, foundBzip2=false, foundGzip=false;
- for (; Opts != 0; Opts = Opts->Next) {
- if (Opts->Value == "lzma")
- foundLzma = true;
- else if (Opts->Value == "bz2")
- foundBzip2 = true;
- else if (Opts->Value == "gz")
- foundGzip = true;
+ // load the order setting into our vector
+ std::vector<std::string> const order = _config->FindVector("Acquire::CompressionTypes::Order");
+ for (std::vector<std::string>::const_iterator o = order.begin();
+ o != order.end(); o++) {
+ if ((*o).empty() == true)
+ continue;
+ // ignore types we have no method ready to use
+ if (_config->Exists(string("Acquire::CompressionTypes::").append(*o)) == false)
+ continue;
+ // ignore types we have no app ready to use
+ string const appsetting = string("Dir::Bin::").append(*o);
+ if (_config->Exists(appsetting) == true) {
+ std::string const app = _config->FindFile(appsetting.c_str(), "");
+ if (app.empty() == false && FileExists(app) == false)
+ continue;
+ }
+ types.push_back(*o);
}
- // setup the defaults now
- if (!foundBzip2)
- _config->Set("Acquire::CompressionTypes::bz2","bzip2");
- if (!foundLzma)
- _config->Set("Acquire::CompressionTypes::lzma","lzma");
- if (!foundGzip)
- _config->Set("Acquire::CompressionTypes::gz","gzip");
-
- // move again over the option tree to finially calculate our result
+ // move again over the option tree to add all missing compression types
::Configuration::Item const *Types = _config->Tree("Acquire::CompressionTypes");
if (Types != 0)
Types = Types->Child;
for (; Types != 0; Types = Types->Next) {
+ if (Types->Tag == "Order" || Types->Tag.empty() == true)
+ continue;
+ // ignore types we already have in the vector
+ if (std::find(types.begin(),types.end(),Types->Tag) != types.end())
+ continue;
+ // ignore types we have no app ready to use
string const appsetting = string("Dir::Bin::").append(Types->Value);
- // ignore compression types we have no app ready to use
if (appsetting.empty() == false && _config->Exists(appsetting) == true) {
std::string const app = _config->FindFile(appsetting.c_str(), "");
if (app.empty() == false && FileExists(app) == false)
diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index 48a5f0bff..4e8586e83 100644
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -223,6 +223,25 @@ string Configuration::FindDir(const char *Name,const char *Default) const
return Res;
}
/*}}}*/
+// Configuration::FindVector - Find a vector of values /*{{{*/
+// ---------------------------------------------------------------------
+/* Returns a vector of config values under the given item */
+vector<string> Configuration::FindVector(const char *Name) const
+{
+ vector<string> Vec;
+ const Item *Top = Lookup(Name);
+ if (Top == NULL)
+ return Vec;
+
+ Item *I = Top->Child;
+ while(I != NULL)
+ {
+ Vec.push_back(I->Value);
+ I = I->Next;
+ }
+ return Vec;
+}
+ /*}}}*/
// Configuration::FindI - Find an integer value /*{{{*/
// ---------------------------------------------------------------------
/* */
@@ -582,9 +601,11 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool AsSectional,
InQuote = !InQuote;
if (InQuote == true)
continue;
-
- if ((*I == '/' && I + 1 != End && I[1] == '/') || *I == '#')
- {
+
+ if ((*I == '/' && I + 1 != End && I[1] == '/') ||
+ (*I == '#' && strcmp(string(I,I+6).c_str(),"#clear") != 0 &&
+ strcmp(string(I,I+8).c_str(),"#include") != 0))
+ {
End = I;
break;
}
diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h
index 2534692a3..e2da83f5b 100644
--- a/apt-pkg/contrib/configuration.h
+++ b/apt-pkg/contrib/configuration.h
@@ -31,6 +31,7 @@
#include <string>
+#include <vector>
#include <iostream>
using std::string;
@@ -70,6 +71,8 @@ class Configuration
string Find(const string Name,const char *Default = 0) const {return Find(Name.c_str(),Default);};
string FindFile(const char *Name,const char *Default = 0) const;
string FindDir(const char *Name,const char *Default = 0) const;
+ std::vector<string> FindVector(const string &Name) const;
+ std::vector<string> FindVector(const char *Name) const;
int FindI(const char *Name,int Default = 0) const;
int FindI(const string Name,int Default = 0) const {return FindI(Name.c_str(),Default);};
bool FindB(const char *Name,bool Default = false) const;
diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index 1683868c8..4c05f2df8 100644
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -67,9 +67,20 @@ bool UTF8ToCodeset(const char *codeset, const string &orig, string *dest)
outbuf = new char[insize+1];
outptr = outbuf;
- iconv(cd, &inptr, &insize, &outptr, &outsize);
- *outptr = '\0';
+ while (insize != 0)
+ {
+ size_t const err = iconv(cd, &inptr, &insize, &outptr, &outsize);
+ if (err == (size_t)(-1))
+ {
+ insize--;
+ outsize++;
+ inptr++;
+ *outptr = '?';
+ outptr++;
+ }
+ }
+ *outptr = '\0';
*dest = outbuf;
delete[] outbuf;
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index f787f365e..aec4edc49 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -134,8 +134,14 @@ bool pkgDPkgPM::Configure(PkgIterator Pkg)
{
if (Pkg.end() == true)
return false;
-
- List.push_back(Item(Item::Configure,Pkg));
+
+ List.push_back(Item(Item::Configure, Pkg));
+
+ // Use triggers for config calls if we configure "smart"
+ // as otherwise Pre-Depends will not be satisfied, see #526774
+ if (_config->FindB("DPkg::TriggersPending", false) == true)
+ List.push_back(Item(Item::TriggersPending, PkgIterator()));
+
return true;
}
/*}}}*/
@@ -190,6 +196,9 @@ bool pkgDPkgPM::SendV2Pkgs(FILE *F)
// Write out the package actions in order.
for (vector<Item>::iterator I = List.begin(); I != List.end(); I++)
{
+ if(I->Pkg.end() == true)
+ continue;
+
pkgDepCache::StateCache &S = Cache[I->Pkg];
fprintf(F,"%s ",I->Pkg.Name());
@@ -378,10 +387,11 @@ void pkgDPkgPM::DoTerminalPty(int master)
*/
void pkgDPkgPM::ProcessDpkgStatusLine(int OutStatusFd, char *line)
{
+ bool const Debug = _config->FindB("Debug::pkgDPkgProgressReporting",false);
// the status we output
ostringstream status;
- if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true)
+ if (Debug == true)
std::clog << "got from dpkg '" << line << "'" << std::endl;
@@ -396,6 +406,7 @@ void pkgDPkgPM::ProcessDpkgStatusLine(int OutStatusFd, char *line)
'processing: install: pkg'
'processing: configure: pkg'
'processing: remove: pkg'
+ 'processing: purge: pkg' - but for apt is it a ignored "unknown" action
'processing: trigproc: trigger'
*/
@@ -408,28 +419,28 @@ void pkgDPkgPM::ProcessDpkgStatusLine(int OutStatusFd, char *line)
TokSplitString(':', line, list, sizeof(list)/sizeof(list[0]));
if( list[0] == NULL || list[1] == NULL || list[2] == NULL)
{
- if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true)
+ if (Debug == true)
std::clog << "ignoring line: not enough ':'" << std::endl;
return;
}
- char *pkg = list[1];
- char *action = _strstrip(list[2]);
+ const char* const pkg = list[1];
+ const char* action = _strstrip(list[2]);
// 'processing' from dpkg looks like
// 'processing: action: pkg'
if(strncmp(list[0], "processing", strlen("processing")) == 0)
{
char s[200];
- char *pkg_or_trigger = _strstrip(list[2]);
- action =_strstrip( list[1]);
+ const char* const pkg_or_trigger = _strstrip(list[2]);
+ action = _strstrip( list[1]);
const std::pair<const char *, const char *> * const iter =
std::find_if(PackageProcessingOpsBegin,
PackageProcessingOpsEnd,
MatchProcessingOp(action));
if(iter == PackageProcessingOpsEnd)
{
- if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true)
- std::clog << "ignoring unknwon action: " << action << std::endl;
+ if (Debug == true)
+ std::clog << "ignoring unknown action: " << action << std::endl;
return;
}
snprintf(s, sizeof(s), _(iter->second), pkg_or_trigger);
@@ -440,7 +451,7 @@ void pkgDPkgPM::ProcessDpkgStatusLine(int OutStatusFd, char *line)
<< endl;
if(OutStatusFd > 0)
write(OutStatusFd, status.str().c_str(), status.str().size());
- if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true)
+ if (Debug == true)
std::clog << "send: '" << status.str() << "'" << endl;
return;
}
@@ -453,11 +464,11 @@ void pkgDPkgPM::ProcessDpkgStatusLine(int OutStatusFd, char *line)
<< endl;
if(OutStatusFd > 0)
write(OutStatusFd, status.str().c_str(), status.str().size());
- if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true)
+ if (Debug == true)
std::clog << "send: '" << status.str() << "'" << endl;
return;
}
- if(strncmp(action,"conffile",strlen("conffile")) == 0)
+ else if(strncmp(action,"conffile",strlen("conffile")) == 0)
{
status << "pmconffile:" << list[1]
<< ":" << (PackagesDone/float(PackagesTotal)*100.0)
@@ -465,12 +476,12 @@ void pkgDPkgPM::ProcessDpkgStatusLine(int OutStatusFd, char *line)
<< endl;
if(OutStatusFd > 0)
write(OutStatusFd, status.str().c_str(), status.str().size());
- if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true)
+ if (Debug == true)
std::clog << "send: '" << status.str() << "'" << endl;
return;
}
- vector<struct DpkgState> &states = PackageOps[pkg];
+ vector<struct DpkgState> const &states = PackageOps[pkg];
const char *next_action = NULL;
if(PackageOpsDone[pkg] < states.size())
next_action = states[PackageOpsDone[pkg]].state;
@@ -493,15 +504,15 @@ void pkgDPkgPM::ProcessDpkgStatusLine(int OutStatusFd, char *line)
<< endl;
if(OutStatusFd > 0)
write(OutStatusFd, status.str().c_str(), status.str().size());
- if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true)
+ if (Debug == true)
std::clog << "send: '" << status.str() << "'" << endl;
}
- if (_config->FindB("Debug::pkgDPkgProgressReporting",false) == true)
+ if (Debug == true)
std::clog << "(parsed from dpkg) pkg: " << pkg
<< " action: " << action << endl;
}
-
-// DPkgPM::DoDpkgStatusFd /*{{{*/
+ /*}}}*/
+// DPkgPM::DoDpkgStatusFd /*{{{*/
// ---------------------------------------------------------------------
/*
*/
@@ -538,7 +549,7 @@ void pkgDPkgPM::DoDpkgStatusFd(int statusfd, int OutStatusFd)
dpkgbuf_pos = dpkgbuf+dpkgbuf_pos-p;
}
/*}}}*/
-
+// DPkgPM::OpenLog /*{{{*/
bool pkgDPkgPM::OpenLog()
{
string logdir = _config->FindDir("Dir::Log");
@@ -561,7 +572,8 @@ bool pkgDPkgPM::OpenLog()
}
return true;
}
-
+ /*}}}*/
+// DPkg::CloseLog /*{{{*/
bool pkgDPkgPM::CloseLog()
{
if(term_out)
@@ -578,7 +590,7 @@ bool pkgDPkgPM::CloseLog()
term_out = NULL;
return true;
}
-
+ /*}}}*/
/*{{{*/
// This implements a racy version of pselect for those architectures
// that don't have a working implementation.
@@ -600,7 +612,6 @@ static int racy_pselect(int nfds, fd_set *readfds, fd_set *writefds,
return retval;
}
/*}}}*/
-
// DPkgPM::Go - Run the sequence /*{{{*/
// ---------------------------------------------------------------------
/* This globs the operations and calls dpkg
@@ -617,9 +628,9 @@ bool pkgDPkgPM::Go(int OutStatusFd)
sigset_t sigmask;
sigset_t original_sigmask;
- unsigned int MaxArgs = _config->FindI("Dpkg::MaxArgs",8*1024);
- unsigned int MaxArgBytes = _config->FindI("Dpkg::MaxArgBytes",32*1024);
- bool NoTriggers = _config->FindB("DPkg::NoTriggers",false);
+ unsigned int const MaxArgs = _config->FindI("Dpkg::MaxArgs",8*1024);
+ unsigned int const MaxArgBytes = _config->FindI("Dpkg::MaxArgBytes",32*1024);
+ bool const NoTriggers = _config->FindB("DPkg::NoTriggers", false);
if (RunScripts("DPkg::Pre-Invoke") == false)
return false;
@@ -627,6 +638,12 @@ bool pkgDPkgPM::Go(int OutStatusFd)
if (RunScriptsWithPkgs("DPkg::Pre-Install-Pkgs") == false)
return false;
+ // support subpressing of triggers processing for special
+ // cases like d-i that runs the triggers handling manually
+ bool const SmartConf = (_config->Find("PackageManager::Configure", "all") != "all");
+ if (_config->FindB("DPkg::ConfigurePending", SmartConf) == true)
+ List.push_back(Item(Item::ConfigurePending, PkgIterator()));
+
// map the dpkg states to the operations that are performed
// (this is sorted in the same way as Item::Ops)
static const struct DpkgState DpkgStatesOpMap[][7] = {
@@ -662,16 +679,19 @@ bool pkgDPkgPM::Go(int OutStatusFd)
// that will be [installed|configured|removed|purged] and add
// them to the PackageOps map (the dpkg states it goes through)
// and the PackageOpsTranslations (human readable strings)
- for (vector<Item>::iterator I = List.begin(); I != List.end();I++)
+ for (vector<Item>::const_iterator I = List.begin(); I != List.end();I++)
{
- string name = (*I).Pkg.Name();
+ if((*I).Pkg.end() == true)
+ continue;
+
+ string const name = (*I).Pkg.Name();
PackageOpsDone[name] = 0;
for(int i=0; (DpkgStatesOpMap[(*I).Op][i]).state != NULL; i++)
{
PackageOps[name].push_back(DpkgStatesOpMap[(*I).Op][i]);
PackagesTotal++;
}
- }
+ }
stdin_is_dev_null = false;
@@ -679,9 +699,9 @@ bool pkgDPkgPM::Go(int OutStatusFd)
OpenLog();
// this loop is runs once per operation
- for (vector<Item>::iterator I = List.begin(); I != List.end();)
+ for (vector<Item>::const_iterator I = List.begin(); I != List.end();)
{
- vector<Item>::iterator J = I;
+ vector<Item>::const_iterator J = I;
for (; J != List.end() && J->Op == I->Op; J++)
/* nothing */;
@@ -700,7 +720,7 @@ bool pkgDPkgPM::Go(int OutStatusFd)
unsigned int n = 0;
unsigned long Size = 0;
- string Tmp = _config->Find("Dir::Bin::dpkg","dpkg");
+ string const Tmp = _config->Find("Dir::Bin::dpkg","dpkg");
Args[n++] = Tmp.c_str();
Size += strlen(Args[n-1]);
@@ -750,11 +770,23 @@ bool pkgDPkgPM::Go(int OutStatusFd)
case Item::Configure:
Args[n++] = "--configure";
- if (NoTriggers)
- Args[n++] = "--no-triggers";
Size += strlen(Args[n-1]);
break;
-
+
+ case Item::ConfigurePending:
+ Args[n++] = "--configure";
+ Size += strlen(Args[n-1]);
+ Args[n++] = "--pending";
+ Size += strlen(Args[n-1]);
+ break;
+
+ case Item::TriggersPending:
+ Args[n++] = "--triggers-only";
+ Size += strlen(Args[n-1]);
+ Args[n++] = "--pending";
+ Size += strlen(Args[n-1]);
+ break;
+
case Item::Install:
Args[n++] = "--unpack";
Size += strlen(Args[n-1]);
@@ -762,7 +794,14 @@ bool pkgDPkgPM::Go(int OutStatusFd)
Size += strlen(Args[n-1]);
break;
}
-
+
+ if (NoTriggers == true && I->Op != Item::TriggersPending &&
+ I->Op != Item::ConfigurePending)
+ {
+ Args[n++] = "--no-triggers";
+ Size += strlen(Args[n-1]);
+ }
+
// Write in the file or package names
if (I->Op == Item::Install)
{
@@ -778,6 +817,8 @@ bool pkgDPkgPM::Go(int OutStatusFd)
{
for (;I != J && Size < MaxArgBytes; I++)
{
+ if((*I).Pkg.end() == true)
+ continue;
Args[n++] = I->Pkg.Name();
Size += strlen(Args[n-1]);
}
@@ -913,11 +954,9 @@ bool pkgDPkgPM::Go(int OutStatusFd)
int Status = 0;
// we read from dpkg here
- int _dpkgin = fd[0];
+ int const _dpkgin = fd[0];
close(fd[1]); // close the write end of the pipe
- // the result of the waitpid call
- int res;
if(slave > 0)
close(slave);
@@ -925,6 +964,8 @@ bool pkgDPkgPM::Go(int OutStatusFd)
sigemptyset(&sigmask);
sigprocmask(SIG_BLOCK,&sigmask,&original_sigmask);
+ // the result of the waitpid call
+ int res;
int select_ret;
while ((res=waitpid(Child,&Status, WNOHANG)) != Child) {
if(res < 0) {
@@ -991,7 +1032,7 @@ bool pkgDPkgPM::Go(int OutStatusFd)
// if it was set to "keep-dpkg-runing" then we won't return
// here but keep the loop going and just report it as a error
// for later
- bool stopOnError = _config->FindB("Dpkg::StopOnError",true);
+ bool const stopOnError = _config->FindB("Dpkg::StopOnError",true);
if(stopOnError)
RunScripts("DPkg::Post-Invoke");
diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h
index ebc7e32bf..43e5c7d45 100644
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -53,7 +53,7 @@ class pkgDPkgPM : public pkgPackageManager
struct Item
{
- enum Ops {Install, Configure, Remove, Purge} Op;
+ enum Ops {Install, Configure, Remove, Purge, ConfigurePending, TriggersPending} Op;
string File;
PkgIterator Pkg;
Item(Ops Op,PkgIterator Pkg,string File = "") : Op(Op),
diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc
index 01b150722..0ee2e2bc8 100644
--- a/apt-pkg/orderlist.cc
+++ b/apt-pkg/orderlist.cc
@@ -174,22 +174,35 @@ bool pkgOrderList::DoRun()
bool pkgOrderList::OrderCritical()
{
FileList = 0;
-
- Primary = &pkgOrderList::DepUnPackPre;
+
+ Primary = &pkgOrderList::DepUnPackPreD;
Secondary = 0;
RevDepends = 0;
Remove = 0;
LoopCount = 0;
-
+
// Sort
Me = this;
- qsort(List,End - List,sizeof(*List),&OrderCompareB);
-
+ qsort(List,End - List,sizeof(*List),&OrderCompareB);
+
if (DoRun() == false)
return false;
-
+
if (LoopCount != 0)
return _error->Error("Fatal, predepends looping detected");
+
+ if (Debug == true)
+ {
+ clog << "** Critical Unpack ordering done" << endl;
+
+ for (iterator I = List; I != End; I++)
+ {
+ PkgIterator P(Cache,*I);
+ if (IsNow(P) == true)
+ clog << " " << P.Name() << ' ' << IsMissing(P) << ',' << IsFlag(P,After) << endl;
+ }
+ }
+
return true;
}
/*}}}*/
@@ -205,7 +218,7 @@ bool pkgOrderList::OrderUnpack(string *FileList)
if (FileList != 0)
{
WipeFlags(After);
-
+
// Set the inlist flag
for (iterator I = List; I != End; I++)
{
@@ -214,7 +227,7 @@ bool pkgOrderList::OrderUnpack(string *FileList)
Flag(*I,After);
}
}
-
+
Primary = &pkgOrderList::DepUnPackCrit;
Secondary = &pkgOrderList::DepConfigure;
RevDepends = &pkgOrderList::DepUnPackDep;
@@ -229,7 +242,7 @@ bool pkgOrderList::OrderUnpack(string *FileList)
clog << "** Pass A" << endl;
if (DoRun() == false)
return false;
-
+
if (Debug == true)
clog << "** Pass B" << endl;
Secondary = 0;
@@ -243,7 +256,7 @@ bool pkgOrderList::OrderUnpack(string *FileList)
Remove = 0; // Otherwise the libreadline remove problem occures
if (DoRun() == false)
return false;
-
+
if (Debug == true)
clog << "** Pass D" << endl;
LoopCount = 0;
@@ -259,9 +272,9 @@ bool pkgOrderList::OrderUnpack(string *FileList)
{
PkgIterator P(Cache,*I);
if (IsNow(P) == true)
- clog << P.Name() << ' ' << IsMissing(P) << ',' << IsFlag(P,After) << endl;
+ clog << " " << P.Name() << ' ' << IsMissing(P) << ',' << IsFlag(P,After) << endl;
}
- }
+ }
return true;
}
@@ -286,29 +299,35 @@ bool pkgOrderList::OrderConfigure()
/* Higher scores order earlier */
int pkgOrderList::Score(PkgIterator Pkg)
{
+ static int const ScoreDelete = _config->FindI("OrderList::Score::Delete", 500);
+
// Removal is always done first
if (Cache[Pkg].Delete() == true)
- return 200;
-
+ return ScoreDelete;
+
// This should never happen..
if (Cache[Pkg].InstVerIter(Cache).end() == true)
return -1;
-
+
+ static int const ScoreEssential = _config->FindI("OrderList::Score::Essential", 200);
+ static int const ScoreImmediate = _config->FindI("OrderList::Score::Immediate", 10);
+ static int const ScorePreDepends = _config->FindI("OrderList::Score::PreDepends", 50);
+
int Score = 0;
if ((Pkg->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential)
- Score += 100;
+ Score += ScoreEssential;
if (IsFlag(Pkg,Immediate) == true)
- Score += 10;
-
- for (DepIterator D = Cache[Pkg].InstVerIter(Cache).DependsList();
+ Score += ScoreImmediate;
+
+ for (DepIterator D = Cache[Pkg].InstVerIter(Cache).DependsList();
D.end() == false; D++)
if (D->Type == pkgCache::Dep::PreDepends)
{
- Score += 50;
+ Score += ScorePreDepends;
break;
}
-
+
// Important Required Standard Optional Extra
signed short PrioMap[] = {0,5,4,3,1,0};
if (Cache[Pkg].InstVerIter(Cache)->Priority <= 5)
@@ -386,6 +405,7 @@ int pkgOrderList::OrderCompareA(const void *a, const void *b)
int ScoreA = Me->Score(A);
int ScoreB = Me->Score(B);
+
if (ScoreA > ScoreB)
return -1;
@@ -422,6 +442,7 @@ int pkgOrderList::OrderCompareB(const void *a, const void *b)
int ScoreA = Me->Score(A);
int ScoreB = Me->Score(B);
+
if (ScoreA > ScoreB)
return -1;
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index cc9ce21c7..442143516 100644
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -57,7 +57,10 @@ bool pkgPackageManager::GetArchives(pkgAcquire *Owner,pkgSourceList *Sources,
if (CreateOrderList() == false)
return false;
- if (List->OrderUnpack() == false)
+ bool const ordering =
+ _config->FindB("PackageManager::UnpackAll",true) ?
+ List->OrderUnpack() : List->OrderCritical();
+ if (ordering == false)
return _error->Error("Internal ordering error");
for (pkgOrderList::iterator I = List->begin(); I != List->end(); I++)
@@ -163,7 +166,7 @@ bool pkgPackageManager::CreateOrderList()
delete List;
List = new pkgOrderList(&Cache);
- bool NoImmConfigure = !_config->FindB("APT::Immediate-Configure",true);
+ static bool const NoImmConfigure = !_config->FindB("APT::Immediate-Configure",true);
// Generate the list of affected packages and sort it
for (PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
@@ -266,13 +269,16 @@ bool pkgPackageManager::ConfigureAll()
if (OList.OrderConfigure() == false)
return false;
-
+
+ std::string const conf = _config->Find("PackageManager::Configure","all");
+ bool const ConfigurePkgs = (conf == "all");
+
// Perform the configuring
for (pkgOrderList::iterator I = OList.begin(); I != OList.end(); I++)
{
PkgIterator Pkg(Cache,*I);
- if (Configure(Pkg) == false)
+ if (ConfigurePkgs == true && Configure(Pkg) == false)
return false;
List->Flag(Pkg,pkgOrderList::Configured,pkgOrderList::States);
@@ -291,16 +297,20 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg)
if (DepAdd(OList,Pkg) == false)
return false;
-
- if (OList.OrderConfigure() == false)
- return false;
-
+
+ static std::string const conf = _config->Find("PackageManager::Configure","all");
+ static bool const ConfigurePkgs = (conf == "all" || conf == "smart");
+
+ if (ConfigurePkgs == true)
+ if (OList.OrderConfigure() == false)
+ return false;
+
// Perform the configuring
for (pkgOrderList::iterator I = OList.begin(); I != OList.end(); I++)
{
PkgIterator Pkg(Cache,*I);
- if (Configure(Pkg) == false)
+ if (ConfigurePkgs == true && Configure(Pkg) == false)
return false;
List->Flag(Pkg,pkgOrderList::Configured,pkgOrderList::States);
@@ -577,9 +587,12 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
Reset();
if (Debug == true)
- clog << "Begining to order" << endl;
+ clog << "Beginning to order" << endl;
- if (List->OrderUnpack(FileNames) == false)
+ bool const ordering =
+ _config->FindB("PackageManager::UnpackAll",true) ?
+ List->OrderUnpack(FileNames) : List->OrderCritical();
+ if (ordering == false)
{
_error->Error("Internal ordering error");
return Failed;
@@ -632,7 +645,7 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
return Failed;
DoneSomething = true;
}
-
+
// Final run through the configure phase
if (ConfigureAll() == false)
return Failed;
diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak
index 3ea4e2cb5..538859b6e 100644
--- a/buildlib/po4a_manpage.mak
+++ b/buildlib/po4a_manpage.mak
@@ -16,7 +16,7 @@ INCLUDES = apt.ent
# Do not use XMLTO, build the manpages directly with XSLTPROC
ifdef XSLTPROC
-STYLESHEET=./style.$(LC).xsl
+STYLESHEET=../manpage-style.xsl
LOCAL := po4a-manpage-$(firstword $(SOURCE))
$(LOCAL)-LIST := $(SOURCE)
diff --git a/buildlib/sizetable b/buildlib/sizetable
index b5782360c..372ddd091 100644
--- a/buildlib/sizetable
+++ b/buildlib/sizetable
@@ -11,6 +11,7 @@
# The format is:-
# CPU endian sizeof: char, int, short, long
i386 little 1 4 2 4
+amd64 little 1 4 2 8
armeb big 1 4 2 4
arm little 1 4 2 4
alpha little 1 4 2 8
@@ -21,4 +22,4 @@ m68k big 1 4 2 4
powerpc big 1 4 2 4
mips big 1 4 2 4
hppa big 1 4 2 4
-m32r big 1 4 2 4 \ No newline at end of file
+m32r big 1 4 2 4
diff --git a/debian/changelog b/debian/changelog
index ac97dfc1b..90e5f8de1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,30 @@ apt (0.7.24) UNRELEASED; urgency=low
- activate DOT_MULTI_TARGETS, it is default on since doxygen 1.5.9
* buildlib/po4a_manpage.mak, doc/makefile, configure:
- simplify the makefiles needed for po4a manpages
+ * apt-pkg/contrib/configuration.cc:
+ - add a helper to easily get a vector of strings from the config
+ * apt-pkg/contrib/strutl.cc:
+ - replace unknown multibytes with ? in UTF8ToCharset (Closes: #545208)
+ * doc/apt-get.8.xml:
+ - fix two little typos in the --simulate description.
+ * apt-pkg/aptconfiguration.cc, doc/apt.conf.5.xml:
+ - add an order subgroup to the compression types to simplify reordering
+ a bit and improve the documentation for this option group.
+ * doc/apt.ent, all man pages:
+ - move the description of files to globally usable entities
+ * doc/apt_preferences.5.xml:
+ - document the new preferences.d folder (Closes: #544017)
+ * methods/rred.cc:
+ - add at the top without failing (by Bernhard R. Link, Closes: #545694)
+ * buildlib/sizetable:
+ - add amd64 for cross building (by Mikhail Gusarov, Closes: #513058)
+ * debian/prerm:
+ - remove file as nobody will upgrade from 0.4.10 anymore
+ * debian/control:
+ - remove gnome-apt suggestion as it was removed from debian
+ * apt-pkg/deb/dpkgpm.cc, apt-pkg/packagemanager.cc, apt-pkg/orderlist.cc:
+ - add and document _experimental_ options to make (aggressive)
+ use of dpkg's trigger and configuration handling (Closes: #473461)
[ Christian Perrier ]
* doc/fr/*, doc/po/fr.po:
diff --git a/debian/control b/debian/control
index bcf89da9b..a9c82f9e8 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Depends: ${shlibs:Depends}, debian-archive-keyring
Priority: important
Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7)
Provides: ${libapt-pkg:provides}
-Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt
+Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt
Section: admin
Description: Advanced front-end for dpkg
This is Debian's next generation front-end for the dpkg package manager.
diff --git a/debian/prerm b/debian/prerm
deleted file mode 100755
index 4a8d47782..000000000
--- a/debian/prerm
+++ /dev/null
@@ -1,15 +0,0 @@
-#! /bin/sh
-
-set -e
-
-#DEBHELPER#
-
-if [ "$1" = "upgrade" -o "$1" = "failed-upgrade" ] &&
- dpkg --compare-versions "$2" "<<" 0.4.10
-then
- if [ ! -d /var/state/apt/ ]; then
- ln -s /var/lib/apt /var/state/apt
- touch /var/lib/apt/lists/partial/.delete-me-later
- fi
-fi
-
diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml
index 8b76f55b9..26d55a519 100644
--- a/doc/apt-cache.8.xml
+++ b/doc/apt-cache.8.xml
@@ -357,21 +357,8 @@ Reverse Provides:
<refsect1><title>Files</title>
<variablelist>
- <varlistentry><term><filename>/etc/apt/sources.list</filename></term>
- <listitem><para>Locations to fetch packages from.
- Configuration Item: <literal>Dir::Etc::SourceList</literal>.</para></listitem>
- </varlistentry>
-
- <varlistentry><term><filename>&statedir;/lists/</filename></term>
- <listitem><para>Storage area for state information for each package resource specified in
- &sources-list;
- Configuration Item: <literal>Dir::State::Lists</literal>.</para></listitem>
- </varlistentry>
-
- <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>
- <listitem><para>Storage area for state information in transit.
- Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>
- </varlistentry>
+ &file-sourceslist;
+ &file-statelists;
</variablelist>
</refsect1>
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index b87e17247..ec773edeb 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -384,9 +384,9 @@
Configuration Item: <literal>APT::Get::Simulate</literal>.</para>
<para>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
+ automatic. Also a notice will be displayed indicating that this is only a simulation,
+ if the option <literal>APT::Get::Show-User-Simulation-Note</literal> is set (Default: true).
+ Neither NoLocking nor the notice will be triggered if run as root (root should know what
he is doing without further warnings by <literal>apt-get</literal>).</para>
<para>Simulate prints out
@@ -558,50 +558,11 @@
<refsect1><title>Files</title>
<variablelist>
- <varlistentry><term><filename>/etc/apt/sources.list</filename></term>
- <listitem><para>Locations to fetch packages from.
- Configuration Item: <literal>Dir::Etc::SourceList</literal>.</para></listitem>
- </varlistentry>
-
- <varlistentry><term><filename>/etc/apt/apt.conf</filename></term>
- <listitem><para>APT configuration file.
- Configuration Item: <literal>Dir::Etc::Main</literal>.</para></listitem>
- </varlistentry>
-
- <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>
- <listitem><para>APT configuration file fragments.
- Configuration Item: <literal>Dir::Etc::Parts</literal>.</para></listitem>
- </varlistentry>
-
- <varlistentry><term><filename>/etc/apt/preferences</filename></term>
- <listitem><para>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>.</para></listitem>
- </varlistentry>
-
- <varlistentry><term><filename>&cachedir;/archives/</filename></term>
- <listitem><para>Storage area for retrieved package files.
- Configuration Item: <literal>Dir::Cache::Archives</literal>.</para></listitem>
- </varlistentry>
-
- <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>
- <listitem><para>Storage area for package files in transit.
- Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>
- </varlistentry>
-
- <varlistentry><term><filename>&statedir;/lists/</filename></term>
- <listitem><para>Storage area for state information for each package resource specified in
- &sources-list;
- Configuration Item: <literal>Dir::State::Lists</literal>.</para></listitem>
- </varlistentry>
-
- <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>
- <listitem><para> Storage area for state information in transit.
- Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>
- </varlistentry>
+ &file-sourceslist;
+ &file-aptconf;
+ &file-preferences;
+ &file-cachearchives;
+ &file-statelists;
</variablelist>
</refsect1>
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index e0ce0db40..67aa933cc 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -21,7 +21,7 @@
&apt-email;
&apt-product;
<!-- The last update date -->
- <date>10 December 2008</date>
+ <date>18 September 2009</date>
</refentryinfo>
<refmeta>
@@ -90,7 +90,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
<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.</para>
+ specified element and all its descendants are erased.</para>
<para>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
@@ -312,16 +312,30 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
<varlistentry><term>CompressionTypes</term>
<listitem><para>List of compression types which are understood by the acquire methods.
Files like <filename>Packages</filename> can be available in various compression formats.
- This list defines in which order the acquire methods will try to download these files.
- Per default <command>bzip2</command> compressed files will be prefered over
- <command>lzma</command>, <command>gzip</command> and uncompressed files. The syntax for
- the configuration fileentry is
+ Per default the acquire methods can decompress <command>bzip2</command>, <command>lzma</command>
+ and <command>gzip</command> compressed files, with this setting more formats can be added
+ on the fly or the used method can be changed. The syntax for this is:
<synopsis>Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> "<replaceable>Methodname</replaceable>";</synopsis>
- e.g. <synopsis>Acquire::CompressionTypes::bz2 "bzip2";</synopsis>
- Note that at runtime the <literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will
+ </para><para>Also the <literal>Order</literal> subgroup can be used to define in which order
+ the acquire system will try to download the compressed files. The acquire system will try the first
+ and proceed with the next compression type in this list on error, so to prefer one over the other type
+ simple add the preferred type at first - not already added default types will be added at run time
+ to the end of the list, so e.g. <synopsis>Acquire::CompressionTypes::Order:: "gz";</synopsis> can
+ be used to prefer <command>gzip</command> compressed files over <command>bzip2</command> and <command>lzma</command>.
+ If <command>lzma</command> should be preferred over <command>gzip</command> and <command>bzip2</command> the
+ configure setting should look like this <synopsis>Acquire::CompressionTypes::Order { "lzma"; "gz"; };</synopsis>
+ It is not needed to add <literal>bz2</literal> explicit to the list as it will be added automatic.</para>
+ <para>Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will
be checked: If this setting exists the method will only be used if this file exists, e.g. for
- the bzip2 method above (the inbuilt) setting is <literallayout>Dir::Bin::bzip2 "/bin/bzip2";</literallayout>
- </para></listitem>
+ the bzip2 method (the inbuilt) setting is <literallayout>Dir::Bin::bzip2 "/bin/bzip2";</literallayout>
+ Note also that list entries specified on the commandline will be added at the end of the list
+ specified in the configuration files, but before the default entries. To prefer a type in this case
+ over the ones specified in in the configuration files you can set the option direct - not in list style.
+ This will not override the defined list, it will only prefix the list with this type.</para>
+ <para>While it is possible to add an empty compression type to the order list, but APT in its current
+ version doesn't understand it correctly and will display many warnings about not downloaded files -
+ these warnings are most of the time false negatives. Future versions will maybe include a way to
+ really prefer uncompressed files to support the usage of local mirrors.</para></listitem>
</varlistentry>
</variablelist>
</para>
@@ -450,6 +464,87 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
the default is to disable signing and produce all binaries.</para></listitem>
</varlistentry>
</variablelist>
+
+ <refsect2><title>dpkg trigger usage (and related options)</title>
+ <para>APT can call dpkg in a way so it can make aggressive use of triggers over
+ multiply calls of dpkg. Without further options dpkg will use triggers only in between his
+ own run. Activating these options can therefore decrease the time needed to perform the
+ install / upgrade. Note that it is intended to activate these options per default in the
+ future, but as it changes the way APT calling dpkg drastical it needs a lot more testing.
+ <emphasis>These options are therefore currently experimental and should not be used in
+ productive environments.</emphasis> Also it breaks the progress reporting so all frontends will
+ currently stay around half (or more) of the time in the 100% state while it actually configures
+ all packages.</para>
+ <para>Note that it is not garanteed that APT will support these options or that these options will
+ not cause (big) trouble in the future. If you have understand the current risks and problems with
+ these options, but are brave enough to help testing them create a new configuration file and test a
+ combination of options. Please report any bugs, problems and improvements you encounter and make sure
+ to note which options you have used in your reports. Asking dpkg for help could also be useful for
+ debugging proposes, see e.g. <command>dpkg --audit</command>. A defensive option combination would be
+<literallayout>DPkg::NoTriggers "true";
+PackageManager::Configure "smart";
+DPkg::ConfigurePending "true";
+DPkg::TriggersPending "true";</literallayout></para>
+
+ <variablelist>
+ <varlistentry><term>DPkg::NoTriggers</term>
+ <listitem><para>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.</para></listitem>
+ </varlistentry>
+ <varlistentry><term>PackageManager::Configure</term>
+ <listitem><para>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!
+ </para></listitem>
+ </varlistentry>
+ <varlistentry><term>DPkg::ConfigurePending</term>
+ <listitem><para>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.</para></listitem>
+ </varlistentry>
+ <varlistentry><term>DPkg::TriggersPending</term>
+ <listitem><para>Useful for <literal>smart</literal> configuration as a package which has pending
+ triggers is not considered as <literal>installed</literal> and dpkg treats them as <literal>unpacked</literal>
+ currently which is a dealbreaker for Pre-Dependencies (see debbugs #526774). Note that this will
+ process all triggers, not only the triggers needed to configure this package.</para></listitem>
+ </varlistentry>
+ <varlistentry><term>PackageManager::UnpackAll</term>
+ <listitem><para>As the configuration can be deferred to be done at the end by dpkg it can be
+ tried to order the unpack series only by critical needs, e.g. by Pre-Depends. Default is true
+ and therefore the "old" method of ordering in verious steps by everything. While both method
+ were present in earlier APT versions the <literal>OrderCritical</literal> method was unused, so
+ this method is very experimental and needs further improvements before becoming really useful.
+ </para></listitem>
+ </varlistentry>
+ <varlistentry><term>OrderList::Score::Immediate</term>
+ <listitem><para>Essential packages (and there dependencies) should be configured immediately
+ after unpacking. It will be a good idea to do this quite early in the upgrade process as these
+ these configure calls require currently also <literal>DPkg::TriggersPending</literal> which
+ will run quite a few triggers (which maybe not needed). Essentials get per default a high score
+ but the immediate flag is relativly low (a package which has a Pre-Depends is higher rated).
+ These option and the others in the same group can be used to change the scoring. The following
+ example shows the settings with there default values.
+ <literallayout>OrderList::Score {
+ Delete 500;
+ Essential 200;
+ Immediate 10;
+ PreDepends 50;
+};</literallayout>
+ </para></listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect2>
</refsect1>
<refsect1>
@@ -844,15 +939,7 @@ is commented.
<refsect1><title>Files</title>
<variablelist>
- <varlistentry><term><filename>/etc/apt/apt.conf</filename></term>
- <listitem><para>APT configuration file.
- Configuration Item: <literal>Dir::Etc::Main</literal>.</para></listitem>
- </varlistentry>
-
- <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>
- <listitem><para>APT configuration file fragments.
- Configuration Item: <literal>Dir::Etc::Parts</literal>.</para></listitem>
- </varlistentry>
+ &file-aptconf;
</variablelist>
</refsect1>
diff --git a/doc/apt.ent b/doc/apt.ent
index 43ac2f8e5..9a4c17bcd 100644
--- a/doc/apt.ent
+++ b/doc/apt.ent
@@ -289,3 +289,67 @@
</para>
">
+<!ENTITY file-aptconf "
+ <varlistentry><term><filename>/etc/apt/apt.conf</filename></term>
+ <listitem><para>APT configuration file.
+ Configuration Item: <literal>Dir::Etc::Main</literal>.</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>
+ <listitem><para>APT configuration file fragments.
+ Configuration Item: <literal>Dir::Etc::Parts</literal>.</para></listitem>
+ </varlistentry>
+">
+
+<!ENTITY file-cachearchives "
+ <varlistentry><term><filename>&cachedir;/archives/</filename></term>
+ <listitem><para>Storage area for retrieved package files.
+ Configuration Item: <literal>Dir::Cache::Archives</literal>.</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>
+ <listitem><para>Storage area for package files in transit.
+ Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>
+ </varlistentry>
+">
+
+<!ENTITY file-preferences "
+ <varlistentry><term><filename>/etc/apt/preferences</filename></term>
+ <listitem><para>Version preferences file.
+ This is where you would specify &quot;pinning&quot;,
+ 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>.</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>
+ <listitem><para>File fragments for the version preferences.
+ Configuration Item: <literal>Dir::Etc::PreferencesParts</literal>.</para></listitem>
+ </varlistentry>
+">
+
+<!ENTITY file-sourceslist "
+ <varlistentry><term><filename>/etc/apt/sources.list</filename></term>
+ <listitem><para>Locations to fetch packages from.
+ Configuration Item: <literal>Dir::Etc::SourceList</literal>.</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>
+ <listitem><para>File fragments for locations to fetch packages from.
+ Configuration Item: <literal>Dir::Etc::SourceParts</literal>.</para></listitem>
+ </varlistentry>
+">
+
+<!ENTITY file-statelists "
+ <varlistentry><term><filename>&statedir;/lists/</filename></term>
+ <listitem><para>Storage area for state information for each package resource specified in
+ &sources-list;
+ Configuration Item: <literal>Dir::State::Lists</literal>.</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>
+ <listitem><para>Storage area for state information in transit.
+ Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>
+ </varlistentry>
+">
diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml
index 12ea606b7..159d61f2b 100644
--- a/doc/apt_preferences.5.xml
+++ b/doc/apt_preferences.5.xml
@@ -32,7 +32,8 @@
<refsect1>
<title>Description</title>
<para>The APT preferences file <filename>/etc/apt/preferences</filename>
-can be used to control which versions of packages will be selected
+and the fragment files in the <filename>/etc/apt/preferences.d/</filename>
+folder can be used to control which versions of packages will be selected
for installation.</para>
<para>Several versions of a package may be available for installation when
@@ -611,6 +612,13 @@ apt-get install <replaceable>package</replaceable>/sid
</refsect1>
<refsect1>
+<title>Files</title>
+ <variablelist>
+ &file-preferences;
+ </variablelist>
+</refsect1>
+
+<refsect1>
<title>See Also</title>
<para>&apt-get; &apt-cache; &apt-conf; &sources-list;
</para>
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 5dc7b5246..27118fb7e 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -246,6 +246,15 @@ Acquire
{
Options {"--ignore-time-conflict";} // not very useful on a normal system
};
+
+ CompressionTypes
+ {
+ bz2 "bzip2";
+ lzma "lzma";
+ gz "gzip";
+
+ Order { "gz"; "lzma"; "bz2"; };
+ };
};
// Directory layout
@@ -310,18 +319,25 @@ DSelect
CheckDir "no";
}
-DPkg
+DPkg
{
+ // let apt aggressivly use dpkg triggers
+ NoTriggers "true";
+ NoConfigure "true";
+ ConfigurePending "true";
+
// Probably don't want to use force-downgrade..
Options {"--force-overwrite";"--force-downgrade";}
-
+
// Auto re-mounting of a readonly /usr
Pre-Invoke {"mount -o remount,rw /usr";};
Post-Invoke {"mount -o remount,ro /usr";};
-
+
+ Chroot-Directory "/";
+
// Prevents daemons from getting cwd as something mountable (default)
Run-Directory "/";
-
+
// Build options for apt-get source --compile
Build-Options "-b -uc";
diff --git a/doc/fr/style.fr.xsl b/doc/fr/style.fr.xsl
deleted file mode 100644
index 11593bb42..000000000
--- a/doc/fr/style.fr.xsl
+++ /dev/null
@@ -1,9 +0,0 @@
-<xsl:stylesheet
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version="1.0">
-
-<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl" />
-
-<xsl:param name="man.output.encoding" select="'ISO-8859-15'" />
-
-</xsl:stylesheet>
diff --git a/doc/ja/style.ja.xsl b/doc/manpage-style.xsl
index c102f1366..f1024c4f4 100644
--- a/doc/ja/style.ja.xsl
+++ b/doc/manpage-style.xsl
@@ -4,6 +4,6 @@
<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl" />
-<xsl:param name="man.output.encoding" select="'EUC-JP'" />
+<xsl:param name="man.output.encoding" select="'UTF-8'" />
</xsl:stylesheet>
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index ff42c7ee9..a624f49c0 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-07-30 22:55+0900\n"
+"POT-Creation-Date: 2009-09-18 17:15+0300\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"
@@ -422,15 +422,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:165
+#: apt.ent:168
#, 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"
+" <author>\n"
+" <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
+" <contrib></contrib>\n"
+" </author>\n"
" <copyright><year>1998-2001</year> <holder>Jason "
"Gunthorpe</holder></copyright>\n"
" <date>28 October 2008</date>\n"
@@ -438,7 +440,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:168
+#: apt.ent:171
#, no-wrap
msgid ""
" </refentryinfo>\n"
@@ -446,7 +448,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:174 apt.ent:204
+#: apt.ent:177
#, no-wrap
msgid ""
"<!ENTITY apt-email \"\n"
@@ -457,42 +459,45 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:181 apt.ent:211
+#: apt.ent:185
#, no-wrap
msgid ""
"<!ENTITY apt-author.jgunthorpe \"\n"
" <author>\n"
" <firstname>Jason</firstname>\n"
" <surname>Gunthorpe</surname>\n"
+" <contrib></contrib>\n"
" </author>\n"
"\">\n"
msgstr ""
#. type: Plain text
-#: apt.ent:188
+#: apt.ent:193
#, no-wrap
msgid ""
"<!ENTITY apt-author.moconnor \"\n"
" <author>\n"
" <firstname>Mike</firstname>\n"
" <surname>O'Connor</surname>\n"
+" <contrib></contrib>\n"
" </author>\n"
"\">\n"
msgstr ""
#. type: Plain text
-#: apt.ent:194 apt.ent:217
+#: apt.ent:200
#, no-wrap
msgid ""
"<!ENTITY apt-author.team \"\n"
" <author>\n"
" <othername>APT team</othername>\n"
+" <contrib></contrib>\n"
" </author>\n"
"\">\n"
msgstr ""
#. type: Plain text
-#: apt.ent:198 apt.ent:228
+#: apt.ent:204 apt.ent:215
#, no-wrap
msgid ""
"<!ENTITY apt-product \"\n"
@@ -501,7 +506,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:224
+#: apt.ent:211
#, no-wrap
msgid ""
"<!ENTITY apt-copyright \"\n"
@@ -513,7 +518,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:234
+#: apt.ent:221
#, no-wrap
msgid ""
"<!ENTITY apt-qapage \"\n"
@@ -524,7 +529,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:245
+#: apt.ent:232
#, no-wrap
msgid ""
"<!-- Boiler plate Bug reporting section -->\n"
@@ -541,7 +546,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:253
+#: apt.ent:240
#, no-wrap
msgid ""
"<!-- Boiler plate Author section -->\n"
@@ -555,7 +560,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:263
+#: apt.ent:250
#, no-wrap
msgid ""
"<!-- Should be used within the option section of the text to\n"
@@ -570,7 +575,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:271
+#: apt.ent:258
#, no-wrap
msgid ""
" <varlistentry>\n"
@@ -583,7 +588,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:281
+#: apt.ent:268
#, no-wrap
msgid ""
" <varlistentry>\n"
@@ -599,7 +604,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:293
+#: apt.ent:280
#, no-wrap
msgid ""
" <varlistentry>\n"
@@ -619,7 +624,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:304
+#: apt.ent:291
#, no-wrap
msgid ""
"<!-- Should be used within the option section of the text to\n"
@@ -635,6 +640,136 @@ msgid ""
"\">\n"
msgstr ""
+#. type: Plain text
+#: apt.ent:297
+#, no-wrap
+msgid ""
+"<!ENTITY file-aptconf \"\n"
+" <varlistentry><term><filename>/etc/apt/apt.conf</filename></term>\n"
+" <listitem><para>APT configuration file.\n"
+" Configuration Item: "
+"<literal>Dir::Etc::Main</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:303
+#, no-wrap
+msgid ""
+" <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
+" <listitem><para>APT configuration file fragments.\n"
+" Configuration Item: "
+"<literal>Dir::Etc::Parts</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+"\">\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:309
+#, no-wrap
+msgid ""
+"<!ENTITY file-cachearchives \"\n"
+" <varlistentry><term><filename>&cachedir;/archives/</filename></term>\n"
+" <listitem><para>Storage area for retrieved package files.\n"
+" Configuration Item: "
+"<literal>Dir::Cache::Archives</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:315
+#, no-wrap
+msgid ""
+" "
+"<varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
+" <listitem><para>Storage area for package files in transit.\n"
+" Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit "
+"partial). </para></listitem>\n"
+" </varlistentry>\n"
+"\">\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:325
+#, no-wrap
+msgid ""
+"<!ENTITY file-preferences \"\n"
+" <varlistentry><term><filename>/etc/apt/preferences</filename></term>\n"
+" <listitem><para>Version preferences file.\n"
+" This is where you would specify &quot;pinning&quot;,\n"
+" i.e. a preference to get certain packages\n"
+" from a separate source\n"
+" or from a different version of a distribution.\n"
+" Configuration Item: "
+"<literal>Dir::Etc::Preferences</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:331
+#, no-wrap
+msgid ""
+" "
+"<varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
+" <listitem><para>File fragments for the version preferences.\n"
+" Configuration Item: "
+"<literal>Dir::Etc::PreferencesParts</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+"\">\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:337
+#, no-wrap
+msgid ""
+"<!ENTITY file-sourceslist \"\n"
+" <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n"
+" <listitem><para>Locations to fetch packages from.\n"
+" Configuration Item: "
+"<literal>Dir::Etc::SourceList</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:343
+#, no-wrap
+msgid ""
+" "
+"<varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
+" <listitem><para>File fragments for locations to fetch packages from.\n"
+" Configuration Item: "
+"<literal>Dir::Etc::SourceParts</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+"\">\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:350
+#, no-wrap
+msgid ""
+"<!ENTITY file-statelists \"\n"
+" <varlistentry><term><filename>&statedir;/lists/</filename></term>\n"
+" <listitem><para>Storage area for state information for each package "
+"resource specified in\n"
+" &sources-list;\n"
+" Configuration Item: "
+"<literal>Dir::State::Lists</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:355
+#, no-wrap
+msgid ""
+" "
+"<varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
+" <listitem><para>Storage area for state information in transit.\n"
+" Configuration Item: <literal>Dir::State::Lists</literal> (implicit "
+"partial).</para></listitem>\n"
+" </varlistentry>\n"
+"\">\n"
+msgstr ""
+
#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 apt-ftparchive.1.xml:13 apt-sortpkgs.1.xml:13 sources.list.5.xml:13
@@ -644,7 +779,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refnamediv><refname>
-#: apt-cache.8.xml:22 apt-cache.8.xml:28
+#: apt-cache.8.xml:22 apt-cache.8.xml:29
msgid "apt-cache"
msgstr ""
@@ -653,13 +788,18 @@ msgstr ""
msgid "8"
msgstr ""
+#. type: Content of: <refentry><refmeta><refmiscinfo>
+#: apt-cache.8.xml:24 apt-cdrom.8.xml:23 apt-config.8.xml:24 apt-extracttemplates.1.xml:24 apt-ftparchive.1.xml:24 apt-get.8.xml:24 apt-key.8.xml:16 apt-mark.8.xml:24 apt-secure.8.xml:16 apt-sortpkgs.1.xml:24 apt.conf.5.xml:30 apt_preferences.5.xml:23 sources.list.5.xml:24
+msgid "APT"
+msgstr ""
+
#. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cache.8.xml:29
+#: apt-cache.8.xml:30
msgid "APT package handling utility -- cache manipulator"
msgstr ""
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-cache.8.xml:35
+#: apt-cache.8.xml:36
msgid ""
"<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
"<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
@@ -688,12 +828,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:61 apt-cdrom.8.xml:46 apt-config.8.xml:46 apt-extracttemplates.1.xml:42 apt-ftparchive.1.xml:54 apt-get.8.xml:114 apt-key.8.xml:33 apt-mark.8.xml:43 apt-secure.8.xml:39 apt-sortpkgs.1.xml:43 apt.conf.5.xml:38 apt_preferences.5.xml:32 sources.list.5.xml:32
+#: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47 apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125 apt-key.8.xml:34 apt-mark.8.xml:52 apt-secure.8.xml:40 apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 sources.list.5.xml:33
msgid "Description"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:62
+#: apt-cache.8.xml:63
msgid ""
"<command>apt-cache</command> performs a variety of operations on APT's "
"package cache. <command>apt-cache</command> does not manipulate the state of "
@@ -702,31 +842,31 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:67 apt-get.8.xml:120
+#: apt-cache.8.xml:68 apt-get.8.xml:131
msgid ""
"Unless the <option>-h</option>, or <option>--help</option> option is given, "
"one of the commands below must be present."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:71
+#: apt-cache.8.xml:72
msgid "add <replaceable>file(s)</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:72
+#: apt-cache.8.xml:73
msgid ""
"<literal>add</literal> adds the named package index files to the package "
"cache. This is for debugging only."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:76
+#: apt-cache.8.xml:77
msgid "gencaches"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:77
+#: apt-cache.8.xml:78
msgid ""
"<literal>gencaches</literal> performs the same operation as <command>apt-get "
"check</command>. It builds the source and package caches from the sources in "
@@ -734,12 +874,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:83
+#: apt-cache.8.xml:84
msgid "showpkg <replaceable>pkg(s)</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:84
+#: apt-cache.8.xml:85
msgid ""
"<literal>showpkg</literal> displays information about the packages listed on "
"the command line. Remaining arguments are package names. The available "
@@ -753,7 +893,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-cache.8.xml:96
+#: apt-cache.8.xml:97
#, no-wrap
msgid ""
"Package: libreadline2\n"
@@ -769,7 +909,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:108
+#: apt-cache.8.xml:109
msgid ""
"Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and "
"ncurses3.0 which must be installed for libreadline2 to work. In turn, "
@@ -781,26 +921,26 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:117
+#: apt-cache.8.xml:118
msgid "stats"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:117
+#: apt-cache.8.xml:118
msgid ""
"<literal>stats</literal> displays some statistics about the cache. No "
"further arguments are expected. Statistics reported are:"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:120
+#: apt-cache.8.xml:121
msgid ""
"<literal>Total package names</literal> is the number of package names found "
"in the cache."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:124
+#: apt-cache.8.xml:125
msgid ""
"<literal>Normal packages</literal> is the number of regular, ordinary "
"package names; these are packages that bear a one-to-one correspondence "
@@ -809,7 +949,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:130
+#: apt-cache.8.xml:131
msgid ""
"<literal>Pure virtual packages</literal> is the number of packages that "
"exist only as a virtual package name; that is, packages only \"provide\" the "
@@ -820,7 +960,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:138
+#: apt-cache.8.xml:139
msgid ""
"<literal>Single virtual packages</literal> is the number of packages with "
"only one package providing a particular virtual package. For example, in the "
@@ -829,7 +969,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:144
+#: apt-cache.8.xml:145
msgid ""
"<literal>Mixed virtual packages</literal> is the number of packages that "
"either provide a particular virtual package or have the virtual package name "
@@ -839,7 +979,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:151
+#: apt-cache.8.xml:152
msgid ""
"<literal>Missing</literal> is the number of package names that were "
"referenced in a dependency but were not provided by any package. Missing "
@@ -849,7 +989,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:158
+#: apt-cache.8.xml:159
msgid ""
"<literal>Total distinct</literal> versions is the number of package versions "
"found in the cache; this value is therefore at least equal to the number of "
@@ -859,19 +999,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:165
+#: apt-cache.8.xml:166
msgid ""
"<literal>Total dependencies</literal> is the number of dependency "
"relationships claimed by all of the packages in the cache."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:172
+#: apt-cache.8.xml:173
msgid "showsrc <replaceable>pkg(s)</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:173
+#: apt-cache.8.xml:174
msgid ""
"<literal>showsrc</literal> displays all the source package records that "
"match the given package names. All versions are shown, as well as all "
@@ -879,48 +1019,48 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:178 apt-config.8.xml:83
+#: apt-cache.8.xml:179 apt-config.8.xml:84
msgid "dump"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:179
+#: apt-cache.8.xml:180
msgid ""
"<literal>dump</literal> shows a short listing of every package in the "
"cache. It is primarily for debugging."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:183
+#: apt-cache.8.xml:184
msgid "dumpavail"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:184
+#: apt-cache.8.xml:185
msgid ""
"<literal>dumpavail</literal> prints out an available list to stdout. This is "
"suitable for use with &dpkg; and is used by the &dselect; method."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:188
+#: apt-cache.8.xml:189
msgid "unmet"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:189
+#: apt-cache.8.xml:190
msgid ""
"<literal>unmet</literal> displays a summary of all unmet dependencies in the "
"package cache."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:193
+#: apt-cache.8.xml:194
msgid "show <replaceable>pkg(s)</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:194
+#: apt-cache.8.xml:195
msgid ""
"<literal>show</literal> performs a function similar to <command>dpkg "
"--print-avail</command>; it displays the package records for the named "
@@ -928,12 +1068,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:199
+#: apt-cache.8.xml:200
msgid "search <replaceable>regex [ regex ... ]</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:200
+#: apt-cache.8.xml:201
msgid ""
"<literal>search</literal> performs a full text search on all available "
"package lists for the POSIX regex pattern given, see "
@@ -948,43 +1088,43 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:213
+#: apt-cache.8.xml:214
msgid ""
"Separate arguments can be used to specify multiple search patterns that are "
"and'ed together."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:217
+#: apt-cache.8.xml:218
msgid "depends <replaceable>pkg(s)</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:218
+#: apt-cache.8.xml:219
msgid ""
"<literal>depends</literal> shows a listing of each dependency a package has "
"and all the possible other packages that can fulfill that dependency."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:222
+#: apt-cache.8.xml:223
msgid "rdepends <replaceable>pkg(s)</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:223
+#: apt-cache.8.xml:224
msgid ""
"<literal>rdepends</literal> shows a listing of each reverse dependency a "
"package has."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:227
+#: apt-cache.8.xml:228
msgid "pkgnames <replaceable>[ prefix ]</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:228
+#: apt-cache.8.xml:229
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 "
@@ -994,12 +1134,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:235
+#: apt-cache.8.xml:236
msgid "dotty <replaceable>pkg(s)</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:236
+#: apt-cache.8.xml:237
msgid ""
"<literal>dotty</literal> takes a list of packages on the command line and "
"generates output suitable for use by dotty from the <ulink "
@@ -1012,7 +1152,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:245
+#: apt-cache.8.xml:246
msgid ""
"The resulting nodes will have several shapes; normal packages are boxes, "
"pure provides are triangles, mixed provides are diamonds, missing packages "
@@ -1021,17 +1161,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:250
+#: apt-cache.8.xml:251
msgid "Caution, dotty cannot graph larger sets of packages."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:253
+#: apt-cache.8.xml:254
msgid "xvcg <replaceable>pkg(s)</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:254
+#: apt-cache.8.xml:255
msgid ""
"The same as <literal>dotty</literal>, only for xvcg from the <ulink "
"url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG "
@@ -1039,12 +1179,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:258
+#: apt-cache.8.xml:259
msgid "policy <replaceable>[ pkg(s) ]</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:259
+#: apt-cache.8.xml:260
msgid ""
"<literal>policy</literal> is meant to help debug issues relating to the "
"preferences file. With no arguments it will print out the priorities of each "
@@ -1053,12 +1193,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:265
+#: apt-cache.8.xml:266
msgid "madison <replaceable>/[ pkg(s) ]</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:266
+#: apt-cache.8.xml:267
msgid ""
"<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
"to mimic the output format and a subset of the functionality of the Debian "
@@ -1070,22 +1210,22 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:277 apt-config.8.xml:92 apt-extracttemplates.1.xml:55 apt-ftparchive.1.xml:491 apt-get.8.xml:299 apt-mark.8.xml:73 apt-sortpkgs.1.xml:53 apt.conf.5.xml:373 apt.conf.5.xml:395
+#: apt-cache.8.xml:278 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:408 apt.conf.5.xml:430
msgid "options"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:281
+#: apt-cache.8.xml:282
msgid "<option>-p</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:281
+#: apt-cache.8.xml:282
msgid "<option>--pkg-cache</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:282
+#: apt-cache.8.xml:283
msgid ""
"Select the file to store the package cache. The package cache is the primary "
"cache used by all operations. Configuration Item: "
@@ -1093,17 +1233,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:287 apt-ftparchive.1.xml:534 apt-get.8.xml:356 apt-sortpkgs.1.xml:57
+#: apt-cache.8.xml:288 apt-ftparchive.1.xml:535 apt-get.8.xml:376 apt-sortpkgs.1.xml:58
msgid "<option>-s</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:287
+#: apt-cache.8.xml:288
msgid "<option>--src-cache</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:288
+#: apt-cache.8.xml:289
msgid ""
"Select the file to store the source cache. The source is used only by "
"<literal>gencaches</literal> and it stores a parsed version of the package "
@@ -1113,17 +1253,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:295 apt-ftparchive.1.xml:508 apt-get.8.xml:346
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:509 apt-get.8.xml:366
msgid "<option>-q</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:295 apt-ftparchive.1.xml:508 apt-get.8.xml:346
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:509 apt-get.8.xml:366
msgid "<option>--quiet</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:296
+#: apt-cache.8.xml:297
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quietness up to a maximum of 2. You can also use "
@@ -1132,17 +1272,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:302
+#: apt-cache.8.xml:303
msgid "<option>-i</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:302
+#: apt-cache.8.xml:303
msgid "<option>--important</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:303
+#: apt-cache.8.xml:304
msgid ""
"Print only important dependencies; for use with unmet and depends. Causes "
"only Depends and Pre-Depends relations to be printed. Configuration Item: "
@@ -1150,34 +1290,34 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:308 apt-cdrom.8.xml:120 apt-get.8.xml:313
+#: apt-cache.8.xml:309 apt-cdrom.8.xml:121 apt-get.8.xml:333
msgid "<option>-f</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:308
+#: apt-cache.8.xml:309
msgid "<option>--full</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:309
+#: apt-cache.8.xml:310
msgid ""
"Print full package records when searching. Configuration Item: "
"<literal>APT::Cache::ShowFull</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:313 apt-cdrom.8.xml:130
+#: apt-cache.8.xml:314 apt-cdrom.8.xml:131
msgid "<option>-a</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:313
+#: apt-cache.8.xml:314
msgid "<option>--all-versions</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:314
+#: apt-cache.8.xml:315
msgid ""
"Print full records for all available versions. This is the default; to turn "
"it off, use <option>--no-all-versions</option>. If "
@@ -1188,17 +1328,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:322
+#: apt-cache.8.xml:323
msgid "<option>-g</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:322
+#: apt-cache.8.xml:323
msgid "<option>--generate</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:323
+#: apt-cache.8.xml:324
msgid ""
"Perform automatic package cache regeneration, rather than use the cache as "
"it is. This is the default; to turn it off, use "
@@ -1207,29 +1347,29 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328
+#: apt-cache.8.xml:329
msgid "<option>--names-only</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328 apt-cdrom.8.xml:138
+#: apt-cache.8.xml:329 apt-cdrom.8.xml:139
msgid "<option>-n</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:329
+#: apt-cache.8.xml:330
msgid ""
"Only search on the package names, not the long descriptions. Configuration "
"Item: <literal>APT::Cache::NamesOnly</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:333
+#: apt-cache.8.xml:334
msgid "<option>--all-names</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:334
+#: apt-cache.8.xml:335
msgid ""
"Make <literal>pkgnames</literal> print all names, including virtual packages "
"and missing dependencies. Configuration Item: "
@@ -1237,12 +1377,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:339
+#: apt-cache.8.xml:340
msgid "<option>--recurse</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:340
+#: apt-cache.8.xml:341
msgid ""
"Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
"that all packages mentioned are printed once. Configuration Item: "
@@ -1250,12 +1390,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:345
+#: apt-cache.8.xml:346
msgid "<option>--installed</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:347
+#: apt-cache.8.xml:348
msgid ""
"Limit the output of <literal>depends</literal> and "
"<literal>rdepends</literal> to packages which are currently installed. "
@@ -1263,68 +1403,37 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:352 apt-cdrom.8.xml:149 apt-config.8.xml:97 apt-extracttemplates.1.xml:66 apt-ftparchive.1.xml:546 apt-get.8.xml:534 apt-sortpkgs.1.xml:63
+#: apt-cache.8.xml:353 apt-cdrom.8.xml:150 apt-config.8.xml:98 apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:547 apt-get.8.xml:554 apt-sortpkgs.1.xml:64
msgid "&apt-commonoptions;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:357 apt-get.8.xml:539 apt-key.8.xml:137 apt.conf.5.xml:824
+#: apt-cache.8.xml:358 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 apt.conf.5.xml:940 apt_preferences.5.xml:615
msgid "Files"
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:359 apt-get.8.xml:541
-msgid "<filename>/etc/apt/sources.list</filename>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:360 apt-get.8.xml:542
-msgid ""
-"Locations to fetch packages from. Configuration Item: "
-"<literal>Dir::Etc::SourceList</literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:364 apt-get.8.xml:575
-msgid "<filename>&statedir;/lists/</filename>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:365 apt-get.8.xml:576
-msgid ""
-"Storage area for state information for each package resource specified in "
-"&sources-list; Configuration Item: <literal>Dir::State::Lists</literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:370 apt-get.8.xml:581
-msgid "<filename>&statedir;/lists/partial/</filename>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:371 apt-get.8.xml:582
-msgid ""
-"Storage area for state information in transit. Configuration Item: "
-"<literal>Dir::State::Lists</literal> (implicit partial)."
+#. type: Content of: <refentry><refsect1><variablelist>
+#: apt-cache.8.xml:360
+msgid "&file-sourceslist; &file-statelists;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:377 apt-cdrom.8.xml:154 apt-config.8.xml:102 apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:562 apt-get.8.xml:588 apt-key.8.xml:161 apt-mark.8.xml:104 apt-secure.8.xml:180 apt-sortpkgs.1.xml:68 apt.conf.5.xml:828 apt_preferences.5.xml:613 sources.list.5.xml:220
+#: apt-cache.8.xml:365 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:946 apt_preferences.5.xml:622 sources.list.5.xml:221
msgid "See Also"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:378
+#: apt-cache.8.xml:366
msgid "&apt-conf;, &sources-list;, &apt-get;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:382 apt-cdrom.8.xml:159 apt-config.8.xml:107 apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:566 apt-get.8.xml:594 apt-mark.8.xml:108 apt-sortpkgs.1.xml:72
+#: apt-cache.8.xml:370 apt-cdrom.8.xml:160 apt-config.8.xml:108 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:567 apt-get.8.xml:575 apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:383
+#: apt-cache.8.xml:371
msgid ""
"<command>apt-cache</command> returns zero on normal operation, decimal 100 "
"on error."
@@ -1338,17 +1447,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refnamediv><refname>
-#: apt-cdrom.8.xml:21 apt-cdrom.8.xml:27
+#: apt-cdrom.8.xml:21 apt-cdrom.8.xml:28
msgid "apt-cdrom"
msgstr ""
#. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cdrom.8.xml:28
+#: apt-cdrom.8.xml:29
msgid "APT CDROM management utility"
msgstr ""
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-cdrom.8.xml:34
+#: apt-cdrom.8.xml:35
msgid ""
"<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
"<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></arg> "
@@ -1358,7 +1467,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:47
+#: apt-cdrom.8.xml:48
msgid ""
"<command>apt-cdrom</command> is used to add a new CDROM to APTs list of "
"available sources. <command>apt-cdrom</command> takes care of determining "
@@ -1367,7 +1476,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:54
+#: apt-cdrom.8.xml:55
msgid ""
"It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
"system, it cannot be done by hand. Furthermore each disk in a multi-cd set "
@@ -1375,12 +1484,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:64
+#: apt-cdrom.8.xml:65
msgid "add"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:65
+#: apt-cdrom.8.xml:66
msgid ""
"<literal>add</literal> is used to add a new disc to the source list. It will "
"unmount the CDROM device, prompt for a disk to be inserted and then procceed "
@@ -1390,7 +1499,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:73
+#: apt-cdrom.8.xml:74
msgid ""
"APT uses a CDROM ID to track which disc is currently in the drive and "
"maintains a database of these IDs in "
@@ -1398,19 +1507,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:80
+#: apt-cdrom.8.xml:81
msgid "ident"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:81
+#: apt-cdrom.8.xml:82
msgid ""
"A debugging tool to report the identity of the current disc as well as the "
"stored file name"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:60
+#: apt-cdrom.8.xml:61
msgid ""
"Unless the <option>-h</option>, or <option>--help</option> option is given "
"one of the commands below must be present. <placeholder "
@@ -1418,22 +1527,22 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:90
+#: apt-cdrom.8.xml:91
msgid "Options"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:94 apt-ftparchive.1.xml:502 apt-get.8.xml:308
+#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:503 apt-get.8.xml:328
msgid "<option>-d</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:94
+#: apt-cdrom.8.xml:95
msgid "<option>--cdrom</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:95
+#: apt-cdrom.8.xml:96
msgid ""
"Mount point; specify the location to mount the cdrom. This mount point must "
"be listed in <filename>/etc/fstab</filename> and properly configured. "
@@ -1441,17 +1550,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:103
+#: apt-cdrom.8.xml:104
msgid "<option>-r</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:103
+#: apt-cdrom.8.xml:104
msgid "<option>--rename</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:104
+#: apt-cdrom.8.xml:105
msgid ""
"Rename a disc; change the label of a disk or override the disks given "
"label. This option will cause <command>apt-cdrom</command> to prompt for a "
@@ -1459,17 +1568,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:112 apt-get.8.xml:327
+#: apt-cdrom.8.xml:113 apt-get.8.xml:347
msgid "<option>-m</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:112
+#: apt-cdrom.8.xml:113
msgid "<option>--no-mount</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:113
+#: apt-cdrom.8.xml:114
msgid ""
"No mounting; prevent <command>apt-cdrom</command> from mounting and "
"unmounting the mount point. Configuration Item: "
@@ -1477,12 +1586,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:120
+#: apt-cdrom.8.xml:121
msgid "<option>--fast</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:121
+#: apt-cdrom.8.xml:122
msgid ""
"Fast Copy; Assume the package files are valid and do not check every "
"package. This option should be used only if <command>apt-cdrom</command> has "
@@ -1491,12 +1600,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:130
+#: apt-cdrom.8.xml:131
msgid "<option>--thorough</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:131
+#: apt-cdrom.8.xml:132
msgid ""
"Thorough Package Scan; This option may be needed with some old Debian "
"1.1/1.2 discs that have Package files in strange places. It takes much "
@@ -1504,22 +1613,22 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:139 apt-get.8.xml:358
+#: apt-cdrom.8.xml:140 apt-get.8.xml:378
msgid "<option>--just-print</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:140 apt-get.8.xml:360
+#: apt-cdrom.8.xml:141 apt-get.8.xml:380
msgid "<option>--recon</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:141 apt-get.8.xml:361
+#: apt-cdrom.8.xml:142 apt-get.8.xml:381
msgid "<option>--no-act</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:142
+#: apt-cdrom.8.xml:143
msgid ""
"No Changes; Do not change the &sources-list; file and do not write index "
"files. Everything is still checked however. Configuration Item: "
@@ -1527,29 +1636,29 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:155
+#: apt-cdrom.8.xml:156
msgid "&apt-conf;, &apt-get;, &sources-list;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:160
+#: apt-cdrom.8.xml:161
msgid ""
"<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
"on error."
msgstr ""
#. type: Content of: <refentry><refnamediv><refname>
-#: apt-config.8.xml:22 apt-config.8.xml:28
+#: apt-config.8.xml:22 apt-config.8.xml:29
msgid "apt-config"
msgstr ""
#. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-config.8.xml:29
+#: apt-config.8.xml:30
msgid "APT Configuration Query program"
msgstr ""
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-config.8.xml:35
+#: apt-config.8.xml:36
msgid ""
"<command>apt-config</command> <arg><option>-hv</option></arg> "
"<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
@@ -1558,7 +1667,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:47
+#: apt-config.8.xml:48
msgid ""
"<command>apt-config</command> is an internal program used by various "
"portions of the APT suite to provide consistent configurability. It accesses "
@@ -1567,19 +1676,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:52 apt-ftparchive.1.xml:70
+#: apt-config.8.xml:53 apt-ftparchive.1.xml:71
msgid ""
"Unless the <option>-h</option>, or <option>--help</option> option is given "
"one of the commands below must be present."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-config.8.xml:57
+#: apt-config.8.xml:58
msgid "shell"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:59
+#: apt-config.8.xml:60
msgid ""
"shell is used to access the configuration information from a shell "
"script. It is given pairs of arguments, the first being a shell variable and "
@@ -1589,7 +1698,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-config.8.xml:67
+#: apt-config.8.xml:68
#, no-wrap
msgid ""
"OPTS=\"-f\"\n"
@@ -1598,14 +1707,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:72
+#: apt-config.8.xml:73
msgid ""
"This will set the shell environment variable $OPTS to the value of "
"MyApp::options with a default of <option>-f</option>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:76
+#: apt-config.8.xml:77
msgid ""
"The configuration item may be postfixed with a /[fdbi]. f returns file "
"names, d returns directories, b returns true or false and i returns an "
@@ -1613,24 +1722,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:85
+#: apt-config.8.xml:86
msgid "Just show the contents of the configuration space."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 apt-mark.8.xml:105 apt-sortpkgs.1.xml:69
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:564 apt-sortpkgs.1.xml:70
msgid "&apt-conf;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:108
+#: apt-config.8.xml:109
msgid ""
"<command>apt-config</command> returns zero on normal operation, decimal 100 "
"on error."
msgstr ""
#. type: Content of: <refentry><refnamediv><refname>
-#: apt-extracttemplates.1.xml:22 apt-extracttemplates.1.xml:28
+#: apt-extracttemplates.1.xml:22 apt-extracttemplates.1.xml:29
msgid "apt-extracttemplates"
msgstr ""
@@ -1640,12 +1749,12 @@ msgid "1"
msgstr ""
#. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-extracttemplates.1.xml:29
+#: apt-extracttemplates.1.xml:30
msgid "Utility to extract DebConf config and templates from Debian packages"
msgstr ""
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-extracttemplates.1.xml:35
+#: apt-extracttemplates.1.xml:36
msgid ""
"<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
"<arg><option>-t=<replaceable>temporary "
@@ -1654,7 +1763,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:43
+#: apt-extracttemplates.1.xml:44
msgid ""
"<command>apt-extracttemplates</command> will take one or more Debian package "
"files as input and write out (to a temporary directory) all associated "
@@ -1664,12 +1773,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:48
+#: apt-extracttemplates.1.xml:49
msgid "package version template-file config-script"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:49
+#: apt-extracttemplates.1.xml:50
msgid ""
"template-file and config-script are written to the temporary directory "
"specified by the -t or --tempdir "
@@ -1679,17 +1788,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:59 apt-get.8.xml:468
+#: apt-extracttemplates.1.xml:60 apt-get.8.xml:488
msgid "<option>-t</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:59
+#: apt-extracttemplates.1.xml:60
msgid "<option>--tempdir</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-extracttemplates.1.xml:61
+#: apt-extracttemplates.1.xml:62
msgid ""
"Temporary directory in which to write extracted debconf template files and "
"config scripts Configuration Item: "
@@ -1697,24 +1806,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:78
+#: apt-extracttemplates.1.xml:79
msgid ""
"<command>apt-extracttemplates</command> returns zero on normal operation, "
"decimal 100 on error."
msgstr ""
#. type: Content of: <refentry><refnamediv><refname>
-#: apt-ftparchive.1.xml:22 apt-ftparchive.1.xml:28
+#: apt-ftparchive.1.xml:22 apt-ftparchive.1.xml:29
msgid "apt-ftparchive"
msgstr ""
#. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-ftparchive.1.xml:29
+#: apt-ftparchive.1.xml:30
msgid "Utility to generate index files"
msgstr ""
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-ftparchive.1.xml:35
+#: apt-ftparchive.1.xml:36
msgid ""
"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
@@ -1738,7 +1847,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:55
+#: apt-ftparchive.1.xml:56
msgid ""
"<command>apt-ftparchive</command> is the command line tool that generates "
"the index files that APT uses to access a distribution source. The index "
@@ -1747,7 +1856,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:59
+#: apt-ftparchive.1.xml:60
msgid ""
"<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
"program, incorporating its entire functionality via the "
@@ -1757,7 +1866,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:65
+#: apt-ftparchive.1.xml:66
msgid ""
"Internally <command>apt-ftparchive</command> can make use of binary "
"databases to cache the contents of a .deb file and it does not rely on any "
@@ -1767,12 +1876,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:74
+#: apt-ftparchive.1.xml:75
msgid "packages"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:76
+#: apt-ftparchive.1.xml:77
msgid ""
"The packages command generates a package file from a directory tree. It "
"takes the given directory and recursively searches it for .deb files, "
@@ -1781,17 +1890,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:81 apt-ftparchive.1.xml:105
+#: apt-ftparchive.1.xml:82 apt-ftparchive.1.xml:106
msgid "The option <option>--db</option> can be used to specify a binary caching DB."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:84
+#: apt-ftparchive.1.xml:85
msgid "sources"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:86
+#: apt-ftparchive.1.xml:87
msgid ""
"The <literal>sources</literal> command generates a source index file from a "
"directory tree. It takes the given directory and recursively searches it "
@@ -1800,7 +1909,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:91
+#: apt-ftparchive.1.xml:92
msgid ""
"If an override file is specified then a source override file will be looked "
"for with an extension of .src. The --source-override option can be used to "
@@ -1808,12 +1917,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:96
+#: apt-ftparchive.1.xml:97
msgid "contents"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:98
+#: apt-ftparchive.1.xml:99
msgid ""
"The <literal>contents</literal> command generates a contents file from a "
"directory tree. It takes the given directory and recursively searches it for "
@@ -1824,12 +1933,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:108
+#: apt-ftparchive.1.xml:109
msgid "release"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:110
+#: apt-ftparchive.1.xml:111
msgid ""
"The <literal>release</literal> command generates a Release file from a "
"directory tree. It recursively searches the given directory for Packages, "
@@ -1839,7 +1948,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:117
+#: apt-ftparchive.1.xml:118
msgid ""
"Values for the additional metadata fields in the Release file are taken from "
"the corresponding variables under "
@@ -1853,12 +1962,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:127
+#: apt-ftparchive.1.xml:128
msgid "generate"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:129
+#: apt-ftparchive.1.xml:130
msgid ""
"The <literal>generate</literal> command is designed to be runnable from a "
"cron script and builds indexes according to the given config file. The "
@@ -1868,24 +1977,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:136 apt-get.8.xml:272
+#: apt-ftparchive.1.xml:137 apt-get.8.xml:292
msgid "clean"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:138
+#: apt-ftparchive.1.xml:139
msgid ""
"The <literal>clean</literal> command tidies the databases used by the given "
"configuration file by removing any records that are no longer necessary."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:144
+#: apt-ftparchive.1.xml:145
msgid "The Generate Configuration"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:146
+#: apt-ftparchive.1.xml:147
msgid ""
"The <literal>generate</literal> command uses a configuration file to "
"describe the archives that are going to be generated. It follows the typical "
@@ -1896,17 +2005,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:154
+#: apt-ftparchive.1.xml:155
msgid "The generate configuration has 4 separate sections, each described below."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:156
+#: apt-ftparchive.1.xml:157
msgid "Dir Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:158
+#: apt-ftparchive.1.xml:159
msgid ""
"The <literal>Dir</literal> section defines the standard directories needed "
"to locate the files required during the generation process. These "
@@ -1915,12 +2024,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:163
+#: apt-ftparchive.1.xml:164
msgid "ArchiveDir"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:165
+#: apt-ftparchive.1.xml:166
msgid ""
"Specifies the root of the FTP archive, in a standard Debian configuration "
"this is the directory that contains the <filename>ls-LR</filename> and dist "
@@ -1928,44 +2037,44 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:170
+#: apt-ftparchive.1.xml:171
msgid "OverrideDir"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:172
+#: apt-ftparchive.1.xml:173
msgid "Specifies the location of the override files."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:175
+#: apt-ftparchive.1.xml:176
msgid "CacheDir"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:177
+#: apt-ftparchive.1.xml:178
msgid "Specifies the location of the cache files"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:180
+#: apt-ftparchive.1.xml:181
msgid "FileListDir"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:182
+#: apt-ftparchive.1.xml:183
msgid ""
"Specifies the location of the file list files, if the "
"<literal>FileList</literal> setting is used below."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:188
+#: apt-ftparchive.1.xml:189
msgid "Default Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:190
+#: apt-ftparchive.1.xml:191
msgid ""
"The <literal>Default</literal> section specifies default values, and "
"settings that control the operation of the generator. Other sections may "
@@ -1973,12 +2082,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:194
+#: apt-ftparchive.1.xml:195
msgid "Packages::Compress"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:196
+#: apt-ftparchive.1.xml:197
msgid ""
"Sets the default compression schemes to use for the Package index files. It "
"is a string that contains a space separated list of at least one of: '.' (no "
@@ -1987,60 +2096,60 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:202
+#: apt-ftparchive.1.xml:203
msgid "Packages::Extensions"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:204
+#: apt-ftparchive.1.xml:205
msgid ""
"Sets the default list of file extensions that are package files. This "
"defaults to '.deb'."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:208
+#: apt-ftparchive.1.xml:209
msgid "Sources::Compress"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:210
+#: apt-ftparchive.1.xml:211
msgid ""
"This is similar to <literal>Packages::Compress</literal> except that it "
"controls the compression for the Sources files."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:214
+#: apt-ftparchive.1.xml:215
msgid "Sources::Extensions"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:216
+#: apt-ftparchive.1.xml:217
msgid ""
"Sets the default list of file extensions that are source files. This "
"defaults to '.dsc'."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:220
+#: apt-ftparchive.1.xml:221
msgid "Contents::Compress"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:222
+#: apt-ftparchive.1.xml:223
msgid ""
"This is similar to <literal>Packages::Compress</literal> except that it "
"controls the compression for the Contents files."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:226
+#: apt-ftparchive.1.xml:227
msgid "DeLinkLimit"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:228
+#: apt-ftparchive.1.xml:229
msgid ""
"Specifies the number of kilobytes to delink (and replace with hard links) "
"per run. This is used in conjunction with the per-section "
@@ -2048,24 +2157,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:233
+#: apt-ftparchive.1.xml:234
msgid "FileMode"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:235
+#: apt-ftparchive.1.xml:236
msgid ""
"Specifies the mode of all created index files. It defaults to 0644. All "
"index files are set to this mode with no regard to the umask."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:242
+#: apt-ftparchive.1.xml:243
msgid "TreeDefault Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:244
+#: apt-ftparchive.1.xml:245
msgid ""
"Sets defaults specific to <literal>Tree</literal> sections. All of these "
"variables are substitution variables and have the strings $(DIST), "
@@ -2073,12 +2182,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:249
+#: apt-ftparchive.1.xml:250
msgid "MaxContentsChange"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:251
+#: apt-ftparchive.1.xml:252
msgid ""
"Sets the number of kilobytes of contents files that are generated each "
"day. The contents files are round-robined so that over several days they "
@@ -2086,12 +2195,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:256
+#: apt-ftparchive.1.xml:257
msgid "ContentsAge"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:258
+#: apt-ftparchive.1.xml:259
msgid ""
"Controls the number of days a contents file is allowed to be checked without "
"changing. If this limit is passed the mtime of the contents file is "
@@ -2102,60 +2211,60 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:267
+#: apt-ftparchive.1.xml:268
msgid "Directory"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:269
+#: apt-ftparchive.1.xml:270
msgid ""
"Sets the top of the .deb directory tree. Defaults to "
"<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:273
+#: apt-ftparchive.1.xml:274
msgid "SrcDirectory"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:275
+#: apt-ftparchive.1.xml:276
msgid ""
"Sets the top of the source package directory tree. Defaults to "
"<filename>$(DIST)/$(SECTION)/source/</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:279 apt-ftparchive.1.xml:405
+#: apt-ftparchive.1.xml:280 apt-ftparchive.1.xml:406
msgid "Packages"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:281
+#: apt-ftparchive.1.xml:282
msgid ""
"Sets the output Packages file. Defaults to "
"<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:285 apt-ftparchive.1.xml:410
+#: apt-ftparchive.1.xml:286 apt-ftparchive.1.xml:411
msgid "Sources"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:287
+#: apt-ftparchive.1.xml:288
msgid ""
"Sets the output Packages file. Defaults to "
"<filename>$(DIST)/$(SECTION)/source/Sources</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:291
+#: apt-ftparchive.1.xml:292
msgid "InternalPrefix"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:293
+#: apt-ftparchive.1.xml:294
msgid ""
"Sets the path prefix that causes a symlink to be considered an internal link "
"instead of an external link. Defaults to "
@@ -2163,12 +2272,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:298 apt-ftparchive.1.xml:416
+#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:417
msgid "Contents"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:300
+#: apt-ftparchive.1.xml:301
msgid ""
"Sets the output Contents file. Defaults to "
"<filename>$(DIST)/Contents-$(ARCH)</filename>. If this setting causes "
@@ -2178,34 +2287,34 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:307
+#: apt-ftparchive.1.xml:308
msgid "Contents::Header"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:309
+#: apt-ftparchive.1.xml:310
msgid "Sets header file to prepend to the contents output."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:312 apt-ftparchive.1.xml:441
+#: apt-ftparchive.1.xml:313 apt-ftparchive.1.xml:442
msgid "BinCacheDB"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:314
+#: apt-ftparchive.1.xml:315
msgid ""
"Sets the binary cache database to use for this section. Multiple sections "
"can share the same database."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:318
+#: apt-ftparchive.1.xml:319
msgid "FileList"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:320
+#: apt-ftparchive.1.xml:321
msgid ""
"Specifies that instead of walking the directory tree, "
"<command>apt-ftparchive</command> should read the list of files from the "
@@ -2213,12 +2322,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:325
+#: apt-ftparchive.1.xml:326
msgid "SourceFileList"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:327
+#: apt-ftparchive.1.xml:328
msgid ""
"Specifies that instead of walking the directory tree, "
"<command>apt-ftparchive</command> should read the list of files from the "
@@ -2227,12 +2336,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:335
+#: apt-ftparchive.1.xml:336
msgid "Tree Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:337
+#: apt-ftparchive.1.xml:338
msgid ""
"The <literal>Tree</literal> section defines a standard Debian file tree "
"which consists of a base directory, then multiple sections in that base "
@@ -2242,7 +2351,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:342
+#: apt-ftparchive.1.xml:343
msgid ""
"The <literal>Tree</literal> section takes a scope tag which sets the "
"<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@ -2251,7 +2360,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:347
+#: apt-ftparchive.1.xml:348
msgid ""
"All of the settings defined in the <literal>TreeDefault</literal> section "
"can be use in a <literal>Tree</literal> section as well as three new "
@@ -2259,14 +2368,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:350
+#: apt-ftparchive.1.xml:351
msgid ""
"When processing a <literal>Tree</literal> section "
"<command>apt-ftparchive</command> performs an operation similar to:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting>
-#: apt-ftparchive.1.xml:353
+#: apt-ftparchive.1.xml:354
#, no-wrap
msgid ""
"for i in Sections do \n"
@@ -2275,12 +2384,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:359
+#: apt-ftparchive.1.xml:360
msgid "Sections"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:361
+#: apt-ftparchive.1.xml:362
msgid ""
"This is a space separated list of sections which appear under the "
"distribution, typically this is something like <literal>main contrib "
@@ -2288,12 +2397,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:366
+#: apt-ftparchive.1.xml:367
msgid "Architectures"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:368
+#: apt-ftparchive.1.xml:369
msgid ""
"This is a space separated list of all the architectures that appear under "
"search section. The special architecture 'source' is used to indicate that "
@@ -2301,56 +2410,56 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:373 apt-ftparchive.1.xml:421
+#: apt-ftparchive.1.xml:374 apt-ftparchive.1.xml:422
msgid "BinOverride"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:375
+#: apt-ftparchive.1.xml:376
msgid ""
"Sets the binary override file. The override file contains section, priority "
"and maintainer address information."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:379 apt-ftparchive.1.xml:426
+#: apt-ftparchive.1.xml:380 apt-ftparchive.1.xml:427
msgid "SrcOverride"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:381
+#: apt-ftparchive.1.xml:382
msgid ""
"Sets the source override file. The override file contains section "
"information."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:385 apt-ftparchive.1.xml:431
+#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:432
msgid "ExtraOverride"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:387 apt-ftparchive.1.xml:433
+#: apt-ftparchive.1.xml:388 apt-ftparchive.1.xml:434
msgid "Sets the binary extra override file."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:390 apt-ftparchive.1.xml:436
+#: apt-ftparchive.1.xml:391 apt-ftparchive.1.xml:437
msgid "SrcExtraOverride"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:438
+#: apt-ftparchive.1.xml:393 apt-ftparchive.1.xml:439
msgid "Sets the source extra override file."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:397
+#: apt-ftparchive.1.xml:398
msgid "BinDirectory Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:399
+#: apt-ftparchive.1.xml:400
msgid ""
"The <literal>bindirectory</literal> section defines a binary directory tree "
"with no special structure. The scope tag specifies the location of the "
@@ -2360,64 +2469,64 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:407
+#: apt-ftparchive.1.xml:408
msgid "Sets the Packages file output."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:412
+#: apt-ftparchive.1.xml:413
msgid ""
"Sets the Sources file output. At least one of <literal>Packages</literal> or "
"<literal>Sources</literal> is required."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:418
+#: apt-ftparchive.1.xml:419
msgid "Sets the Contents file output. (optional)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:423
+#: apt-ftparchive.1.xml:424
msgid "Sets the binary override file."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:428
+#: apt-ftparchive.1.xml:429
msgid "Sets the source override file."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:443
+#: apt-ftparchive.1.xml:444
msgid "Sets the cache DB."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:446
+#: apt-ftparchive.1.xml:447
msgid "PathPrefix"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:448
+#: apt-ftparchive.1.xml:449
msgid "Appends a path to all the output paths."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:451
+#: apt-ftparchive.1.xml:452
msgid "FileList, SourceFileList"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:453
+#: apt-ftparchive.1.xml:454
msgid "Specifies the file list file."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:460
+#: apt-ftparchive.1.xml:461
msgid "The Binary Override File"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:461
+#: apt-ftparchive.1.xml:462
msgid ""
"The binary override file is fully compatible with &dpkg-scanpackages;. It "
"contains 4 fields separated by spaces. The first field is the package name, "
@@ -2427,19 +2536,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:467
+#: apt-ftparchive.1.xml:468
#, no-wrap
msgid "old [// oldn]* => new"
msgstr ""
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:469
+#: apt-ftparchive.1.xml:470
#, no-wrap
msgid "new"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:466
+#: apt-ftparchive.1.xml:467
msgid ""
"The general form of the maintainer field is: <placeholder "
"type=\"literallayout\" id=\"0\"/> or simply, <placeholder "
@@ -2450,12 +2559,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:477
+#: apt-ftparchive.1.xml:478
msgid "The Source Override File"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:479
+#: apt-ftparchive.1.xml:480
msgid ""
"The source override file is fully compatible with &dpkg-scansources;. It "
"contains 2 fields separated by spaces. The first fields is the source "
@@ -2463,12 +2572,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:484
+#: apt-ftparchive.1.xml:485
msgid "The Extra Override File"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:486
+#: apt-ftparchive.1.xml:487
msgid ""
"The extra override file allows any arbitrary tag to be added or replaced in "
"the output. It has 3 columns, the first is the package, the second is the "
@@ -2476,12 +2585,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:495
+#: apt-ftparchive.1.xml:496
msgid "<option>--md5</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:497
+#: apt-ftparchive.1.xml:498
msgid ""
"Generate MD5 sums. This defaults to on, when turned off the generated index "
"files will not have MD5Sum fields where possible. Configuration Item: "
@@ -2489,19 +2598,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:502
+#: apt-ftparchive.1.xml:503
msgid "<option>--db</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:504
+#: apt-ftparchive.1.xml:505
msgid ""
"Use a binary caching DB. This has no effect on the generate command. "
"Configuration Item: <literal>APT::FTPArchive::DB</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:510
+#: apt-ftparchive.1.xml:511
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -2510,12 +2619,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:516
+#: apt-ftparchive.1.xml:517
msgid "<option>--delink</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:518
+#: apt-ftparchive.1.xml:519
msgid ""
"Perform Delinking. If the <literal>External-Links</literal> setting is used "
"then this option actually enables delinking of the files. It defaults to on "
@@ -2524,12 +2633,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:524
+#: apt-ftparchive.1.xml:525
msgid "<option>--contents</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:526
+#: apt-ftparchive.1.xml:527
msgid ""
"Perform contents generation. When this option is set and package indexes are "
"being generated with a cache DB then the file listing will also be extracted "
@@ -2539,12 +2648,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:534
+#: apt-ftparchive.1.xml:535
msgid "<option>--source-override</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:536
+#: apt-ftparchive.1.xml:537
msgid ""
"Select the source override file to use with the <literal>sources</literal> "
"command. Configuration Item: "
@@ -2552,24 +2661,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:540
+#: apt-ftparchive.1.xml:541
msgid "<option>--readonly</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:542
+#: apt-ftparchive.1.xml:543
msgid ""
"Make the caching databases read only. Configuration Item: "
"<literal>APT::FTPArchive::ReadOnlyDB</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:551 apt.conf.5.xml:818 apt_preferences.5.xml:460 sources.list.5.xml:180
+#: apt-ftparchive.1.xml:552 apt.conf.5.xml:934 apt_preferences.5.xml:462 sources.list.5.xml:181
msgid "Examples"
msgstr ""
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:557
+#: apt-ftparchive.1.xml:558
#, no-wrap
msgid ""
"<command>apt-ftparchive</command> packages "
@@ -2578,14 +2687,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:553
+#: apt-ftparchive.1.xml:554
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:567
+#: apt-ftparchive.1.xml:568
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -2600,17 +2709,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refnamediv><refname>
-#: apt-get.8.xml:22 apt-get.8.xml:28
+#: apt-get.8.xml:22 apt-get.8.xml:29
msgid "apt-get"
msgstr ""
#. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-get.8.xml:29
+#: apt-get.8.xml:30
msgid "APT package handling utility -- command-line interface"
msgstr ""
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-get.8.xml:35
+#: apt-get.8.xml:36
msgid ""
"<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
"<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
@@ -2632,11 +2741,13 @@ msgid ""
"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 "
+"rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> "
+"<arg choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
+"<arg choice='plain'> /<replaceable>target_release_name</replaceable> </arg> "
+"<arg choice='plain'> /<replaceable>target_release_codename</replaceable> "
+"</arg> </group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg "
+"choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
+"<arg choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
"choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
"choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
"choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group "
@@ -2645,7 +2756,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:115
+#: apt-get.8.xml:126
msgid ""
"<command>apt-get</command> is the command-line tool for handling packages, "
"and may be considered the user's \"back-end\" to other tools using the APT "
@@ -2654,12 +2765,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:124 apt-key.8.xml:122
+#: apt-get.8.xml:135 apt-key.8.xml:123
msgid "update"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:125
+#: apt-get.8.xml:136
msgid ""
"<literal>update</literal> is used to resynchronize the package index files "
"from their sources. The indexes of available packages are fetched from the "
@@ -2674,12 +2785,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:136
+#: apt-get.8.xml:147
msgid "upgrade"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:137
+#: apt-get.8.xml:148
msgid ""
"<literal>upgrade</literal> is used to install the newest versions of all "
"packages currently installed on the system from the sources enumerated in "
@@ -2695,12 +2806,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:149
+#: apt-get.8.xml:160
msgid "dselect-upgrade"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:150
+#: apt-get.8.xml:161
msgid ""
"<literal>dselect-upgrade</literal> is used in conjunction with the "
"traditional Debian packaging front-end, "
@@ -2711,12 +2822,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:159
+#: apt-get.8.xml:170
msgid "dist-upgrade"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:160
+#: apt-get.8.xml:171
msgid ""
"<literal>dist-upgrade</literal> in addition to performing the function of "
"<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -2730,12 +2841,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:172
+#: apt-get.8.xml:183
msgid "install"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:174
+#: apt-get.8.xml:185
msgid ""
"<literal>install</literal> is followed by one or more packages desired for "
"installation or upgrading. Each package is a package name, not a fully "
@@ -2751,7 +2862,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:192
+#: apt-get.8.xml:203
msgid ""
"A specific version of a package can be selected for installation by "
"following the package name with an equals and the version of the package to "
@@ -2762,14 +2873,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:199
+#: apt-get.8.xml:210
msgid ""
"Both of the version selection mechanisms can downgrade packages and must be "
"used with care."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:202
+#: apt-get.8.xml:213
msgid ""
"This is also the target to use if you want to upgrade one or more "
"already-installed packages without upgrading every package you have on your "
@@ -2781,14 +2892,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:213
+#: apt-get.8.xml:224
msgid ""
"Finally, the &apt-preferences; mechanism allows you to create an alternative "
"installation policy for individual packages."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:217
+#: apt-get.8.xml:228
msgid ""
"If no package matches the given expression and the expression contains one "
"of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@ -2800,12 +2911,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:226
+#: apt-get.8.xml:237
msgid "remove"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:227
+#: apt-get.8.xml:238
msgid ""
"<literal>remove</literal> is identical to <literal>install</literal> except "
"that packages are removed instead of installed. Note the removing a package "
@@ -2815,12 +2926,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:234
+#: apt-get.8.xml:245
msgid "purge"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:235
+#: apt-get.8.xml:246
msgid ""
"<literal>purge</literal> is identical to <literal>remove</literal> except "
"that packages are removed and purged (any configuration files are deleted "
@@ -2828,27 +2939,45 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:239
+#: apt-get.8.xml:250
msgid "source"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:240
+#: apt-get.8.xml:251
msgid ""
"<literal>source</literal> causes <command>apt-get</command> to fetch source "
"packages. APT will examine the available packages to decide which source "
"package to fetch. It will then find and download into the current directory "
-"the newest available version of that source package. 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."
+"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."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:251
+#: apt-get.8.xml:259
+msgid ""
+"Source packages are tracked separately from binary packages via "
+"<literal>deb-src</literal> type lines in the &sources-list; file. This means "
+"that you will need to add such a line for each repository you want to get "
+"sources from. If you don't do this you will properly get another (newer, "
+"older or none) source version than the one you have installed or could "
+"install."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:266
+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."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:271
msgid ""
"A specific source version can be retrieved by postfixing the source name "
"with an equals and then the version to fetch, similar to the mechanism used "
@@ -2858,7 +2987,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:257
+#: apt-get.8.xml:277
msgid ""
"Note that source packages are not tracked like binary packages, they exist "
"only in the current directory and are similar to downloading source tar "
@@ -2866,31 +2995,31 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:262
+#: apt-get.8.xml:282
msgid "build-dep"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:263
+#: apt-get.8.xml:283
msgid ""
"<literal>build-dep</literal> causes apt-get to install/remove packages in an "
"attempt to satisfy the build dependencies for a source package."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:267
+#: apt-get.8.xml:287
msgid "check"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:268
+#: apt-get.8.xml:288
msgid ""
"<literal>check</literal> is a diagnostic tool; it updates the package cache "
"and checks for broken dependencies."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:273
+#: apt-get.8.xml:293
msgid ""
"<literal>clean</literal> clears out the local repository of retrieved "
"package files. It removes everything but the lock file from "
@@ -2902,12 +3031,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:282
+#: apt-get.8.xml:302
msgid "autoclean"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:283
+#: apt-get.8.xml:303
msgid ""
"Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
"local repository of retrieved package files. The difference is that it only "
@@ -2919,12 +3048,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:292
+#: apt-get.8.xml:312
msgid "autoremove"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:293
+#: apt-get.8.xml:313
msgid ""
"<literal>autoremove</literal> is used to remove packages that were "
"automatically installed to satisfy dependencies for some package and that "
@@ -2932,36 +3061,36 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:303 apt-get.8.xml:409
+#: apt-get.8.xml:323 apt-get.8.xml:429
msgid "<option>--no-install-recommends</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:304
+#: apt-get.8.xml:324
msgid ""
"Do not consider recommended packages as a dependency for installing. "
"Configuration Item: <literal>APT::Install-Recommends</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:308
+#: apt-get.8.xml:328
msgid "<option>--download-only</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:309
+#: apt-get.8.xml:329
msgid ""
"Download only; package files are only retrieved, not unpacked or installed. "
"Configuration Item: <literal>APT::Get::Download-Only</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:313
+#: apt-get.8.xml:333
msgid "<option>--fix-broken</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:314
+#: apt-get.8.xml:334
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
@@ -2977,17 +3106,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:327
+#: apt-get.8.xml:347
msgid "<option>--ignore-missing</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:328
+#: apt-get.8.xml:348
msgid "<option>--fix-missing</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:329
+#: apt-get.8.xml:349
msgid ""
"Ignore missing packages; If packages cannot be retrieved or fail the "
"integrity check after retrieval (corrupted package files), hold back those "
@@ -2999,12 +3128,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:339
+#: apt-get.8.xml:359
msgid "<option>--no-download</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:340
+#: apt-get.8.xml:360
msgid ""
"Disables downloading of packages. This is best used with "
"<option>--ignore-missing</option> to force APT to use only the .debs it has "
@@ -3013,7 +3142,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:347
+#: apt-get.8.xml:367
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3025,17 +3154,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:357
+#: apt-get.8.xml:377
msgid "<option>--simulate</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:359
+#: apt-get.8.xml:379
msgid "<option>--dry-run</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:362
+#: apt-get.8.xml:382
msgid ""
"No action; perform a simulation of events that would occur but do not "
"actually change the system. Configuration Item: "
@@ -3043,19 +3172,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:366
+#: apt-get.8.xml:386
msgid ""
"Simulation run as user will deactivate locking "
-"(<literal>Debug::NoLocking</literal>) automatical. Also a notice will be "
+"(<literal>Debug::NoLocking</literal>) automatic. Also a notice will be "
"displayed indicating that this is only a simulation, if the option "
"<literal>APT::Get::Show-User-Simulation-Note</literal> is set (Default: "
-"true) Neigther NoLocking nor the notice will be triggered if run as root "
+"true). Neither NoLocking nor the notice will be triggered if run as root "
"(root should know what he is doing without further warnings by "
"<literal>apt-get</literal>)."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:372
+#: apt-get.8.xml:392
msgid ""
"Simulate prints out a series of lines each one representing a dpkg "
"operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@ -3064,22 +3193,22 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:379
+#: apt-get.8.xml:399
msgid "<option>-y</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:379
+#: apt-get.8.xml:399
msgid "<option>--yes</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:380
+#: apt-get.8.xml:400
msgid "<option>--assume-yes</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:381
+#: apt-get.8.xml:401
msgid ""
"Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
"non-interactively. If an undesirable situation, such as changing a held "
@@ -3089,83 +3218,83 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:388
+#: apt-get.8.xml:408
msgid "<option>-u</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:388
+#: apt-get.8.xml:408
msgid "<option>--show-upgraded</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:389
+#: apt-get.8.xml:409
msgid ""
"Show upgraded packages; Print out a list of all packages that are to be "
"upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:394
+#: apt-get.8.xml:414
msgid "<option>-V</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:394
+#: apt-get.8.xml:414
msgid "<option>--verbose-versions</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:395
+#: apt-get.8.xml:415
msgid ""
"Show full versions for upgraded and installed packages. Configuration Item: "
"<literal>APT::Get::Show-Versions</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:399
+#: apt-get.8.xml:419
msgid "<option>-b</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:399
+#: apt-get.8.xml:419
msgid "<option>--compile</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:400
+#: apt-get.8.xml:420
msgid "<option>--build</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:401
+#: apt-get.8.xml:421
msgid ""
"Compile source packages after downloading them. Configuration Item: "
"<literal>APT::Get::Compile</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:405
+#: apt-get.8.xml:425
msgid "<option>--install-recommends</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:406
+#: apt-get.8.xml:426
msgid "Also install recommended packages."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:410
+#: apt-get.8.xml:430
msgid "Do not install recommended packages."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:413
+#: apt-get.8.xml:433
msgid "<option>--ignore-hold</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:414
+#: apt-get.8.xml:434
msgid ""
"Ignore package Holds; This causes <command>apt-get</command> to ignore a "
"hold placed on a package. This may be useful in conjunction with "
@@ -3174,12 +3303,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:420
+#: apt-get.8.xml:440
msgid "<option>--no-upgrade</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:421
+#: apt-get.8.xml:441
msgid ""
"Do not upgrade packages; When used in conjunction with "
"<literal>install</literal>, <literal>no-upgrade</literal> will prevent "
@@ -3188,12 +3317,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:427
+#: apt-get.8.xml:447
msgid "<option>--force-yes</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:428
+#: apt-get.8.xml:448
msgid ""
"Force yes; This is a dangerous option that will cause apt to continue "
"without prompting if it is doing something potentially harmful. It should "
@@ -3203,12 +3332,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:435
+#: apt-get.8.xml:455
msgid "<option>--print-uris</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:436
+#: apt-get.8.xml:456
msgid ""
"Instead of fetching the files to install their URIs are printed. Each URI "
"will have the path, the destination file name, the size and the expected md5 "
@@ -3221,12 +3350,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:446
+#: apt-get.8.xml:466
msgid "<option>--purge</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:447
+#: apt-get.8.xml:467
msgid ""
"Use purge instead of remove for anything that would be removed. An asterisk "
"(\"*\") will be displayed next to packages which are scheduled to be "
@@ -3236,24 +3365,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:454
+#: apt-get.8.xml:474
msgid "<option>--reinstall</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:455
+#: apt-get.8.xml:475
msgid ""
"Re-Install packages that are already installed and at the newest version. "
"Configuration Item: <literal>APT::Get::ReInstall</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:459
+#: apt-get.8.xml:479
msgid "<option>--list-cleanup</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:460
+#: apt-get.8.xml:480
msgid ""
"This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
"it off. When on <command>apt-get</command> will automatically manage the "
@@ -3264,17 +3393,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:469
+#: apt-get.8.xml:489
msgid "<option>--target-release</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:470
+#: apt-get.8.xml:490
msgid "<option>--default-release</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:471
+#: apt-get.8.xml:491
msgid ""
"This option controls the default input to the policy engine, it creates a "
"default pin at priority 990 using the specified release string. This "
@@ -3289,12 +3418,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:484
+#: apt-get.8.xml:504
msgid "<option>--trivial-only</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:486
+#: apt-get.8.xml:506
msgid ""
"Only perform operations that are 'trivial'. Logically this can be considered "
"related to <option>--assume-yes</option>, where "
@@ -3304,24 +3433,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:492
+#: apt-get.8.xml:512
msgid "<option>--no-remove</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:493
+#: apt-get.8.xml:513
msgid ""
"If any packages are to be removed apt-get immediately aborts without "
"prompting. Configuration Item: <literal>APT::Get::Remove</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:498
+#: apt-get.8.xml:518
msgid "<option>--auto-remove</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:499
+#: apt-get.8.xml:519
msgid ""
"If the command is either <literal>install</literal> or "
"<literal>remove</literal>, then this option acts like running "
@@ -3330,12 +3459,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:505
+#: apt-get.8.xml:525
msgid "<option>--only-source</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:506
+#: apt-get.8.xml:526
msgid ""
"Only has meaning for the <literal>source</literal> and "
"<literal>build-dep</literal> commands. Indicates that the given source "
@@ -3347,22 +3476,22 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:516
+#: apt-get.8.xml:536
msgid "<option>--diff-only</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:516
+#: apt-get.8.xml:536
msgid "<option>--dsc-only</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:516
+#: apt-get.8.xml:536
msgid "<option>--tar-only</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:517
+#: apt-get.8.xml:537
msgid ""
"Download only the diff, dsc, or tar file of a source archive. Configuration "
"Item: <literal>APT::Get::Diff-Only</literal>, "
@@ -3371,94 +3500,39 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:522
+#: apt-get.8.xml:542
msgid "<option>--arch-only</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:523
+#: apt-get.8.xml:543
msgid ""
"Only process architecture-dependent build-dependencies. Configuration Item: "
"<literal>APT::Get::Arch-Only</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:527
+#: apt-get.8.xml:547
msgid "<option>--allow-unauthenticated</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:528
+#: apt-get.8.xml:548
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
"is useful for tools like pbuilder. Configuration Item: "
"<literal>APT::Get::AllowUnauthenticated</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:546 apt.conf.5.xml:825
-msgid "<filename>/etc/apt/apt.conf</filename>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:547
-msgid ""
-"APT configuration file. Configuration Item: "
-"<literal>Dir::Etc::Main</literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:551
-msgid "<filename>/etc/apt/apt.conf.d/</filename>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:552
-msgid ""
-"APT configuration file fragments. Configuration Item: "
-"<literal>Dir::Etc::Parts</literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:556
-msgid "<filename>/etc/apt/preferences</filename>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:557
-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>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:565
-msgid "<filename>&cachedir;/archives/</filename>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:566
-msgid ""
-"Storage area for retrieved package files. Configuration Item: "
-"<literal>Dir::Cache::Archives</literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:570
-msgid "<filename>&cachedir;/archives/partial/</filename>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:571
+#. type: Content of: <refentry><refsect1><variablelist>
+#: apt-get.8.xml:561
msgid ""
-"Storage area for package files in transit. Configuration Item: "
-"<literal>Dir::Cache::Archives</literal> (implicit partial)."
+"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
+"&file-statelists;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:589
+#: apt-get.8.xml:570
msgid ""
"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, "
@@ -3466,44 +3540,44 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:595
+#: apt-get.8.xml:576
msgid ""
"<command>apt-get</command> returns zero on normal operation, decimal 100 on "
"error."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:598
+#: apt-get.8.xml:579
msgid "ORIGINAL AUTHORS"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:599
+#: apt-get.8.xml:580
msgid "&apt-author.jgunthorpe;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:602
+#: apt-get.8.xml:583
msgid "CURRENT AUTHORS"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:604
+#: apt-get.8.xml:585
msgid "&apt-author.team;"
msgstr ""
#. type: Content of: <refentry><refnamediv><refname>
-#: apt-key.8.xml:14 apt-key.8.xml:20
+#: apt-key.8.xml:14 apt-key.8.xml:21
msgid "apt-key"
msgstr ""
#. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-key.8.xml:21
+#: apt-key.8.xml:22
msgid "APT key management utility"
msgstr ""
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-key.8.xml:27
+#: apt-key.8.xml:28
msgid ""
"<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> "
"<arg "
@@ -3511,7 +3585,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:35
+#: apt-key.8.xml:36
msgid ""
"<command>apt-key</command> is used to manage the list of keys used by apt to "
"authenticate packages. Packages which have been authenticated using these "
@@ -3519,17 +3593,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:41
+#: apt-key.8.xml:42
msgid "Commands"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:43
+#: apt-key.8.xml:44
msgid "add <replaceable>filename</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:47
+#: apt-key.8.xml:48
msgid ""
"Add a new key to the list of trusted keys. The key is read from "
"<replaceable>filename</replaceable>, or standard input if "
@@ -3537,116 +3611,116 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:55
+#: apt-key.8.xml:56
msgid "del <replaceable>keyid</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:59
+#: apt-key.8.xml:60
msgid "Remove a key from the list of trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:66
+#: apt-key.8.xml:67
msgid "export <replaceable>keyid</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:70
+#: apt-key.8.xml:71
msgid "Output the key <replaceable>keyid</replaceable> to standard output."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:77
+#: apt-key.8.xml:78
msgid "exportall"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:81
+#: apt-key.8.xml:82
msgid "Output all trusted keys to standard output."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:88
+#: apt-key.8.xml:89
msgid "list"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:92
+#: apt-key.8.xml:93
msgid "List trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:99
+#: apt-key.8.xml:100
msgid "finger"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:103
+#: apt-key.8.xml:104
msgid "List fingerprints of trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:110
+#: apt-key.8.xml:111
msgid "adv"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:114
+#: apt-key.8.xml:115
msgid ""
"Pass advanced options to gpg. With adv --recv-key you can download the "
"public key."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:126
+#: apt-key.8.xml:127
msgid ""
"Update the local keyring with the keyring of Debian archive keys and removes "
"from the keyring the archive keys which are no longer valid."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:139
+#: apt-key.8.xml:140
msgid "<filename>/etc/apt/trusted.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:140
+#: apt-key.8.xml:141
msgid "Keyring of local trusted keys, new keys will be added here."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:143
+#: apt-key.8.xml:144
msgid "<filename>/etc/apt/trustdb.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:144
+#: apt-key.8.xml:145
msgid "Local trust database of archive keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:147
+#: apt-key.8.xml:148
msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:148
+#: apt-key.8.xml:149
msgid "Keyring of Debian archive trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:151
+#: apt-key.8.xml:152
msgid "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:152
+#: apt-key.8.xml:153
msgid "Keyring of Debian archive removed trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:163
+#: apt-key.8.xml:164
msgid "&apt-get;, &apt-secure;"
msgstr ""
@@ -3654,53 +3728,56 @@ msgstr ""
#. type: Content of: <refentry><refentryinfo>
#: apt-mark.8.xml:13
msgid ""
-"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>2 "
-"November 2007</date>"
+"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
+"August 2009</date>"
msgstr ""
#. type: Content of: <refentry><refnamediv><refname>
-#: apt-mark.8.xml:22 apt-mark.8.xml:28
+#: apt-mark.8.xml:22 apt-mark.8.xml:29
msgid "apt-mark"
msgstr ""
#. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-mark.8.xml:29
+#: apt-mark.8.xml:30
msgid "mark/unmark a package as being automatically-installed"
msgstr ""
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-mark.8.xml:35
+#: apt-mark.8.xml:36
msgid ""
-"<command>apt-mark</command> <arg><option>-hv</option></arg> "
+" <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>"
+"choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
+"choice=\"plain\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> "
+"</group> <arg choice=\"plain\" "
+"rep=\"repeat\"><replaceable>package</replaceable></arg> </arg> <arg "
+"choice=\"plain\">showauto</arg> </group>"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:44
+#: apt-mark.8.xml:53
msgid ""
"<command>apt-mark</command> will change whether a package has been marked as "
"being automatically installed."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:48
+#: apt-mark.8.xml:57
msgid ""
"When you request that a package is installed, and as a result other packages "
"are installed to satisfy its dependencies, the dependencies are marked as "
"being automatically installed. Once these automatically installed packages "
"are no longer depended on by any manually installed packages, they will be "
-"removed."
+"removed by e.g. <command>apt-get</command> or <command>aptitude</command>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:55
+#: apt-mark.8.xml:65
msgid "markauto"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:56
+#: apt-mark.8.xml:66
msgid ""
"<literal>markauto</literal> is used to mark a package as being automatically "
"installed, which will cause the package to be removed when no more manually "
@@ -3708,12 +3785,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:63
+#: apt-mark.8.xml:73
msgid "unmarkauto"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:64
+#: apt-mark.8.xml:74
msgid ""
"<literal>unmarkauto</literal> is used to mark a package as being manually "
"installed, which will prevent the package from being automatically removed "
@@ -3721,72 +3798,103 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:76
-msgid "<option>-f=<filename>FILENAME</filename></option>"
+#: apt-mark.8.xml:81
+msgid "showauto"
+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 manually installed "
+"packages with each package on a new line."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:76
-msgid "<option>--file=<filename>FILENAME</filename></option>"
+#: apt-mark.8.xml:93
+msgid "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:94
+msgid "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:79
+#: apt-mark.8.xml:97
msgid ""
-"Read/Write package stats from <filename>FILENAME</filename> instead of the "
+"Read/Write package stats from "
+"<filename><replaceable>FILENAME</replaceable></filename> instead of the "
"default location, which is <filename>extended_status</filename> in the "
"directory defined by the Configuration Item: <literal>Dir::State</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:85
+#: apt-mark.8.xml:103
msgid "<option>-h</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:86
+#: apt-mark.8.xml:104
msgid "<option>--help</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:87
+#: apt-mark.8.xml:105
msgid "Show a short usage summary."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:93
+#: apt-mark.8.xml:111
msgid "<option>-v</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:94
+#: apt-mark.8.xml:112
msgid "<option>--version</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:95
+#: apt-mark.8.xml:113
msgid "Show the program version."
msgstr ""
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-mark.8.xml:124
+msgid "<filename>/var/lib/apt/extended_states</filename>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:125
+msgid ""
+"Status list of auto-installed packages. Configuration Item: "
+"<literal>Dir::State</literal> sets the path to the "
+"<filename>extended_states</filename> file."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-mark.8.xml:134
+msgid "&apt-get;,&aptitude;,&apt-conf;"
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:109
+#: apt-mark.8.xml:138
msgid ""
"<command>apt-mark</command> returns zero on normal operation, non-zero on "
"error."
msgstr ""
#. type: Content of: <refentry><refnamediv><refname>
-#: apt-secure.8.xml:14 apt-secure.8.xml:35
+#: apt-secure.8.xml:14 apt-secure.8.xml:36
msgid "apt-secure"
msgstr ""
#. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-secure.8.xml:36
+#: apt-secure.8.xml:37
msgid "Archive authentication support for APT"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:41
+#: apt-secure.8.xml:42
msgid ""
"Starting with version 0.6, <command>apt</command> contains code that does "
"signature checking of the Release file for all archives. This ensures that "
@@ -3795,7 +3903,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:49
+#: apt-secure.8.xml:50
msgid ""
"If a package comes from a archive without a signature or with a signature "
"that apt does not have a key for that package is considered untrusted and "
@@ -3805,19 +3913,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:58
+#: apt-secure.8.xml:59
msgid ""
"The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
"authentication feature."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:63
+#: apt-secure.8.xml:64
msgid "Trusted archives"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:66
+#: apt-secure.8.xml:67
msgid ""
"The chain of trust from an apt archive to the end user is made up of "
"different steps. <command>apt-secure</command> is the last step in this "
@@ -3828,7 +3936,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:74
+#: apt-secure.8.xml:75
msgid ""
"apt-secure does not review signatures at a package level. If you require "
"tools to do this you should look at <command>debsig-verify</command> and "
@@ -3837,7 +3945,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:81
+#: apt-secure.8.xml:82
msgid ""
"The chain of trust in Debian starts when a maintainer uploads a new package "
"or a new version of a package to the Debian archive. This upload in order to "
@@ -3848,7 +3956,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:91
+#: apt-secure.8.xml:92
msgid ""
"Once the uploaded package is verified and included in the archive, the "
"maintainer signature is stripped off, an MD5 sum of the package is computed "
@@ -3859,7 +3967,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:101
+#: apt-secure.8.xml:102
msgid ""
"Any end user can check the signature of the Release file, extract the MD5 "
"sum of a package from it and compare it with the MD5 sum of the package he "
@@ -3869,14 +3977,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:108
+#: apt-secure.8.xml:109
msgid ""
"Notice that this is distinct from checking signatures on a per package "
"basis. It is designed to prevent two possible attacks:"
msgstr ""
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:113
+#: apt-secure.8.xml:114
msgid ""
"<literal>Network \"man in the middle\" attacks</literal>. Without signature "
"checking, a malicious agent can introduce himself in the package download "
@@ -3886,7 +3994,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:121
+#: apt-secure.8.xml:122
msgid ""
"<literal>Mirror network compromise</literal>. Without signature checking, a "
"malicious agent can compromise a mirror host and modify the files in it to "
@@ -3895,7 +4003,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:128
+#: apt-secure.8.xml:129
msgid ""
"However, it does not defend against a compromise of the Debian master server "
"itself (which signs the packages) or against a compromise of the key used to "
@@ -3904,12 +4012,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:134
+#: apt-secure.8.xml:135
msgid "User configuration"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:136
+#: apt-secure.8.xml:137
msgid ""
"<command>apt-key</command> is the program that manages the list of keys used "
"by apt. It can be used to add or remove keys although an installation of "
@@ -3918,7 +4026,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:143
+#: apt-secure.8.xml:144
msgid ""
"In order to add a new key you need to first download it (you should make "
"sure you are using a trusted communication channel when retrieving it), add "
@@ -3929,19 +4037,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:152
+#: apt-secure.8.xml:153
msgid "Archive configuration"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:154
+#: apt-secure.8.xml:155
msgid ""
"If you want to provide archive signatures in an archive under your "
"maintenance you have to:"
msgstr ""
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:159
+#: apt-secure.8.xml:160
msgid ""
"<literal>Create a toplevel Release file</literal>. if it does not exist "
"already. You can do this by running <command>apt-ftparchive "
@@ -3949,14 +4057,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:164
+#: apt-secure.8.xml:165
msgid ""
"<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:167
+#: apt-secure.8.xml:168
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 "
@@ -3964,7 +4072,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:174
+#: apt-secure.8.xml:175
msgid ""
"Whenever the contents of the archive changes (new packages are added or "
"removed) the archive maintainer has to follow the first two steps previously "
@@ -3972,14 +4080,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:182
+#: apt-secure.8.xml:183
msgid ""
"&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
"&debsign; &debsig-verify;, &gpg;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:186
+#: apt-secure.8.xml:187
msgid ""
"For more background information you might want to review the <ulink "
"url=\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html\">Debian "
@@ -3990,29 +4098,29 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:199
+#: apt-secure.8.xml:200
msgid "Manpage Authors"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:201
+#: apt-secure.8.xml:202
msgid ""
"This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac "
"Jones, Colin Walters, Florian Weimer and Michael Vogt."
msgstr ""
#. type: Content of: <refentry><refnamediv><refname>
-#: apt-sortpkgs.1.xml:22 apt-sortpkgs.1.xml:28
+#: apt-sortpkgs.1.xml:22 apt-sortpkgs.1.xml:29
msgid "apt-sortpkgs"
msgstr ""
#. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-sortpkgs.1.xml:29
+#: apt-sortpkgs.1.xml:30
msgid "Utility to sort package index files"
msgstr ""
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-sortpkgs.1.xml:35
+#: apt-sortpkgs.1.xml:36
msgid ""
"<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
"<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
@@ -4021,7 +4129,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:44
+#: apt-sortpkgs.1.xml:45
msgid ""
"<command>apt-sortpkgs</command> will take an index file (Source index or "
"Package index) and sort the records so that they are ordered by the package "
@@ -4030,24 +4138,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:50
+#: apt-sortpkgs.1.xml:51
msgid "All output is sent to stdout, the input must be a seekable file."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-sortpkgs.1.xml:57
+#: apt-sortpkgs.1.xml:58
msgid "<option>--source</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-sortpkgs.1.xml:59
+#: apt-sortpkgs.1.xml:60
msgid ""
"Use Source index field ordering. Configuration Item: "
"<literal>APT::SortPkgs::Source</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:73
+#: apt-sortpkgs.1.xml:74
msgid ""
"<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
"100 on error."
@@ -4060,11 +4168,11 @@ 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>"
+"</author> &apt-email; &apt-product; <date>18 September 2009</date>"
msgstr ""
#. type: Content of: <refentry><refnamediv><refname>
-#: apt.conf.5.xml:28 apt.conf.5.xml:34
+#: apt.conf.5.xml:28 apt.conf.5.xml:35
msgid "apt.conf"
msgstr ""
@@ -4074,12 +4182,12 @@ msgid "5"
msgstr ""
#. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.conf.5.xml:35
+#: apt.conf.5.xml:36
msgid "Configuration file for APT"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:39
+#: apt.conf.5.xml:40
msgid ""
"<filename>apt.conf</filename> is the main configuration file for the APT "
"suite of tools, all tools make use of the configuration file and a common "
@@ -4093,7 +4201,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:49
+#: 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 "
@@ -4103,7 +4211,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:55
+#: apt.conf.5.xml:56
msgid ""
"Syntactically the configuration language is modeled after what the ISC tools "
"such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@ -4115,7 +4223,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:65
+#: apt.conf.5.xml:66
#, no-wrap
msgid ""
"APT {\n"
@@ -4127,7 +4235,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:73
+#: apt.conf.5.xml:74
msgid ""
"with newlines placed to make it more readable. Lists can be created by "
"opening a scope and including a single string enclosed in quotes followed by "
@@ -4136,13 +4244,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:78
+#: apt.conf.5.xml:79
#, no-wrap
msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:81
+#: apt.conf.5.xml:82
msgid ""
"In general the sample configuration file in "
"<filename>&docdir;examples/apt.conf</filename> &configureindex; is a good "
@@ -4150,25 +4258,25 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:85
+#: apt.conf.5.xml:86
msgid ""
"The names of the configuration items are not case-sensitive. So in the "
"previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:88
+#: apt.conf.5.xml:89
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 "
+"configuration tree. The specified element and all its descendants are "
"erased."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:94
+#: apt.conf.5.xml:95
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 "
@@ -4178,24 +4286,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:101
+#: apt.conf.5.xml:102
msgid "The APT Group"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:102
+#: apt.conf.5.xml:103
msgid ""
"This group of options controls general APT behavior as well as holding the "
"options for all of the tools."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:106
+#: apt.conf.5.xml:107
msgid "Architecture"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:107
+#: apt.conf.5.xml:108
msgid ""
"System Architecture; sets the architecture to use when fetching files and "
"parsing package lists. The internal default is the architecture apt was "
@@ -4203,12 +4311,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:112
+#: apt.conf.5.xml:113
msgid "Default-Release"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:113
+#: apt.conf.5.xml:114
msgid ""
"Default release to install packages from if more than one version "
"available. Contains release name, codename or release version. Examples: "
@@ -4217,24 +4325,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:117
+#: apt.conf.5.xml:118
msgid "Ignore-Hold"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:118
+#: apt.conf.5.xml:119
msgid ""
"Ignore Held packages; This global option causes the problem resolver to "
"ignore held packages in its decision making."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:122
+#: apt.conf.5.xml:123
msgid "Clean-Installed"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:123
+#: apt.conf.5.xml:124
msgid ""
"Defaults to on. When turned on the autoclean feature will remove any "
"packages which can no longer be downloaded from the cache. If turned off "
@@ -4243,12 +4351,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:129
+#: apt.conf.5.xml:130
msgid "Immediate-Configure"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:130
+#: apt.conf.5.xml:131
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 "
@@ -4258,12 +4366,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:137
+#: apt.conf.5.xml:138
msgid "Force-LoopBreak"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:138
+#: apt.conf.5.xml:139
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 "
@@ -4274,87 +4382,87 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:146
+#: apt.conf.5.xml:147
msgid "Cache-Limit"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:147
+#: apt.conf.5.xml:148
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:151
+#: apt.conf.5.xml:152
msgid "Build-Essential"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:152
+#: apt.conf.5.xml:153
msgid "Defines which package(s) are considered essential build dependencies."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:155
+#: apt.conf.5.xml:156
msgid "Get"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:156
+#: apt.conf.5.xml:157
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:160
+#: apt.conf.5.xml:161
msgid "Cache"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:161
+#: apt.conf.5.xml:162
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:165
+#: apt.conf.5.xml:166
msgid "CDROM"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:166
+#: apt.conf.5.xml:167
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:172
+#: apt.conf.5.xml:173
msgid "The Acquire Group"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:177
+#: apt.conf.5.xml:178
msgid "PDiffs"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:178
+#: apt.conf.5.xml:179
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:183
+#: apt.conf.5.xml:184
msgid "Queue-Mode"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:184
+#: apt.conf.5.xml:185
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of "
"<literal>host</literal> or <literal>access</literal> which determines how "
@@ -4364,47 +4472,48 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:191
+#: apt.conf.5.xml:192
msgid "Retries"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:192
+#: apt.conf.5.xml:193
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:196
+#: apt.conf.5.xml:197
msgid "Source-Symlinks"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:197
+#: apt.conf.5.xml:198
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:201 sources.list.5.xml:138
+#: apt.conf.5.xml:202 sources.list.5.xml:139
msgid "http"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:202
+#: apt.conf.5.xml:203
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."
+"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
+"settings is specified, <envar>http_proxy</envar> environment variable will "
+"be used."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:209
+#: apt.conf.5.xml:211
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 "
@@ -4418,7 +4527,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:219 apt.conf.5.xml:267
+#: apt.conf.5.xml:221 apt.conf.5.xml:273
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method, this applies to all things including connection timeout and data "
@@ -4426,7 +4535,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:222
+#: apt.conf.5.xml:224
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) "
@@ -4438,12 +4547,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:231
+#: apt.conf.5.xml:233
msgid "https"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:232
+#: apt.conf.5.xml:234
msgid ""
"HTTPS URIs. Cache-control and proxy options are the same as for "
"<literal>http</literal> method. <literal>Pipeline-Depth</literal> option is "
@@ -4451,7 +4560,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:238
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -4473,20 +4582,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:254 sources.list.5.xml:149
+#: apt.conf.5.xml:256 sources.list.5.xml:150
msgid "ftp"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:255
-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 "
+#: apt.conf.5.xml:257
+msgid ""
+"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
+"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
+"proxies can also be specified by using the form "
+"<literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
+"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
+"settings is specified, <envar>ftp_proxy</envar> environment variable will be "
+"used. To use a ftp proxy you will have to set the "
+"<literal>ftp::ProxyLogin</literal> script in the configuration file. This "
+"entry specifies the commands to send to tell the proxy server what to "
+"connect to. Please see &configureindex; for an example of how to do "
+"this. The substitution variables available are "
"<literal>$(PROXY_USER)</literal> <literal>$(PROXY_PASS)</literal> "
"<literal>$(SITE_USER)</literal> <literal>$(SITE_PASS)</literal> "
"<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal> Each is taken "
@@ -4494,7 +4607,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:270
+#: apt.conf.5.xml:276
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 "
@@ -4504,7 +4617,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:277
+#: apt.conf.5.xml:283
msgid ""
"It is possible to proxy FTP over HTTP by setting the "
"<envar>ftp_proxy</envar> environment variable to a http url - see the "
@@ -4514,7 +4627,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:282
+#: apt.conf.5.xml:288
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4524,18 +4637,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:289 sources.list.5.xml:131
+#: apt.conf.5.xml:295 sources.list.5.xml:132
msgid "cdrom"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:295
+#: apt.conf.5.xml:301
#, no-wrap
msgid "\"/cdrom/\"::Mount \"foo\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:290
+#: apt.conf.5.xml:296
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 "
@@ -4548,20 +4661,105 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:300
+#: apt.conf.5.xml:306
msgid "gpgv"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:301
+#: apt.conf.5.xml:307
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
"passed to gpgv."
msgstr ""
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: apt.conf.5.xml:312
+msgid "CompressionTypes"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
+#: apt.conf.5.xml:318
+#, 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:313
+msgid ""
+"List of compression types which are understood by the acquire methods. "
+"Files like <filename>Packages</filename> can be available in various "
+"compression formats. Per default the acquire methods can decompress "
+"<command>bzip2</command>, <command>lzma</command> and "
+"<command>gzip</command> compressed files, with this setting more formats can "
+"be added on the fly or the used method can be changed. The syntax for this "
+"is: <placeholder type=\"synopsis\" id=\"0\"/>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
+#: apt.conf.5.xml:323
+#, no-wrap
+msgid "Acquire::CompressionTypes::Order:: \"gz\";"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
+#: apt.conf.5.xml:326
+#, no-wrap
+msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:319
+msgid ""
+"Also the <literal>Order</literal> subgroup can be used to define in which "
+"order the acquire system will try to download the compressed files. The "
+"acquire system will try the first and proceed with the next compression type "
+"in this list on error, so to prefer one over the other type simple add the "
+"preferred type at first - not already added default types will be added at "
+"run time to the end of the list, so e.g. <placeholder type=\"synopsis\" "
+"id=\"0\"/> can be used to prefer <command>gzip</command> compressed files "
+"over <command>bzip2</command> and <command>lzma</command>. If "
+"<command>lzma</command> should be preferred over <command>gzip</command> and "
+"<command>bzip2</command> the configure setting should look like this "
+"<placeholder type=\"synopsis\" id=\"1\"/> It is not needed to add "
+"<literal>bz2</literal> explicit to the list as it will be added automatic."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
+#: apt.conf.5.xml:330
+#, no-wrap
+msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:328
+msgid ""
+"Note that at run time the "
+"<literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will be "
+"checked: If this setting exists the method will only be used if this file "
+"exists, e.g. for the bzip2 method (the inbuilt) setting is <placeholder "
+"type=\"literallayout\" id=\"0\"/> Note also that list entries specified on "
+"the commandline will be added at the end of the list specified in the "
+"configuration files, but before the default entries. To prefer a type in "
+"this case over the ones specified in in the configuration files you can set "
+"the option direct - not in list style. This will not override the defined "
+"list, it will only prefix the list with this type."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:335
+msgid ""
+"While it is possible to add an empty compression type to the order list, but "
+"APT in its current version doesn't understand it correctly and will display "
+"many warnings about not downloaded files - these warnings are most of the "
+"time false negatives. Future versions will maybe include a way to really "
+"prefer uncompressed files to support the usage of local mirrors."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:173
+#: apt.conf.5.xml:174
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages and the URI handlers. <placeholder type=\"variablelist\" "
@@ -4569,12 +4767,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:310
+#: apt.conf.5.xml:344
msgid "Directories"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:312
+#: apt.conf.5.xml:346
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -4586,7 +4784,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:319
+#: apt.conf.5.xml:353
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4599,7 +4797,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:328
+#: apt.conf.5.xml:362
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4609,7 +4807,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:334
+#: apt.conf.5.xml:368
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 "
@@ -4617,19 +4815,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:338
+#: apt.conf.5.xml:372
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."
+"<literal>bzip2</literal>, <literal>lzma</literal>, <literal>dpkg</literal>, "
+"<literal>apt-get</literal> <literal>dpkg-source</literal> "
+"<literal>dpkg-buildpackage</literal> and <literal>apt-cache</literal> "
+"specify the location of the respective programs."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:345
+#: apt.conf.5.xml:380
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4642,12 +4840,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:358
+#: apt.conf.5.xml:393
msgid "APT in DSelect"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:360
+#: apt.conf.5.xml:395
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -4655,12 +4853,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:364
+#: apt.conf.5.xml:399
msgid "Clean"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:365
+#: apt.conf.5.xml:400
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 "
@@ -4671,50 +4869,50 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:374
+#: apt.conf.5.xml:409
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:378
+#: apt.conf.5.xml:413
msgid "Updateoptions"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:379
+#: apt.conf.5.xml:414
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:383
+#: apt.conf.5.xml:418
msgid "PromptAfterUpdate"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:384
+#: apt.conf.5.xml:419
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:390
+#: apt.conf.5.xml:425
msgid "How APT calls dpkg"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:391
+#: apt.conf.5.xml:426
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:396
+#: apt.conf.5.xml:431
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 "
@@ -4722,17 +4920,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:401
+#: apt.conf.5.xml:436
msgid "Pre-Invoke"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:401
+#: apt.conf.5.xml:436
msgid "Post-Invoke"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:402
+#: apt.conf.5.xml:437
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 "
@@ -4741,12 +4939,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:408
+#: apt.conf.5.xml:443
msgid "Pre-Install-Pkgs"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:409
+#: apt.conf.5.xml:444
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 "
@@ -4756,7 +4954,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:415
+#: apt.conf.5.xml:450
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -4767,36 +4965,199 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:422
+#: apt.conf.5.xml:457
msgid "Run-Directory"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:423
+#: apt.conf.5.xml:458
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:427
+#: apt.conf.5.xml:462
msgid "Build-options"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:428
+#: apt.conf.5.xml:463
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:468
+msgid "dpkg trigger usage (and related options)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt.conf.5.xml:469
+msgid ""
+"APT can call dpkg in a way so it can make aggressive use of triggers over "
+"multiply calls of dpkg. Without further options dpkg will use triggers only "
+"in between his own run. Activating these options can therefore decrease the "
+"time needed to perform the install / upgrade. Note that it is intended to "
+"activate these options per default in the future, but as it changes the way "
+"APT calling dpkg drastical it needs a lot more testing. <emphasis>These "
+"options are therefore currently experimental and should not be used in "
+"productive environments.</emphasis> Also it breaks the progress reporting so "
+"all frontends will currently stay around half (or more) of the time in the "
+"100% state while it actually configures all packages."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
+#: apt.conf.5.xml:484
+#, no-wrap
+msgid ""
+"DPkg::NoTriggers \"true\";\n"
+"PackageManager::Configure \"smart\";\n"
+"DPkg::ConfigurePending \"true\";\n"
+"DPkg::TriggersPending \"true\";"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt.conf.5.xml:478
+msgid ""
+"Note that it is not garanteed that APT will support these options or that "
+"these options will not cause (big) trouble in the future. If you have "
+"understand the current risks and problems with these options, but are brave "
+"enough to help testing them create a new configuration file and test a "
+"combination of options. Please report any bugs, problems and improvements "
+"you encounter and make sure to note which options you have used in your "
+"reports. Asking dpkg for help could also be useful for debugging proposes, "
+"see e.g. <command>dpkg --audit</command>. A defensive option combination "
+"would be <placeholder type=\"literallayout\" id=\"0\"/>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt.conf.5.xml:490
+msgid "DPkg::NoTriggers"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:491
+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."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt.conf.5.xml:498
+msgid "PackageManager::Configure"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:499
+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!"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt.conf.5.xml:509
+msgid "DPkg::ConfigurePending"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:510
+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."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt.conf.5.xml:516
+msgid "DPkg::TriggersPending"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:517
+msgid ""
+"Useful for <literal>smart</literal> configuration as a package which has "
+"pending triggers is not considered as <literal>installed</literal> and dpkg "
+"treats them as <literal>unpacked</literal> currently which is a dealbreaker "
+"for Pre-Dependencies (see debbugs #526774). Note that this will process all "
+"triggers, not only the triggers needed to configure this package."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt.conf.5.xml:522
+msgid "PackageManager::UnpackAll"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:523
+msgid ""
+"As the configuration can be deferred to be done at the end by dpkg it can be "
+"tried to order the unpack series only by critical needs, e.g. by "
+"Pre-Depends. Default is true and therefore the \"old\" method of ordering in "
+"verious steps by everything. While both method were present in earlier APT "
+"versions the <literal>OrderCritical</literal> method was unused, so this "
+"method is very experimental and needs further improvements before becoming "
+"really useful."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt.conf.5.xml:530
+msgid "OrderList::Score::Immediate"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
+#: apt.conf.5.xml:538
+#, no-wrap
+msgid ""
+"OrderList::Score {\n"
+"\tDelete 500;\n"
+"\tEssential 200;\n"
+"\tImmediate 10;\n"
+"\tPreDepends 50;\n"
+"};"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:531
+msgid ""
+"Essential packages (and there dependencies) should be configured immediately "
+"after unpacking. It will be a good idea to do this quite early in the "
+"upgrade process as these these configure calls require currently also "
+"<literal>DPkg::TriggersPending</literal> which will run quite a few triggers "
+"(which maybe not needed). Essentials get per default a high score but the "
+"immediate flag is relativly low (a package which has a Pre-Depends is higher "
+"rated). These option and the others in the same group can be used to change "
+"the scoring. The following example shows the settings with there default "
+"values. <placeholder type=\"literallayout\" id=\"0\"/>"
+msgstr ""
+
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:435
+#: apt.conf.5.xml:551
msgid "Periodic and Archives options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:436
+#: apt.conf.5.xml:552
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -4805,12 +5166,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:444
+#: apt.conf.5.xml:560
msgid "Debug options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:446
+#: apt.conf.5.xml:562
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -4821,7 +5182,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:457
+#: apt.conf.5.xml:573
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, "
@@ -4829,7 +5190,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:465
+#: apt.conf.5.xml:581
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s "
@@ -4837,7 +5198,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:474
+#: apt.conf.5.xml:590
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -4847,110 +5208,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:482
+#: apt.conf.5.xml:598
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:492
+#: apt.conf.5.xml:608
msgid "A full list of debugging options to apt follows."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:497
+#: apt.conf.5.xml:613
msgid "<literal>Debug::Acquire::cdrom</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:501
+#: apt.conf.5.xml:617
msgid "Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:508
+#: apt.conf.5.xml:624
msgid "<literal>Debug::Acquire::ftp</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:628
msgid "Print information related to downloading packages using FTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:519
+#: apt.conf.5.xml:635
msgid "<literal>Debug::Acquire::http</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:523
+#: apt.conf.5.xml:639
msgid "Print information related to downloading packages using HTTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:530
+#: apt.conf.5.xml:646
msgid "<literal>Debug::Acquire::https</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:534
+#: apt.conf.5.xml:650
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:541
+#: apt.conf.5.xml:657
msgid "<literal>Debug::Acquire::gpgv</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:545
+#: apt.conf.5.xml:661
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:552
+#: apt.conf.5.xml:668
msgid "<literal>Debug::aptcdrom</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:556
+#: apt.conf.5.xml:672
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:563
+#: apt.conf.5.xml:679
msgid "<literal>Debug::BuildDeps</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:682
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:573
+#: apt.conf.5.xml:689
msgid "<literal>Debug::Hashes</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:576
+#: apt.conf.5.xml:692
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:583
+#: apt.conf.5.xml:699
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:586
+#: apt.conf.5.xml:702
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 "
@@ -4958,92 +5319,92 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:594
+#: apt.conf.5.xml:710
msgid "<literal>Debug::NoLocking</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:597
+#: apt.conf.5.xml:713
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:605
+#: apt.conf.5.xml:721
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:609
+#: apt.conf.5.xml:725
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:616
+#: apt.conf.5.xml:732
msgid "<literal>Debug::pkgAcquire::Auth</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:619
+#: apt.conf.5.xml:735
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:626
+#: apt.conf.5.xml:742
msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:629
+#: apt.conf.5.xml:745
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:637
+#: apt.conf.5.xml:753
msgid "<literal>Debug::pkgAcquire::RRed</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:641
+#: apt.conf.5.xml:757
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:648
+#: apt.conf.5.xml:764
msgid "<literal>Debug::pkgAcquire::Worker</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:652
+#: apt.conf.5.xml:768
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:659
+#: apt.conf.5.xml:775
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:663
+#: apt.conf.5.xml:779
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:670
+#: apt.conf.5.xml:786
msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:673
+#: apt.conf.5.xml:789
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial "
@@ -5053,12 +5414,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:800
msgid "<literal>Debug::pkgDepCache::Marker</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:687
+#: apt.conf.5.xml:803
msgid ""
"Generate debug messages describing which package is marked as "
"keep/install/remove while the ProblemResolver does his work. Each addition "
@@ -5076,90 +5437,90 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:706
+#: apt.conf.5.xml:822
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:709
+#: apt.conf.5.xml:825
msgid "Dump the default configuration to standard error on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:716
+#: apt.conf.5.xml:832
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:719
+#: apt.conf.5.xml:835
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:727
+#: apt.conf.5.xml:843
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:730
+#: apt.conf.5.xml:846
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:737
+#: apt.conf.5.xml:853
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:857
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:749
+#: apt.conf.5.xml:865
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:753
+#: apt.conf.5.xml:869
msgid "Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:760
+#: apt.conf.5.xml:876
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:764
+#: apt.conf.5.xml:880
msgid "Output the priority of each package list on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:770
+#: apt.conf.5.xml:886
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:774
+#: apt.conf.5.xml:890
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:782
+#: apt.conf.5.xml:898
msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:785
+#: apt.conf.5.xml:901
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 "
@@ -5167,27 +5528,32 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:793
+#: apt.conf.5.xml:909
msgid "<literal>Debug::sourceList</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:913
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:819
+#: apt.conf.5.xml:935
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
msgstr ""
+#. type: Content of: <refentry><refsect1><variablelist>
+#: apt.conf.5.xml:942
+msgid "&file-aptconf;"
+msgstr ""
+
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:829
+#: apt.conf.5.xml:947
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr ""
@@ -5198,25 +5564,26 @@ msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>"
msgstr ""
#. type: Content of: <refentry><refnamediv><refname>
-#: apt_preferences.5.xml:21 apt_preferences.5.xml:27
+#: apt_preferences.5.xml:21 apt_preferences.5.xml:28
msgid "apt_preferences"
msgstr ""
#. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt_preferences.5.xml:28
+#: apt_preferences.5.xml:29
msgid "Preference control file for APT"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:33
+#: apt_preferences.5.xml:34
msgid ""
-"The APT preferences file <filename>/etc/apt/preferences</filename> can be "
-"used to control which versions of packages will be selected for "
+"The APT preferences file <filename>/etc/apt/preferences</filename> and the "
+"fragment files in the <filename>/etc/apt/preferences.d/</filename> folder "
+"can be used to control which versions of packages will be selected for "
"installation."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:37
+#: apt_preferences.5.xml:39
msgid ""
"Several versions of a package may be available for installation when the "
"&sources-list; file contains references to more than one distribution (for "
@@ -5229,7 +5596,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:47
+#: apt_preferences.5.xml:49
msgid ""
"Several instances of the same version of a package may be available when the "
"&sources-list; file contains references to more than one source. In this "
@@ -5239,12 +5606,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:54
+#: apt_preferences.5.xml:56
msgid "APT's Default Priority Assignments"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:69
+#: apt_preferences.5.xml:71
#, no-wrap
msgid ""
"<command>apt-get install -t testing "
@@ -5252,13 +5619,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:72
+#: apt_preferences.5.xml:74
#, no-wrap
msgid "APT::Default-Release \"stable\";\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:56
+#: apt_preferences.5.xml:58
msgid ""
"If there is no preferences file or if there is no entry in the file that "
"applies to a particular version then the priority assigned to that version "
@@ -5275,39 +5642,39 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:81
+#: apt_preferences.5.xml:83
msgid "priority 100"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:82
+#: apt_preferences.5.xml:84
msgid "to the version that is already installed (if any)."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:86
+#: apt_preferences.5.xml:88
msgid "priority 500"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:87
+#: apt_preferences.5.xml:89
msgid ""
"to the versions that are not installed and do not belong to the target "
"release."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:91
+#: apt_preferences.5.xml:93
msgid "priority 990"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:92
+#: apt_preferences.5.xml:94
msgid "to the versions that are not installed and belong to the target release."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:76
+#: apt_preferences.5.xml:78
msgid ""
"If the target release has been specified then APT uses the following "
"algorithm to set the priorities of the versions of a package. Assign: "
@@ -5315,7 +5682,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:97
+#: apt_preferences.5.xml:99
msgid ""
"If the target release has not been specified then APT simply assigns "
"priority 100 to all installed package versions and priority 500 to all "
@@ -5323,14 +5690,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:101
+#: apt_preferences.5.xml:103
msgid ""
"APT then applies the following rules, listed in order of precedence, to "
"determine which version of a package to install."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:104
+#: apt_preferences.5.xml:106
msgid ""
"Never downgrade unless the priority of an available version exceeds 1000. "
"(\"Downgrading\" is installing a less recent version of a package in place "
@@ -5340,19 +5707,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:110
+#: apt_preferences.5.xml:112
msgid "Install the highest priority version."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:111
+#: apt_preferences.5.xml:113
msgid ""
"If two or more versions have the same priority, install the most recent one "
"(that is, the one with the higher version number)."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:114
+#: apt_preferences.5.xml:116
msgid ""
"If two or more versions have the same priority and version number but either "
"the packages differ in some of their metadata or the "
@@ -5360,7 +5727,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:120
+#: apt_preferences.5.xml:122
msgid ""
"In a typical situation, the installed version of a package (priority 100) "
"is not as recent as one of the versions available from the sources listed in "
@@ -5371,7 +5738,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:127
+#: apt_preferences.5.xml:129
msgid ""
"More rarely, the installed version of a package is <emphasis>more</emphasis> "
"recent than any of the other available versions. The package will not be "
@@ -5381,7 +5748,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:132
+#: apt_preferences.5.xml:134
msgid ""
"Sometimes the installed version of a package is more recent than the version "
"belonging to the target release, but not as recent as a version belonging to "
@@ -5393,12 +5760,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:141
+#: apt_preferences.5.xml:143
msgid "The Effect of APT Preferences"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:143
+#: apt_preferences.5.xml:145
msgid ""
"The APT preferences file allows the system administrator to control the "
"assignment of priorities. The file consists of one or more multi-line "
@@ -5407,7 +5774,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:149
+#: apt_preferences.5.xml:151
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
"specified packages and specified version or version range. For example, the "
@@ -5417,7 +5784,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:156
+#: apt_preferences.5.xml:158
#, no-wrap
msgid ""
"Package: perl\n"
@@ -5426,7 +5793,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:162
+#: apt_preferences.5.xml:164
msgid ""
"The general form assigns a priority to all of the package versions in a "
"given distribution (that is, to all the versions of packages that are listed "
@@ -5436,7 +5803,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:168
+#: apt_preferences.5.xml:170
msgid ""
"This general-form entry in the APT preferences file applies only to groups "
"of packages. For example, the following record assigns a high priority to "
@@ -5444,7 +5811,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:173
+#: apt_preferences.5.xml:175
#, no-wrap
msgid ""
"Package: *\n"
@@ -5453,7 +5820,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:178
+#: apt_preferences.5.xml:180
msgid ""
"A note of caution: the keyword used here is \"<literal>origin</literal>\". "
"This should not be confused with the Origin of a distribution as specified "
@@ -5463,7 +5830,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:184
+#: apt_preferences.5.xml:186
msgid ""
"The following record assigns a low priority to all package versions "
"belonging to any distribution whose Archive name is "
@@ -5471,7 +5838,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:188
+#: apt_preferences.5.xml:190
#, no-wrap
msgid ""
"Package: *\n"
@@ -5480,7 +5847,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:193
+#: apt_preferences.5.xml:195
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is "
@@ -5488,7 +5855,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:197
+#: apt_preferences.5.xml:199
#, no-wrap
msgid ""
"Package: *\n"
@@ -5497,7 +5864,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:204
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -5505,7 +5872,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:207
+#: apt_preferences.5.xml:209
#, no-wrap
msgid ""
"Package: *\n"
@@ -5514,82 +5881,82 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:218
+#: apt_preferences.5.xml:220
msgid "How APT Interprets Priorities"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:226
+#: apt_preferences.5.xml:228
msgid "P &gt; 1000"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:227
+#: apt_preferences.5.xml:229
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:231
+#: apt_preferences.5.xml:233
msgid "990 &lt; P &lt;=1000"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:232
+#: apt_preferences.5.xml:234
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:237
+#: apt_preferences.5.xml:239
msgid "500 &lt; P &lt;=990"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:238
+#: apt_preferences.5.xml:240
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to the target release or the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:243
+#: apt_preferences.5.xml:245
msgid "100 &lt; P &lt;=500"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:244
+#: apt_preferences.5.xml:246
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to some other distribution or the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:249
+#: apt_preferences.5.xml:251
msgid "0 &lt; P &lt;=100"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:250
+#: apt_preferences.5.xml:252
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:254
+#: apt_preferences.5.xml:256
msgid "P &lt; 0"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:255
+#: apt_preferences.5.xml:257
msgid "prevents the version from being installed"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:221
+#: apt_preferences.5.xml:223
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -5597,7 +5964,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:260
+#: apt_preferences.5.xml:262
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -5606,14 +5973,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:266
+#: apt_preferences.5.xml:268
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:270
+#: apt_preferences.5.xml:272
#, no-wrap
msgid ""
"Package: perl\n"
@@ -5630,12 +5997,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:283
+#: apt_preferences.5.xml:285
msgid "Then:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:285
+#: apt_preferences.5.xml:287
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -5645,7 +6012,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:290
+#: apt_preferences.5.xml:292
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -5653,7 +6020,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:294
+#: apt_preferences.5.xml:296
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an "
@@ -5662,12 +6029,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:304
+#: apt_preferences.5.xml:306
msgid "Determination of Package Version and Distribution Properties"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:308
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -5675,27 +6042,27 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:318
+#: apt_preferences.5.xml:320
msgid "the <literal>Package:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:319
+#: apt_preferences.5.xml:321
msgid "gives the package name"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:322 apt_preferences.5.xml:372
+#: apt_preferences.5.xml:324 apt_preferences.5.xml:374
msgid "the <literal>Version:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml:325
msgid "gives the version number for the named package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:310
+#: apt_preferences.5.xml:312
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/<replaceable>component</replaceable>/<replaceable>arch</replaceable></filename>: "
@@ -5707,12 +6074,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:339
+#: apt_preferences.5.xml:341
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:340
+#: apt_preferences.5.xml:342
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -5723,18 +6090,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:350
+#: apt_preferences.5.xml:352
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:356
+#: apt_preferences.5.xml:358
msgid "the <literal>Codename:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:357
+#: apt_preferences.5.xml:359
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: squeeze\" specifies that all of the "
@@ -5745,13 +6112,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:366
+#: apt_preferences.5.xml:368
#, no-wrap
msgid "Pin: release n=squeeze\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:373
+#: apt_preferences.5.xml:375
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
@@ -5762,7 +6129,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:382
+#: apt_preferences.5.xml:384
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -5771,12 +6138,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:391
+#: apt_preferences.5.xml:393
msgid "the <literal>Component:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:392
+#: apt_preferences.5.xml:394
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -5788,18 +6155,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:401
+#: apt_preferences.5.xml:403
#, no-wrap
msgid "Pin: release c=main\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:407
+#: apt_preferences.5.xml:409
msgid "the <literal>Origin:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:408
+#: apt_preferences.5.xml:410
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is "
@@ -5808,18 +6175,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:414
+#: apt_preferences.5.xml:416
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:420
+#: apt_preferences.5.xml:422
msgid "the <literal>Label:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:421
+#: apt_preferences.5.xml:423
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is "
@@ -5828,13 +6195,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:427
+#: apt_preferences.5.xml:429
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:330
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -5848,7 +6215,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:434
+#: apt_preferences.5.xml:436
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -5863,12 +6230,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml:449
msgid "Optional Lines in an APT Preferences Record"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:449
+#: apt_preferences.5.xml:451
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -5876,7 +6243,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:453
+#: apt_preferences.5.xml:455
msgid ""
"The <literal>Pin-Priority:</literal> line in each APT preferences record is "
"optional. If omitted, APT assigns a priority of 1 less than the last value "
@@ -5885,12 +6252,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:462
+#: apt_preferences.5.xml:464
msgid "Tracking Stable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:470
+#: apt_preferences.5.xml:472
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -5905,7 +6272,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:466
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -5915,7 +6282,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:487 apt_preferences.5.xml:533 apt_preferences.5.xml:591
+#: apt_preferences.5.xml:489 apt_preferences.5.xml:535 apt_preferences.5.xml:593
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -5924,7 +6291,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:482
+#: apt_preferences.5.xml:484
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -5933,13 +6300,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:499
+#: apt_preferences.5.xml:501
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:493
+#: apt_preferences.5.xml:495
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -5948,12 +6315,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:507
msgid "Tracking Testing or Unstable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:514
+#: apt_preferences.5.xml:516
#, no-wrap
msgid ""
"Package: *\n"
@@ -5970,7 +6337,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:507
+#: apt_preferences.5.xml:509
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -5981,7 +6348,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:528
+#: apt_preferences.5.xml:530
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -5990,13 +6357,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:550
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:539
+#: apt_preferences.5.xml:541
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -6008,12 +6375,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:555
+#: apt_preferences.5.xml:557
msgid "Tracking the evolution of a codename release"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:569
+#: apt_preferences.5.xml:571
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package "
@@ -6035,7 +6402,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:559
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -6050,7 +6417,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:586
+#: apt_preferences.5.xml:588
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest version(s) in "
@@ -6059,13 +6426,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:606
+#: apt_preferences.5.xml:608
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:597
+#: apt_preferences.5.xml:599
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -6076,23 +6443,28 @@ msgid ""
"type=\"programlisting\" id=\"0\"/>"
msgstr ""
+#. type: Content of: <refentry><refsect1><variablelist>
+#: apt_preferences.5.xml:617
+msgid "&file-preferences;"
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:614
+#: apt_preferences.5.xml:623
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr ""
#. type: Content of: <refentry><refnamediv><refname>
-#: sources.list.5.xml:22 sources.list.5.xml:28
+#: sources.list.5.xml:22 sources.list.5.xml:29
msgid "sources.list"
msgstr ""
#. type: Content of: <refentry><refnamediv><refpurpose>
-#: sources.list.5.xml:29
+#: sources.list.5.xml:30
msgid "Package resource list for APT"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:33
+#: sources.list.5.xml:34
msgid ""
"The package resource list is used to locate archives of the package "
"distribution system in use on the system. At this time, this manual page "
@@ -6101,7 +6473,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:38
+#: sources.list.5.xml:39
msgid ""
"The source list is designed to support any number of active sources and a "
"variety of source media. The file lists one source per line, with the most "
@@ -6114,12 +6486,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:49
+#: sources.list.5.xml:50
msgid "sources.list.d"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:50
+#: sources.list.5.xml:51
msgid ""
"The <filename>/etc/apt/sources.list.d</filename> directory provides a way to "
"add sources.list entries in separate files. The format is the same as for "
@@ -6130,12 +6502,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:59
+#: sources.list.5.xml:60
msgid "The deb and deb-src types"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:60
+#: sources.list.5.xml:61
msgid ""
"The <literal>deb</literal> type describes a typical two-level Debian "
"archive, <filename>distribution/component</filename>. Typically, "
@@ -6150,20 +6522,20 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:72
+#: 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 are:"
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:75
+#: sources.list.5.xml:76
#, no-wrap
msgid "deb uri distribution [component1] [component2] [...]"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:77
+#: sources.list.5.xml:78
msgid ""
"The URI for the <literal>deb</literal> type must specify the base of the "
"Debian distribution, from which APT will find the information it needs. "
@@ -6176,7 +6548,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:86
+#: sources.list.5.xml:87
msgid ""
"<literal>distribution</literal> may also contain a variable, "
"<literal>$(ARCH)</literal> which expands to the Debian architecture (i386, "
@@ -6188,7 +6560,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:94
+#: sources.list.5.xml:95
msgid ""
"Since only one distribution can be specified per line it may be necessary to "
"have multiple lines for the same URI, if a subset of all available "
@@ -6203,7 +6575,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:106
+#: sources.list.5.xml:107
msgid ""
"It is important to list sources in order of preference, with the most "
"preferred source listed first. Typically this will result in sorting by "
@@ -6212,12 +6584,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:111
+#: sources.list.5.xml:112
msgid "Some examples:"
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:113
+#: sources.list.5.xml:114
#, no-wrap
msgid ""
"deb http://http.us.debian.org/debian stable main contrib non-free\n"
@@ -6226,17 +6598,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:119
+#: sources.list.5.xml:120
msgid "URI specification"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:124
+#: sources.list.5.xml:125
msgid "file"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:126
+#: sources.list.5.xml:127
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -6244,7 +6616,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:133
+#: sources.list.5.xml:134
msgid ""
"The cdrom scheme allows APT to use a local CDROM drive with media "
"swapping. Use the &apt-cdrom; program to create cdrom entries in the source "
@@ -6252,7 +6624,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:140
+#: sources.list.5.xml:141
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format "
@@ -6263,7 +6635,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:151
+#: sources.list.5.xml:152
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual "
@@ -6275,12 +6647,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:160
+#: sources.list.5.xml:161
msgid "copy"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:162
+#: sources.list.5.xml:163
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -6288,17 +6660,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:167
+#: sources.list.5.xml:168
msgid "rsh"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:167
+#: sources.list.5.xml:168
msgid "ssh"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:169
+#: sources.list.5.xml:170
msgid ""
"The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
"user and access the files. It is a good idea to do prior arrangements with "
@@ -6308,75 +6680,75 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:121
+#: sources.list.5.xml:122
msgid ""
"The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
"rsh. <placeholder type=\"variablelist\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:181
+#: 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:183
+#: 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:185
+#: 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:186
+#: 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:188
+#: sources.list.5.xml:189
msgid "Source line for the above"
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:189
+#: 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:191
+#: 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:193
+#: 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:195
+#: 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:197
+#: 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:199
+#: 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 "
@@ -6386,20 +6758,20 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:203
+#: 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:205
+#: 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:207
+#: sources.list.5.xml:208
#, no-wrap
msgid ""
"deb http://nonus.debian.org/debian-non-US stable/non-US main contrib "
@@ -6407,13 +6779,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:216
+#: 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:209
+#: 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 "
@@ -6425,6 +6797,6 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:221
+#: sources.list.5.xml:222
msgid "&apt-cache; &apt-conf;"
msgstr ""
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 906d86da3..6088f9ecf 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-07-30 22:55+0900\n"
+"POT-Creation-Date: 2009-09-18 17:09+0300\n"
"PO-Revision-Date: 2009-09-14 20:15+0200\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -20,7 +20,8 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. type: TH
-#: apt.8:17, no-wrap
+#: apt.8:17
+#, no-wrap
msgid "apt"
msgstr "apt"
@@ -72,8 +73,10 @@ msgid ""
"(8) for the command line or B<synaptic>(8) for the X Window System. Some "
"options are only implemented in B<apt-get>(8) though."
msgstr ""
-"APT est un système de gestion de paquets logiciels. Pour la gestion au quotidien des paquets, il existe plusieurs frontaux comme B<aptitude>(9) à "
-"la ligne de commande ou B<synaptic>(8) pour X Window. Cependant, certaines options ne sont disponibles que dans B<apt-get>(8)."
+"APT est un système de gestion de paquets logiciels. Pour la gestion au "
+"quotidien des paquets, il existe plusieurs frontaux comme B<aptitude>(9) à "
+"la ligne de commande ou B<synaptic>(8) pour X Window. Cependant, certaines "
+"options ne sont disponibles que dans B<apt-get>(8)."
#. type: SH
#: apt.8:31
@@ -117,8 +120,8 @@ msgstr "DIAGNOSTIQUE"
#: apt.8:44
msgid "apt returns zero on normal operation, decimal 100 on error."
msgstr ""
-"apt-get renvoie zéro après une opération normale et la "
-"valeur décimale 100 en cas d'erreur."
+"apt-get renvoie zéro après une opération normale et la valeur décimale 100 "
+"en cas d'erreur."
#. type: SH
#: apt.8:44
@@ -138,8 +141,9 @@ msgid ""
"B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the "
"B<reportbug>(1) command."
msgstr ""
-"Voir E<lt>http://bugs.debian.org/aptE<gt>. Si vous souhaitez remonter un bogue dans B<apt>, veuillez lire I</usr/share/doc/debian/bug-reporting.txt>"
-" ou utiliser la commande B<reportbug>(1)."
+"Voir E<lt>http://bugs.debian.org/aptE<gt>. Si vous souhaitez remonter un "
+"bogue dans B<apt>, veuillez lire I</usr/share/doc/debian/bug-reporting.txt> "
+"ou utiliser la commande B<reportbug>(1)."
#. type: SH
#: apt.8:55
@@ -150,7 +154,9 @@ msgstr "AUTEURS"
#. type: Plain text
#: apt.8:56
msgid "apt was written by the APT team E<lt>apt@packages.debian.orgE<gt>."
-msgstr "apt a été écrit par l'équipe de développement APT E<lt>apt@packages.debian.orgE<gt>."
+msgstr ""
+"apt a été écrit par l'équipe de développement APT E<lt>apt@packages.debian."
+"orgE<gt>."
#. type: Plain text
#: apt.ent:2
@@ -559,14 +565,26 @@ msgstr ""
">\n"
#. type: Plain text
-#: apt.ent:165
-#, no-wrap
+#: 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"
" <refentryinfo>\n"
" <address><email>apt@packages.debian.org</email></address>\n"
-" <author><firstname>Jason</firstname> <surname>Gunthorpe</surname></author>\n"
+" <author>\n"
+" <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
+" <contrib></contrib>\n"
+" </author>\n"
" <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>\n"
" <date>28 October 2008</date>\n"
" <productname>Linux</productname>\n"
@@ -581,7 +599,7 @@ msgstr ""
" <productname>Linux</productname>\n"
#. type: Plain text
-#: apt.ent:168
+#: apt.ent:171
#, no-wrap
msgid ""
" </refentryinfo>\n"
@@ -591,7 +609,7 @@ msgstr ""
"\"> \n"
#. type: Plain text
-#: apt.ent:174 apt.ent:204
+#: apt.ent:177
#, no-wrap
msgid ""
"<!ENTITY apt-email \"\n"
@@ -607,13 +625,21 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:181 apt.ent:211
-#, no-wrap
+#: 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"
" <firstname>Jason</firstname>\n"
" <surname>Gunthorpe</surname>\n"
+" <contrib></contrib>\n"
" </author>\n"
"\">\n"
msgstr ""
@@ -625,13 +651,21 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:188
-#, no-wrap
+#: 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"
" <firstname>Mike</firstname>\n"
" <surname>O'Connor</surname>\n"
+" <contrib></contrib>\n"
" </author>\n"
"\">\n"
msgstr ""
@@ -643,12 +677,19 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:194 apt.ent:217
-#, no-wrap
+#: 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"
" <othername>APT team</othername>\n"
+" <contrib></contrib>\n"
" </author>\n"
"\">\n"
msgstr ""
@@ -659,7 +700,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:198 apt.ent:228
+#: apt.ent:204 apt.ent:215
#, no-wrap
msgid ""
"<!ENTITY apt-product \"\n"
@@ -671,7 +712,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:224
+#: apt.ent:211
#, no-wrap
msgid ""
"<!ENTITY apt-copyright \"\n"
@@ -689,7 +730,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:234
+#: apt.ent:221
#, no-wrap
msgid ""
"<!ENTITY apt-qapage \"\n"
@@ -705,7 +746,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:245
+#: apt.ent:232
#, no-wrap
msgid ""
"<!-- Boiler plate Bug reporting section -->\n"
@@ -731,7 +772,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:253
+#: apt.ent:240
#, no-wrap
msgid ""
"<!-- Boiler plate Author section -->\n"
@@ -751,7 +792,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:263
+#: apt.ent:250
#, no-wrap
msgid ""
"<!-- Should be used within the option section of the text to\n"
@@ -775,7 +816,7 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:271
+#: apt.ent:258
#, no-wrap
msgid ""
" <varlistentry>\n"
@@ -795,7 +836,7 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:281
+#: apt.ent:268
#, no-wrap
msgid ""
" <varlistentry>\n"
@@ -819,7 +860,7 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:293
+#: apt.ent:280
#, no-wrap
msgid ""
" <varlistentry>\n"
@@ -847,7 +888,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:304
+#: apt.ent:291
#, no-wrap
msgid ""
"<!-- Should be used within the option section of the text to\n"
@@ -872,7 +913,126 @@ msgstr ""
" </para>\n"
"\">\n"
-#. The last update date
+#. type: Plain text
+#: apt.ent:297
+#, no-wrap
+msgid ""
+"<!ENTITY file-aptconf \"\n"
+" <varlistentry><term><filename>/etc/apt/apt.conf</filename></term>\n"
+" <listitem><para>APT configuration file.\n"
+" Configuration Item: <literal>Dir::Etc::Main</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:303
+#, no-wrap
+msgid ""
+" <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
+" <listitem><para>APT configuration file fragments.\n"
+" Configuration Item: <literal>Dir::Etc::Parts</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+"\">\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:309
+#, no-wrap
+msgid ""
+"<!ENTITY file-cachearchives \"\n"
+" <varlistentry><term><filename>&cachedir;/archives/</filename></term>\n"
+" <listitem><para>Storage area for retrieved package files.\n"
+" Configuration Item: <literal>Dir::Cache::Archives</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+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"
+" Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>\n"
+" </varlistentry>\n"
+"\">\n"
+msgstr "Zone de stockage pour les paquets en transit. Élément de configuration : <literal>Dir::Cache::Archives</literal> (implicitement, partial)."
+
+#. 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"
+" <listitem><para>Version preferences file.\n"
+" This is where you would specify &quot;pinning&quot;,\n"
+" i.e. a preference to get certain packages\n"
+" from a separate source\n"
+" or from a different version of a distribution.\n"
+" Configuration Item: <literal>Dir::Etc::Preferences</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+msgstr "Fichier des préférences. C'est dans ce fichier qu'on peut faire de l'étiquetage (pinning) c'est-à-dire, choisir d'obtenir des paquets d'une source distincte ou d'une distribution différente. Élément de configuration : <literal>Dir::Etc::Preferences</literal>."
+
+#. type: Plain text
+#: apt.ent:331
+#, no-wrap
+msgid ""
+" <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
+" <listitem><para>File fragments for the version preferences.\n"
+" Configuration Item: <literal>Dir::Etc::PreferencesParts</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+"\">\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:337
+#, no-wrap
+msgid ""
+"<!ENTITY file-sourceslist \"\n"
+" <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n"
+" <listitem><para>Locations to fetch packages from.\n"
+" Configuration Item: <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:343
+#, no-wrap
+msgid ""
+" <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
+" <listitem><para>File fragments for locations to fetch packages from.\n"
+" Configuration Item: <literal>Dir::Etc::SourceParts</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+"\">\n"
+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"
+" <listitem><para>Storage area for state information for each package resource specified in\n"
+" &sources-list;\n"
+" Configuration Item: <literal>Dir::State::Lists</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+msgstr "Zone de stockage pour les informations qui concernent chaque ressource de paquet spécifiée dans &sources-list; Élément de configuration : <literal>Dir::State::Lists</literal>."
+
+#. 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"
+" Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>\n"
+" </varlistentry>\n"
+"\">\n"
+msgstr "Zone de stockage pour les informations en transit. Élément de configuration : <literal>Dir::State::Lists</literal> (partial est implicite)."
+
+#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13
#: apt-ftparchive.1.xml:13 apt-sortpkgs.1.xml:13 sources.list.5.xml:13
@@ -884,7 +1044,7 @@ msgstr ""
"février 2004</date>"
#. type: Content of: <refentry><refnamediv><refname>
-#: apt-cache.8.xml:22 apt-cache.8.xml:28
+#: apt-cache.8.xml:22 apt-cache.8.xml:29
msgid "apt-cache"
msgstr "apt-cache"
@@ -894,13 +1054,22 @@ msgstr "apt-cache"
msgid "8"
msgstr "8"
+#. type: Content of: <refentry><refmeta><refmiscinfo>
+#: apt-cache.8.xml:24 apt-cdrom.8.xml:23 apt-config.8.xml:24
+#: apt-extracttemplates.1.xml:24 apt-ftparchive.1.xml:24 apt-get.8.xml:24
+#: apt-key.8.xml:16 apt-mark.8.xml:24 apt-secure.8.xml:16
+#: apt-sortpkgs.1.xml:24 apt.conf.5.xml:30 apt_preferences.5.xml:23
+#: sources.list.5.xml:24
+msgid "APT"
+msgstr ""
+
#. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cache.8.xml:29
+#: apt-cache.8.xml:30
msgid "APT package handling utility -- cache manipulator"
msgstr "Gestionnaire de paquets APT - manipulation du cache"
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-cache.8.xml:35
+#: apt-cache.8.xml:36
msgid ""
"<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-"
"o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
@@ -944,16 +1113,16 @@ msgstr ""
"\"><replaceable>paquets</replaceable></arg></arg> </group>"
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:61 apt-cdrom.8.xml:46 apt-config.8.xml:46
-#: apt-extracttemplates.1.xml:42 apt-ftparchive.1.xml:54 apt-get.8.xml:114
-#: apt-key.8.xml:33 apt-mark.8.xml:43 apt-secure.8.xml:39
-#: apt-sortpkgs.1.xml:43 apt.conf.5.xml:38 apt_preferences.5.xml:32
-#: sources.list.5.xml:32
+#: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47
+#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125
+#: apt-key.8.xml:34 apt-mark.8.xml:52 apt-secure.8.xml:40
+#: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33
+#: sources.list.5.xml:33
msgid "Description"
msgstr "Description"
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:62
+#: apt-cache.8.xml:63
msgid ""
"<command>apt-cache</command> performs a variety of operations on APT's "
"package cache. <command>apt-cache</command> does not manipulate the state of "
@@ -961,12 +1130,12 @@ msgid ""
"output from the package metadata."
msgstr ""
"<command>apt-cache</command> réalise différentes opérations sur le cache de "
-"paquet d'APT. <command>apt-cache</command> ne manipule pas l'état du "
-"système mais fournit des moyens de recherche dans les métadonnées d'un "
-"paquet desquelles il extrait les informations intéressantes."
+"paquet d'APT. <command>apt-cache</command> ne manipule pas l'état du système "
+"mais fournit des moyens de recherche dans les métadonnées d'un paquet "
+"desquelles il extrait les informations intéressantes."
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:67 apt-get.8.xml:120
+#: apt-cache.8.xml:68 apt-get.8.xml:131
msgid ""
"Unless the <option>-h</option>, or <option>--help</option> option is given, "
"one of the commands below must be present."
@@ -975,12 +1144,12 @@ msgstr ""
"donnée, l'une des commandes suivantes doit être présente."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:71
+#: apt-cache.8.xml:72
msgid "add <replaceable>file(s)</replaceable>"
msgstr "add <replaceable>fichier(s)</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:72
+#: apt-cache.8.xml:73
msgid ""
"<literal>add</literal> adds the named package index files to the package "
"cache. This is for debugging only."
@@ -989,12 +1158,12 @@ msgstr ""
"au cache des paquets. Cela sert uniquement pour le débogage."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:76
+#: apt-cache.8.xml:77
msgid "gencaches"
msgstr "gencaches"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:77
+#: apt-cache.8.xml:78
msgid ""
"<literal>gencaches</literal> performs the same operation as <command>apt-get "
"check</command>. It builds the source and package caches from the sources in "
@@ -1006,12 +1175,12 @@ msgstr ""
"lib/dpkg/status</filename>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:83
+#: apt-cache.8.xml:84
msgid "showpkg <replaceable>pkg(s)</replaceable>"
msgstr "showpkg <replaceable>paquet(s)</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:84
+#: apt-cache.8.xml:85
msgid ""
"<literal>showpkg</literal> displays information about the packages listed on "
"the command line. Remaining arguments are package names. The available "
@@ -1035,7 +1204,8 @@ msgstr ""
"résultat :"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-cache.8.xml:96, no-wrap
+#: apt-cache.8.xml:97
+#, no-wrap
msgid ""
"Package: libreadline2\n"
"Versions: 2.1-12(/var/state/apt/lists/foo_Packages),\n"
@@ -1060,7 +1230,7 @@ msgstr ""
"Reverse Provides: \n"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:108
+#: apt-cache.8.xml:109
msgid ""
"Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and "
"ncurses3.0 which must be installed for libreadline2 to work. In turn, "
@@ -1074,17 +1244,17 @@ msgstr ""
"ncurses3.0 ; ces paquets doivent être installés au préalable pour que "
"libreadline2 fonctionne. À leur tour, libreadlineg2 et libreadline2-altdev "
"dépendent de libreadline2. Si libreadline2 est installé, libc5 et ncurses3.0 "
-"doivent être installés ; libreadlineg2 et libreadline2-altdev n'ont pas "
-"à l'être. Pour connaître le sens de la fin de chaîne, il est préférable de "
+"doivent être installés ; libreadlineg2 et libreadline2-altdev n'ont pas à "
+"l'être. Pour connaître le sens de la fin de chaîne, il est préférable de "
"consulter le code source d'APT."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:117
+#: apt-cache.8.xml:118
msgid "stats"
msgstr "stats"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:117
+#: apt-cache.8.xml:118
msgid ""
"<literal>stats</literal> displays some statistics about the cache. No "
"further arguments are expected. Statistics reported are:"
@@ -1094,7 +1264,7 @@ msgstr ""
"rapportées :"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:120
+#: apt-cache.8.xml:121
msgid ""
"<literal>Total package names</literal> is the number of package names found "
"in the cache."
@@ -1103,7 +1273,7 @@ msgstr ""
"le cache."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:124
+#: apt-cache.8.xml:125
msgid ""
"<literal>Normal packages</literal> is the number of regular, ordinary "
"package names; these are packages that bear a one-to-one correspondence "
@@ -1111,12 +1281,12 @@ msgid ""
"dependencies. The majority of packages fall into this category."
msgstr ""
"<literal>Normal packages</literal> est le nombre de paquets simples, "
-"ordinaires ; ces paquets tolèrent une correspondance bijective entre "
-"leur nom et le nom utilisé par les autres paquets pour les qualifier comme "
+"ordinaires ; ces paquets tolèrent une correspondance bijective entre leur "
+"nom et le nom utilisé par les autres paquets pour les qualifier comme "
"dépendance. La majorité des paquets appartient à cette catégorie."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:130
+#: apt-cache.8.xml:131
msgid ""
"<literal>Pure virtual packages</literal> is the number of packages that "
"exist only as a virtual package name; that is, packages only \"provide\" the "
@@ -1126,16 +1296,15 @@ msgid ""
"package named \"mail-transport-agent\"."
msgstr ""
"<literal>Pure virtual packages</literal> est le nombre de paquets qui "
-"n'existent que sous la forme d'un nom représentant un paquet virtuel ; "
-"ces paquets « fournissent » seulement un nom de paquet virtuel et "
-"aucun paquet n'utilise véritablement ce nom. Par exemple, au sein du système "
-"Debian GNU/Linux, le nom « mail-transport-agent » est un paquet "
-"virtuel pur ; plusieurs paquets peuvent « fournir » ce nom "
-"« mail-transport-agent », mais il n'existe aucun paquet nommé « "
-"mail-transport-agent »."
+"n'existent que sous la forme d'un nom représentant un paquet virtuel ; ces "
+"paquets « fournissent » seulement un nom de paquet virtuel et aucun paquet "
+"n'utilise véritablement ce nom. Par exemple, au sein du système Debian GNU/"
+"Linux, le nom « mail-transport-agent » est un paquet virtuel pur ; plusieurs "
+"paquets peuvent « fournir » ce nom « mail-transport-agent », mais il n'existe "
+"aucun paquet nommé « mail-transport-agent »."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:138
+#: apt-cache.8.xml:139
msgid ""
"<literal>Single virtual packages</literal> is the number of packages with "
"only one package providing a particular virtual package. For example, in the "
@@ -1144,12 +1313,11 @@ msgid ""
msgstr ""
"<literal>Single virtual packages</literal> est le nombre de paquets virtuels "
"qui ne peuvent être remplis que par un seul paquet. Par exemple, au sein du "
-"système Debian GNU/Linux, « X11-text-viewer » est un paquet "
-"virtuel ; seul le paquet « xless » remplit « X11-text-"
-"viewer »."
+"système Debian GNU/Linux, « X11-text-viewer » est un paquet virtuel ; seul le "
+"paquet « xless » remplit « X11-text-viewer »."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:144
+#: apt-cache.8.xml:145
msgid ""
"<literal>Mixed virtual packages</literal> is the number of packages that "
"either provide a particular virtual package or have the virtual package name "
@@ -1158,12 +1326,11 @@ msgid ""
msgstr ""
"<literal>Mixed virtual packages</literal> est le nombre de paquets qui "
"remplissent un paquet virtuel particulier ou dont le nom est un nom de "
-"paquet virtuel. Par exemple, au sein du système Debian GNU/Linux, « "
-"debconf » est un paquet réel et il est aussi fourni par « debconf-"
-"tiny »."
+"paquet virtuel. Par exemple, au sein du système Debian GNU/Linux, "
+"« debconf » est un paquet réel et il est aussi fourni par « debconf-tiny »."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:151
+#: apt-cache.8.xml:152
msgid ""
"<literal>Missing</literal> is the number of package names that were "
"referenced in a dependency but were not provided by any package. Missing "
@@ -1178,7 +1345,7 @@ msgstr ""
"Habituellement on les trouve dans les champs « Conflicts »."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:158
+#: apt-cache.8.xml:159
msgid ""
"<literal>Total distinct</literal> versions is the number of package versions "
"found in the cache; this value is therefore at least equal to the number of "
@@ -1187,14 +1354,13 @@ msgid ""
"considerably larger than the number of total package names."
msgstr ""
"<literal>Total distinct versions</literal> est le nombre de versions de "
-"paquets trouvées dans le cache ; cette valeur est par conséquent au "
-"moins égale au nombre total de paquets. Quand on accède à plus d'une "
-"distribution (« stable » et « unstable », par exemple), "
-"cette valeur peut être considérablement plus grande que le nombre total de "
-"paquets."
+"paquets trouvées dans le cache ; cette valeur est par conséquent au moins "
+"égale au nombre total de paquets. Quand on accède à plus d'une distribution "
+"(« stable » et « unstable », par exemple), cette valeur peut être "
+"considérablement plus grande que le nombre total de paquets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:165
+#: apt-cache.8.xml:166
msgid ""
"<literal>Total dependencies</literal> is the number of dependency "
"relationships claimed by all of the packages in the cache."
@@ -1203,12 +1369,12 @@ msgstr ""
"dépendances déclarées par tous les paquets présents dans le cache."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:172
+#: apt-cache.8.xml:173
msgid "showsrc <replaceable>pkg(s)</replaceable>"
msgstr "showsrc <replaceable>paquet(s)</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:173
+#: apt-cache.8.xml:174
msgid ""
"<literal>showsrc</literal> displays all the source package records that "
"match the given package names. All versions are shown, as well as all "
@@ -1219,12 +1385,12 @@ msgstr ""
"les entrées qui déclarent que ces noms correspondent à des paquets binaires."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:178 apt-config.8.xml:83
+#: apt-cache.8.xml:179 apt-config.8.xml:84
msgid "dump"
msgstr "dump"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:179
+#: apt-cache.8.xml:180
msgid ""
"<literal>dump</literal> shows a short listing of every package in the cache. "
"It is primarily for debugging."
@@ -1233,12 +1399,12 @@ msgstr ""
"paquet du cache. Elle est d'abord destinée au débogage."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:183
+#: apt-cache.8.xml:184
msgid "dumpavail"
msgstr "dumpavail"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:184
+#: apt-cache.8.xml:185
msgid ""
"<literal>dumpavail</literal> prints out an available list to stdout. This is "
"suitable for use with &dpkg; and is used by the &dselect; method."
@@ -1248,12 +1414,12 @@ msgstr ""
"et la méthode &dselect; s'en sert."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:188
+#: apt-cache.8.xml:189
msgid "unmet"
msgstr "unmet"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:189
+#: apt-cache.8.xml:190
msgid ""
"<literal>unmet</literal> displays a summary of all unmet dependencies in the "
"package cache."
@@ -1262,27 +1428,27 @@ msgstr ""
"dépendances absentes dans le cache de paquets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:193
+#: apt-cache.8.xml:194
msgid "show <replaceable>pkg(s)</replaceable>"
msgstr "show <replaceable>paquet(s)</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:194
+#: apt-cache.8.xml:195
msgid ""
"<literal>show</literal> performs a function similar to <command>dpkg --print-"
"avail</command>; it displays the package records for the named packages."
msgstr ""
"La commande <literal>show</literal> est semblable à <command>dpkg --print-"
-"avail</command> ; elle affiche des informations sur les paquets donnés "
-"en argument."
+"avail</command> ; elle affiche des informations sur les paquets donnés en "
+"argument."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:199
+#: apt-cache.8.xml:200
msgid "search <replaceable>regex [ regex ... ]</replaceable>"
msgstr "search <replaceable>expression [ expression ... ]</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:200
+#: apt-cache.8.xml:201
msgid ""
"<literal>search</literal> performs a full text search on all available "
"package lists for the POSIX regex pattern given, see "
@@ -1305,22 +1471,21 @@ msgstr ""
"les noms de paquets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:213
+#: apt-cache.8.xml:214
msgid ""
"Separate arguments can be used to specify multiple search patterns that are "
"and'ed together."
msgstr ""
"On peut utiliser des arguments distincts pour indiquer des expressions "
-"rationnelles différentes sur lesquelles sera réalisé un « et » "
-"logique."
+"rationnelles différentes sur lesquelles sera réalisé un « et » logique."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:217
+#: apt-cache.8.xml:218
msgid "depends <replaceable>pkg(s)</replaceable>"
msgstr "depends <replaceable>paquet(s)</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:218
+#: apt-cache.8.xml:219
msgid ""
"<literal>depends</literal> shows a listing of each dependency a package has "
"and all the possible other packages that can fulfill that dependency."
@@ -1330,12 +1495,12 @@ msgstr ""
"satisfont ces dépendances."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:222
+#: apt-cache.8.xml:223
msgid "rdepends <replaceable>pkg(s)</replaceable>"
msgstr "rdepends <replaceable>paquet(s)</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:223
+#: apt-cache.8.xml:224
msgid ""
"<literal>rdepends</literal> shows a listing of each reverse dependency a "
"package has."
@@ -1344,12 +1509,12 @@ msgstr ""
"dépendances inverses d'un paquet."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:227
+#: apt-cache.8.xml:228
msgid "pkgnames <replaceable>[ prefix ]</replaceable>"
msgstr "pkgnames <replaceable>[ préfixe ]</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:228
+#: apt-cache.8.xml:229
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 "
@@ -1359,17 +1524,17 @@ msgid ""
msgstr ""
"Cette commande affiche le nom de chaque paquet du système. Un préfixe pour "
"filtrer la liste des noms peut être donné en paramètre. La sortie est "
-"adaptée à une utilisation au sein d'une fonction complète de shell ; "
-"elle est produite très rapidement. On utilise au mieux cette commande avec "
+"adaptée à une utilisation au sein d'une fonction complète de shell ; elle "
+"est produite très rapidement. On utilise au mieux cette commande avec "
"l'option <option>--generate</option>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:235
+#: apt-cache.8.xml:236
msgid "dotty <replaceable>pkg(s)</replaceable>"
msgstr "dotty <replaceable>paquet(s)</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:236
+#: apt-cache.8.xml:237
msgid ""
"<literal>dotty</literal> takes a list of packages on the command line and "
"generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -1391,48 +1556,49 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:245
+#: apt-cache.8.xml:246
msgid ""
"The resulting nodes will have several shapes; normal packages are boxes, "
"pure provides are triangles, mixed provides are diamonds, missing packages "
"are hexagons. Orange boxes mean recursion was stopped [leaf packages], blue "
"lines are pre-depends, green lines are conflicts."
msgstr ""
-"Les noeuds résultants ont plusieurs formes ; les paquets normaux sont "
-"des boîtes, les « provides » purs sont des triangles, les « "
-"provides » mixtes sont des diamants et les paquets manquants sont des "
-"hexagones. Les boîtes oranges expriment un arrêt de la récursivité [paquet "
-"feuille], les lignes bleues représentent des prédépendances et les lignes "
-"vertes représentent des conflits."
+"Les noeuds résultants ont plusieurs formes ; les paquets normaux sont des "
+"boîtes, les « provides » purs sont des triangles, les « provides » mixtes sont "
+"des diamants et les paquets manquants sont des hexagones. Les boîtes oranges "
+"expriment un arrêt de la récursivité [paquet feuille], les lignes bleues "
+"représentent des prédépendances et les lignes vertes représentent des "
+"conflits."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:250
+#: apt-cache.8.xml:251
msgid "Caution, dotty cannot graph larger sets of packages."
msgstr ""
"Attention, dotty ne peut pas représenter des ensembles très grands de "
"paquets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:253
+#: apt-cache.8.xml:254
msgid "xvcg <replaceable>pkg(s)</replaceable>"
msgstr "xvcg <replaceable>paquet(s)</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:254
+#: apt-cache.8.xml:255
msgid ""
"The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
"\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
msgstr ""
-"Identique à <literal>dotty</literal>, mais réservé à xvcg fourni avec <ulink url="
-"\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
+"Identique à <literal>dotty</literal>, mais réservé à xvcg fourni avec <ulink "
+"url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</"
+"ulink>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:258
+#: apt-cache.8.xml:259
msgid "policy <replaceable>[ pkg(s) ]</replaceable>"
msgstr "policy <replaceable>[ paquet(s) ]</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:259
+#: apt-cache.8.xml:260
msgid ""
"<literal>policy</literal> is meant to help debug issues relating to the "
"preferences file. With no arguments it will print out the priorities of each "
@@ -1445,12 +1611,12 @@ msgstr ""
"paquet donné en argument."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:265
+#: apt-cache.8.xml:266
msgid "madison <replaceable>/[ pkg(s) ]</replaceable>"
msgstr "madison <replaceable>[ paquet(s) ]</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:266
+#: apt-cache.8.xml:267
msgid ""
"<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
"to mimic the output format and a subset of the functionality of the Debian "
@@ -1470,46 +1636,46 @@ msgstr ""
"literal>)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:277 apt-config.8.xml:92 apt-extracttemplates.1.xml:55
-#: apt-ftparchive.1.xml:491 apt-get.8.xml:299 apt-mark.8.xml:73
-#: apt-sortpkgs.1.xml:53 apt.conf.5.xml:373 apt.conf.5.xml:395
+#: apt-cache.8.xml:278 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:408 apt.conf.5.xml:430
msgid "options"
msgstr "options"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:281
+#: apt-cache.8.xml:282
msgid "<option>-p</option>"
msgstr "<option>-p</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:281
+#: apt-cache.8.xml:282
msgid "<option>--pkg-cache</option>"
msgstr "<option>--pkg-cache</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:282
+#: apt-cache.8.xml:283
msgid ""
"Select the file to store the package cache. The package cache is the primary "
"cache used by all operations. Configuration Item: <literal>Dir::Cache::"
"pkgcache</literal>."
msgstr ""
"Indique le fichier servant de cache des paquets. Le cache des paquets est le "
-"cache primaire utilisé par toutes les opérations. Élément de "
-"configuration : <literal>Dir::Cache::pkgcache</literal>."
+"cache primaire utilisé par toutes les opérations. Élément de configuration : "
+"<literal>Dir::Cache::pkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:287 apt-ftparchive.1.xml:534 apt-get.8.xml:356
-#: apt-sortpkgs.1.xml:57
+#: apt-cache.8.xml:288 apt-ftparchive.1.xml:535 apt-get.8.xml:376
+#: apt-sortpkgs.1.xml:58
msgid "<option>-s</option>"
msgstr "<option>-s</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:287
+#: apt-cache.8.xml:288
msgid "<option>--src-cache</option>"
msgstr "<option>--src-cache</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:288
+#: apt-cache.8.xml:289
msgid ""
"Select the file to store the source cache. The source is used only by "
"<literal>gencaches</literal> and it stores a parsed version of the package "
@@ -1519,69 +1685,69 @@ msgid ""
msgstr ""
"Indique le fichier servant de cache des sources. Ce cache n'est utilisé que "
"par <literal>gencaches</literal> ; une version des informations sur les "
-"paquets, issue d'une analyse de sources distantes, est conservée. "
-"Quand le cache des paquets est créé, le cache des sources est utilisé afin "
-"d'éviter d'analyser à nouveau tous les paquets. Élément de "
-"configuration : <literal>Dir::Cache::srcpkgcache</literal>."
+"paquets, issue d'une analyse de sources distantes, est conservée. Quand le "
+"cache des paquets est créé, le cache des sources est utilisé afin d'éviter "
+"d'analyser à nouveau tous les paquets. Élément de configuration : "
+"<literal>Dir::Cache::srcpkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:295 apt-ftparchive.1.xml:508 apt-get.8.xml:346
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:509 apt-get.8.xml:366
msgid "<option>-q</option>"
msgstr "<option>-q</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:295 apt-ftparchive.1.xml:508 apt-get.8.xml:346
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:509 apt-get.8.xml:366
msgid "<option>--quiet</option>"
msgstr "<option>--quiet</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:296
+#: apt-cache.8.xml:297
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quietness up to a maximum of 2. You can also use "
"<option>-q=#</option> to set the quietness level, overriding the "
"configuration file. Configuration Item: <literal>quiet</literal>."
msgstr ""
-"Mode silencieux ; produit une sortie pertinente pour l'enregistrement "
-"dans un fichier-journal, sans afficher d'indicateur de progression. Un plus "
-"grand nombre de q produira un plus grand silence, avec un maximum de 2. Vous "
+"Mode silencieux ; produit une sortie pertinente pour l'enregistrement dans "
+"un fichier-journal, sans afficher d'indicateur de progression. Un plus grand "
+"nombre de q produira un plus grand silence, avec un maximum de 2. Vous "
"pouvez aussi utiliser <option>-q=#</option> pour positionner le niveau de "
-"silence, annulant le fichier de configuration. Élément de "
-"configuration : <literal>quiet</literal>."
+"silence, annulant le fichier de configuration. Élément de configuration : "
+"<literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:302
+#: apt-cache.8.xml:303
msgid "<option>-i</option>"
msgstr "<option>-i</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:302
+#: apt-cache.8.xml:303
msgid "<option>--important</option>"
msgstr "<option>--important</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:303
+#: apt-cache.8.xml:304
msgid ""
"Print only important dependencies; for use with unmet and depends. Causes "
"only Depends and Pre-Depends relations to be printed. Configuration Item: "
"<literal>APT::Cache::Important</literal>."
msgstr ""
"N'affiche que les dépendances importantes ; à utiliser avec les commandes "
-"unmet et depends pour n'afficher que les relations Depends et Pre-Depends. Élément de "
-"configuration : <literal>APT::Cache::Important</literal>."
+"unmet et depends pour n'afficher que les relations Depends et Pre-Depends. "
+"Élément de configuration : <literal>APT::Cache::Important</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:308 apt-cdrom.8.xml:120 apt-get.8.xml:313
+#: apt-cache.8.xml:309 apt-cdrom.8.xml:121 apt-get.8.xml:333
msgid "<option>-f</option>"
msgstr "<option>-f</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:308
+#: apt-cache.8.xml:309
msgid "<option>--full</option>"
msgstr "<option>--full</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:309
+#: apt-cache.8.xml:310
msgid ""
"Print full package records when searching. Configuration Item: "
"<literal>APT::Cache::ShowFull</literal>."
@@ -1591,17 +1757,17 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:313 apt-cdrom.8.xml:130
+#: apt-cache.8.xml:314 apt-cdrom.8.xml:131
msgid "<option>-a</option>"
msgstr "<option>-a</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:313
+#: apt-cache.8.xml:314
msgid "<option>--all-versions</option>"
msgstr "<option>--all-versions</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:314
+#: apt-cache.8.xml:315
msgid ""
"Print full records for all available versions. This is the default; to turn "
"it off, use <option>--no-all-versions</option>. If <option>--no-all-"
@@ -1615,43 +1781,43 @@ msgstr ""
"l'option <option>--no-all-versions</option>. Quand l'option <option>--no-all-"
"versions</option> est choisie, seuls les éléments de la version choisie "
"(celle qui serait installée) seront affichés. Cette option concerne "
-"seulement la commande <literal>show</literal>. Élément de "
-"configuration : <literal>APT::Cache::AllVersions</literal>."
+"seulement la commande <literal>show</literal>. Élément de configuration : "
+"<literal>APT::Cache::AllVersions</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:322
+#: apt-cache.8.xml:323
msgid "<option>-g</option>"
msgstr "<option>-g</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:322
+#: apt-cache.8.xml:323
msgid "<option>--generate</option>"
msgstr "<option>--generate</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:323
+#: apt-cache.8.xml:324
msgid ""
"Perform automatic package cache regeneration, rather than use the cache as "
"it is. This is the default; to turn it off, use <option>--no-generate</"
"option>. Configuration Item: <literal>APT::Cache::Generate</literal>."
msgstr ""
"Réalise une mise à jour automatique du cache des paquets plutôt que de se "
-"servir du cache tel qu'il est. Pour désactiver cette option (option par défaut), "
-"utilisez l'option <option>--no-generate</option>. Élément de "
+"servir du cache tel qu'il est. Pour désactiver cette option (option par "
+"défaut), utilisez l'option <option>--no-generate</option>. Élément de "
"configuration : <literal>APT::Cache::Generate</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328
+#: apt-cache.8.xml:329
msgid "<option>--names-only</option>"
msgstr "<option>--names-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328 apt-cdrom.8.xml:138
+#: apt-cache.8.xml:329 apt-cdrom.8.xml:139
msgid "<option>-n</option>"
msgstr "<option>-n</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:329
+#: apt-cache.8.xml:330
msgid ""
"Only search on the package names, not the long descriptions. Configuration "
"Item: <literal>APT::Cache::NamesOnly</literal>."
@@ -1661,12 +1827,12 @@ msgstr ""
"NamesOnly</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:333
+#: apt-cache.8.xml:334
msgid "<option>--all-names</option>"
msgstr "<option>--all-names</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:334
+#: apt-cache.8.xml:335
msgid ""
"Make <literal>pkgnames</literal> print all names, including virtual packages "
"and missing dependencies. Configuration Item: <literal>APT::Cache::"
@@ -1677,12 +1843,12 @@ msgstr ""
"configuration : <literal>APT::Cache::AllNames</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:339
+#: apt-cache.8.xml:340
msgid "<option>--recurse</option>"
msgstr "<option>--recurse</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:340
+#: apt-cache.8.xml:341
msgid ""
"Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
"that all packages mentioned are printed once. Configuration Item: "
@@ -1690,16 +1856,16 @@ msgid ""
msgstr ""
"Avec cette option, <literal>depends</literal> et <literal>rdepends</literal> "
"sont récursives de manière à n'afficher qu'une seule fois les paquets "
-"mentionnés. Élément de configuration : <literal>APT::Cache::"
-"RecurseDepends</literal>."
+"mentionnés. Élément de configuration : <literal>APT::Cache::RecurseDepends</"
+"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:345
+#: apt-cache.8.xml:346
msgid "<option>--installed</option>"
msgstr "<option>--installed</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:347
+#: apt-cache.8.xml:348
msgid ""
"Limit the output of <literal>depends</literal> and <literal>rdepends</"
"literal> to packages which are currently installed. Configuration Item: "
@@ -1710,90 +1876,52 @@ msgstr ""
"Élément de configuration : <literal>APT::Cache::Installed</literal>."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:352 apt-cdrom.8.xml:149 apt-config.8.xml:97
-#: apt-extracttemplates.1.xml:66 apt-ftparchive.1.xml:546 apt-get.8.xml:534
-#: apt-sortpkgs.1.xml:63
+#: apt-cache.8.xml:353 apt-cdrom.8.xml:150 apt-config.8.xml:98
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:547 apt-get.8.xml:554
+#: apt-sortpkgs.1.xml:64
msgid "&apt-commonoptions;"
msgstr "&apt-commonoptions;"
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:357 apt-get.8.xml:539 apt-key.8.xml:137 apt.conf.5.xml:824
+#: apt-cache.8.xml:358 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122
+#: apt.conf.5.xml:940 apt_preferences.5.xml:615
msgid "Files"
msgstr "Fichiers"
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:359 apt-get.8.xml:541
-msgid "<filename>/etc/apt/sources.list</filename>"
-msgstr "<filename>/etc/apt/sources.list</filename>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:360 apt-get.8.xml:542
-msgid ""
-"Locations to fetch packages from. Configuration Item: <literal>Dir::Etc::"
-"SourceList</literal>."
-msgstr ""
-"Emplacements où aller chercher les paquets. Élément de configuration : "
-"<literal>Dir::Etc::SourceList</literal>."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:364 apt-get.8.xml:575
-msgid "<filename>&statedir;/lists/</filename>"
-msgstr "<filename>&statedir;/lists/</filename>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:365 apt-get.8.xml:576
-msgid ""
-"Storage area for state information for each package resource specified in "
-"&sources-list; Configuration Item: <literal>Dir::State::Lists</literal>."
-msgstr ""
-"Zone de stockage pour les informations qui concernent chaque ressource de "
-"paquet spécifiée dans &sources-list; Élément de configuration : "
-"<literal>Dir::State::Lists</literal>."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:370 apt-get.8.xml:581
-msgid "<filename>&statedir;/lists/partial/</filename>"
-msgstr "<filename>&statedir;/lists/partial/</filename>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:371 apt-get.8.xml:582
-msgid ""
-"Storage area for state information in transit. Configuration Item: "
-"<literal>Dir::State::Lists</literal> (implicit partial)."
+#. type: Content of: <refentry><refsect1><variablelist>
+#: apt-cache.8.xml:360
+msgid "&file-sourceslist; &file-statelists;"
msgstr ""
-"Zone de stockage pour les informations en transit. Élément de "
-"configuration : <literal>Dir::State::Lists</literal> (partial est "
-"implicite)."
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:377 apt-cdrom.8.xml:154 apt-config.8.xml:102
-#: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:562 apt-get.8.xml:588
-#: apt-key.8.xml:161 apt-mark.8.xml:104 apt-secure.8.xml:180
-#: apt-sortpkgs.1.xml:68 apt.conf.5.xml:828 apt_preferences.5.xml:613
-#: sources.list.5.xml:220
+#: apt-cache.8.xml:365 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:946 apt_preferences.5.xml:622
+#: sources.list.5.xml:221
msgid "See Also"
msgstr "Voir aussi"
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:378
+#: apt-cache.8.xml:366
msgid "&apt-conf;, &sources-list;, &apt-get;"
msgstr "&apt-conf;, &sources-list;, &apt-get;."
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:382 apt-cdrom.8.xml:159 apt-config.8.xml:107
-#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:566 apt-get.8.xml:594
-#: apt-mark.8.xml:108 apt-sortpkgs.1.xml:72
+#: apt-cache.8.xml:370 apt-cdrom.8.xml:160 apt-config.8.xml:108
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:567 apt-get.8.xml:575
+#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
msgstr "Diagnostique"
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:383
+#: apt-cache.8.xml:371
msgid ""
"<command>apt-cache</command> returns zero on normal operation, decimal 100 "
"on error."
msgstr ""
-"<command>apt-cache</command> retourne zéro après un déroulement normal et "
-"le nombre décimal 100 en cas d'erreur."
+"<command>apt-cache</command> retourne zéro après un déroulement normal et le "
+"nombre décimal 100 en cas d'erreur."
#. type: Content of: <refentry><refentryinfo>
#: apt-cdrom.8.xml:13
@@ -1805,17 +1933,17 @@ msgstr ""
"février 2004</date>"
#. type: Content of: <refentry><refnamediv><refname>
-#: apt-cdrom.8.xml:21 apt-cdrom.8.xml:27
+#: apt-cdrom.8.xml:21 apt-cdrom.8.xml:28
msgid "apt-cdrom"
msgstr "apt-cdrom"
#. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cdrom.8.xml:28
+#: apt-cdrom.8.xml:29
msgid "APT CDROM management utility"
msgstr "Utilitaire de gestion des CD d'APT"
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-cdrom.8.xml:34
+#: apt-cdrom.8.xml:35
msgid ""
"<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
"<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></arg> "
@@ -1824,43 +1952,43 @@ msgid ""
"<arg>add</arg> <arg>ident</arg> </group>"
msgstr ""
"<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
-"<arg><option>-d=<replaceable>point de montage du CD</replaceable></"
-"option></arg> <arg><option>-o=<replaceable>option de configuration</"
-"replaceable></option></arg> <arg><option>-c=<replaceable>fichier</"
-"replaceable></option></arg> <group> <arg>add</arg> <arg>ident</arg> </group>"
+"<arg><option>-d=<replaceable>point de montage du CD</replaceable></option></"
+"arg> <arg><option>-o=<replaceable>option de configuration</replaceable></"
+"option></arg> <arg><option>-c=<replaceable>fichier</replaceable></option></"
+"arg> <group> <arg>add</arg> <arg>ident</arg> </group>"
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:47
+#: apt-cdrom.8.xml:48
msgid ""
"<command>apt-cdrom</command> is used to add a new CDROM to APTs list of "
"available sources. <command>apt-cdrom</command> takes care of determining "
"the structure of the disc as well as correcting for several possible mis-"
"burns and verifying the index files."
msgstr ""
-"<command>apt-cdrom</command> est utilisé pour ajouter un nouveau CD à "
-"la liste des sources disponibles. <command>apt-cdrom</command> prend soin de "
+"<command>apt-cdrom</command> est utilisé pour ajouter un nouveau CD à la "
+"liste des sources disponibles. <command>apt-cdrom</command> prend soin de "
"déterminer la structure du disque, de corriger de possibles erreurs de "
"gravure et de vérifier les fichiers d'index."
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:54
+#: apt-cdrom.8.xml:55
msgid ""
"It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
"system, it cannot be done by hand. Furthermore each disk in a multi-cd set "
"must be inserted and scanned separately to account for possible mis-burns."
msgstr ""
"Il est nécessaire d'utiliser <command>apt-cdrom</command> pour ajouter des "
-"CD au système APT car cela ne peut être réalisé manuellement. "
-"Par ailleurs, chaque disque d'un ensemble de CD doit être séparément "
-"inséré et parcouru pour prendre en compte de possibles erreurs de gravure."
+"CD au système APT car cela ne peut être réalisé manuellement. Par ailleurs, "
+"chaque disque d'un ensemble de CD doit être séparément inséré et parcouru "
+"pour prendre en compte de possibles erreurs de gravure."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:64
+#: apt-cdrom.8.xml:65
msgid "add"
msgstr "add"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:65
+#: apt-cdrom.8.xml:66
msgid ""
"<literal>add</literal> is used to add a new disc to the source list. It will "
"unmount the CDROM device, prompt for a disk to be inserted and then procceed "
@@ -1869,29 +1997,29 @@ msgid ""
"title."
msgstr ""
"La commande <literal>add</literal> est utilisée pour ajouter un nouveau "
-"disque à la liste des sources. Elle démonte le CD, réclame l'insertion "
-"d'un disque, parcourt ensuite le disque et copie les fichiers d'index. Si le "
+"disque à la liste des sources. Elle démonte le CD, réclame l'insertion d'un "
+"disque, parcourt ensuite le disque et copie les fichiers d'index. Si le "
"disque ne possède pas de répertoire <filename>disk/</filename> correct, un "
"titre descriptif est demandé."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:73
+#: apt-cdrom.8.xml:74
msgid ""
"APT uses a CDROM ID to track which disc is currently in the drive and "
"maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
"filename>"
msgstr ""
-"APT utilise un identifiant de CD pour reconnaître le disque qui se "
-"trouve actuellement dans le lecteur et maintient une base de données de ces "
+"APT utilise un identifiant de CD pour reconnaître le disque qui se trouve "
+"actuellement dans le lecteur et maintient une base de données de ces "
"identifiants dans <filename>&statedir;/cdroms.list</filename>."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:80
+#: apt-cdrom.8.xml:81
msgid "ident"
msgstr "ident"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:81
+#: apt-cdrom.8.xml:82
msgid ""
"A debugging tool to report the identity of the current disc as well as the "
"stored file name"
@@ -1900,7 +2028,7 @@ msgstr ""
"le nom du fichier stocké."
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:60
+#: apt-cdrom.8.xml:61
msgid ""
"Unless the <option>-h</option>, or <option>--help</option> option is given "
"one of the commands below must be present. <placeholder type=\"variablelist"
@@ -1911,162 +2039,163 @@ msgstr ""
"\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:90
+#: apt-cdrom.8.xml:91
msgid "Options"
msgstr "Options"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:94 apt-ftparchive.1.xml:502 apt-get.8.xml:308
+#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:503 apt-get.8.xml:328
msgid "<option>-d</option>"
msgstr "<option>-d</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:94
+#: apt-cdrom.8.xml:95
msgid "<option>--cdrom</option>"
msgstr "<option>--cdrom</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:95
+#: apt-cdrom.8.xml:96
msgid ""
"Mount point; specify the location to mount the cdrom. This mount point must "
"be listed in <filename>/etc/fstab</filename> and properly configured. "
"Configuration Item: <literal>Acquire::cdrom::mount</literal>."
msgstr ""
-"Point de montage ; spécifie l'emplacement de montage du CD. Ce "
-"point de montage doit être spécifié dans <filename>/etc/fstab</filename> et "
-"correctement configuré. Élément de configuration : <literal>Acquire::"
-"cdrom::mount</literal>."
+"Point de montage ; spécifie l'emplacement de montage du CD. Ce point de "
+"montage doit être spécifié dans <filename>/etc/fstab</filename> et "
+"correctement configuré. Élément de configuration : <literal>Acquire::cdrom::"
+"mount</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:103
+#: apt-cdrom.8.xml:104
msgid "<option>-r</option>"
msgstr "<option>-r</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:103
+#: apt-cdrom.8.xml:104
msgid "<option>--rename</option>"
msgstr "<option>--rename</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:104
+#: apt-cdrom.8.xml:105
msgid ""
"Rename a disc; change the label of a disk or override the disks given label. "
"This option will cause <command>apt-cdrom</command> to prompt for a new "
"label. Configuration Item: <literal>APT::CDROM::Rename</literal>."
msgstr ""
-"Change le nom d'un disque ; change le nom d'un disque ou remplace un disque pour un nom "
-"donné. Cette option oblige <command>apt-cdrom</command> à "
+"Change le nom d'un disque ; change le nom d'un disque ou remplace un disque "
+"pour un nom donné. Cette option oblige <command>apt-cdrom</command> à "
"demander un nouveau nom à l'utilisateur. Élément de configuration : "
"<literal>APT::CDROM::Rename</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:112 apt-get.8.xml:327
+#: apt-cdrom.8.xml:113 apt-get.8.xml:347
msgid "<option>-m</option>"
msgstr "<option>-m</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:112
+#: apt-cdrom.8.xml:113
msgid "<option>--no-mount</option>"
msgstr "<option>--no-mount</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:113
+#: apt-cdrom.8.xml:114
msgid ""
"No mounting; prevent <command>apt-cdrom</command> from mounting and "
"unmounting the mount point. Configuration Item: <literal>APT::CDROM::"
"NoMount</literal>."
msgstr ""
-"Pas de montage ; empêche <command>apt-cdrom</command> de monter ou "
-"démonter le point de montage. Élément de configuration : <literal >APT::"
-"CDROM::NoMount</literal>."
+"Pas de montage ; empêche <command>apt-cdrom</command> de monter ou démonter "
+"le point de montage. Élément de configuration : <literal >APT::CDROM::"
+"NoMount</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:120
+#: apt-cdrom.8.xml:121
msgid "<option>--fast</option>"
msgstr "<option>--fast</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:121
+#: apt-cdrom.8.xml:122
msgid ""
"Fast Copy; Assume the package files are valid and do not check every "
"package. This option should be used only if <command>apt-cdrom</command> has "
"been run on this disc before and did not detect any errors. Configuration "
"Item: <literal>APT::CDROM::Fast</literal>."
msgstr ""
-"Copie rapide ; suppose que les fichiers de paquets sont valables et ne vérifie pas "
-"chaque paquet. Cette option ne devrait être utilisée que si <command>apt-"
-"cdrom</command> a préalablement utilisé ce disque et n'a trouvé aucune "
-"erreur. Élément de configuration : <literal>APT::CDROM::Fast</literal>."
+"Copie rapide ; suppose que les fichiers de paquets sont valables et ne "
+"vérifie pas chaque paquet. Cette option ne devrait être utilisée que si "
+"<command>apt-cdrom</command> a préalablement utilisé ce disque et n'a trouvé "
+"aucune erreur. Élément de configuration : <literal>APT::CDROM::Fast</"
+"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:130
+#: apt-cdrom.8.xml:131
msgid "<option>--thorough</option>"
msgstr "<option>--thorough</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:131
+#: apt-cdrom.8.xml:132
msgid ""
"Thorough Package Scan; This option may be needed with some old Debian "
"1.1/1.2 discs that have Package files in strange places. It takes much "
"longer to scan the CD but will pick them all up."
msgstr ""
-"Parcours minutieux des paquets ; cette option peut être nécessaire avec "
-"des CD d'anciens systèmes Debian 1.1 ou 1.2 dont les fichiers Packages "
-"sont situés dans des endroits inhabituels. Il faudra plus de temps pour "
-"parcourir le CD mais tous les paquets seront repérés."
+"Parcours minutieux des paquets ; cette option peut être nécessaire avec des "
+"CD d'anciens systèmes Debian 1.1 ou 1.2 dont les fichiers Packages sont "
+"situés dans des endroits inhabituels. Il faudra plus de temps pour parcourir "
+"le CD mais tous les paquets seront repérés."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:139 apt-get.8.xml:358
+#: apt-cdrom.8.xml:140 apt-get.8.xml:378
msgid "<option>--just-print</option>"
msgstr "<option>--just-print</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:140 apt-get.8.xml:360
+#: apt-cdrom.8.xml:141 apt-get.8.xml:380
msgid "<option>--recon</option>"
msgstr "<option>--recon</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:141 apt-get.8.xml:361
+#: apt-cdrom.8.xml:142 apt-get.8.xml:381
msgid "<option>--no-act</option>"
msgstr "<option>--no-act</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:142
+#: apt-cdrom.8.xml:143
msgid ""
"No Changes; Do not change the &sources-list; file and do not write index "
"files. Everything is still checked however. Configuration Item: "
"<literal>APT::CDROM::NoAct</literal>."
msgstr ""
"Aucune modification ; ne pas modifier le fichier &sources-list; ni les "
-"fichiers d'index. Cependant, tout est vérifié. Élément de "
-"configuration : <literal>APT::CDROM::NoAct</literal>."
+"fichiers d'index. Cependant, tout est vérifié. Élément de configuration : "
+"<literal>APT::CDROM::NoAct</literal>."
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:155
+#: apt-cdrom.8.xml:156
msgid "&apt-conf;, &apt-get;, &sources-list;"
msgstr "&apt-conf;, &apt-get;, &sources-list;."
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:160
+#: apt-cdrom.8.xml:161
msgid ""
"<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
"on error."
msgstr ""
-"<command>apt-cdrom</command> renvoie zéro après un déroulement normal, et "
-"le nombre décimal 100 en cas d'erreur."
+"<command>apt-cdrom</command> renvoie zéro après un déroulement normal, et le "
+"nombre décimal 100 en cas d'erreur."
#. type: Content of: <refentry><refnamediv><refname>
-#: apt-config.8.xml:22 apt-config.8.xml:28
+#: apt-config.8.xml:22 apt-config.8.xml:29
msgid "apt-config"
msgstr "apt-config"
#. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-config.8.xml:29
+#: apt-config.8.xml:30
msgid "APT Configuration Query program"
msgstr "Programme d'interrogation de la configuration d'APT"
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-config.8.xml:35
+#: apt-config.8.xml:36
msgid ""
"<command>apt-config</command> <arg><option>-hv</option></arg> <arg><option>-"
"o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
@@ -2079,7 +2208,7 @@ msgstr ""
"choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>"
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:47
+#: apt-config.8.xml:48
msgid ""
"<command>apt-config</command> is an internal program used by various "
"portions of the APT suite to provide consistent configurability. It accesses "
@@ -2087,13 +2216,13 @@ msgid ""
"manner that is easy to use by scripted applications."
msgstr ""
"<command>apt-config</command> est un programme interne utilisé par "
-"différents composants d'APT ; il offre la possibilité d'une "
-"configuration cohérente et permet aux applications conçues sous forme de "
-"script une utilisation simple du fichier de configuration principal "
-"<filename>/etc/apt/apt.conf</filename>."
+"différents composants d'APT ; il offre la possibilité d'une configuration "
+"cohérente et permet aux applications conçues sous forme de script une "
+"utilisation simple du fichier de configuration principal <filename>/etc/apt/"
+"apt.conf</filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:52 apt-ftparchive.1.xml:70
+#: apt-config.8.xml:53 apt-ftparchive.1.xml:71
msgid ""
"Unless the <option>-h</option>, or <option>--help</option> option is given "
"one of the commands below must be present."
@@ -2102,12 +2231,12 @@ msgstr ""
"donnée, l'une des commandes suivantes doit être présente."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-config.8.xml:57
+#: apt-config.8.xml:58
msgid "shell"
msgstr "shell"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:59
+#: apt-config.8.xml:60
msgid ""
"shell is used to access the configuration information from a shell script. "
"It is given pairs of arguments, the first being a shell variable and the "
@@ -2116,14 +2245,15 @@ msgid ""
"should be used like:"
msgstr ""
"Le terme shell est utilisé pour accéder aux informations de configuration "
-"depuis un script shell. Deux arguments doivent lui être donnés ; le "
-"premier est une variable du shell et le second une valeur de configuration à "
+"depuis un script shell. Deux arguments doivent lui être donnés ; le premier "
+"est une variable du shell et le second une valeur de configuration à "
"demander. La sortie standard consiste en une liste de commandes "
"d'assignation de shell pour chaque valeur présente. Dans un script shell, "
"cette commande devrait être utilisée comme suit :"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-config.8.xml:67, no-wrap
+#: apt-config.8.xml:68
+#, no-wrap
msgid ""
"OPTS=\"-f\"\n"
"RES=`apt-config shell OPTS MyApp::options`\n"
@@ -2134,7 +2264,7 @@ msgstr ""
"eval $RES\n"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:72
+#: apt-config.8.xml:73
msgid ""
"This will set the shell environment variable $OPTS to the value of MyApp::"
"options with a default of <option>-f</option>."
@@ -2143,30 +2273,29 @@ msgstr ""
"MyApp::Options ou, par défaut, la valeur -f."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:76
+#: apt-config.8.xml:77
msgid ""
"The configuration item may be postfixed with a /[fdbi]. f returns file "
"names, d returns directories, b returns true or false and i returns an "
"integer. Each of the returns is normalized and verified internally."
msgstr ""
-"L'élément de configuration peut être suivi par /[fdbi]. « f » "
-"renvoie un nom de fichier, « d » un nom de répertoire, « "
-"b » renvoie « true » ou « false » et « i » "
-"renvoie un entier. Chacune de ses valeurs est normalisée et vérifiée."
+"L'élément de configuration peut être suivi par /[fdbi]. « f » renvoie un nom "
+"de fichier, « d » un nom de répertoire, « b » renvoie « true » ou « false » et "
+"« i » renvoie un entier. Chacune de ses valeurs est normalisée et vérifiée."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:85
+#: apt-config.8.xml:86
msgid "Just show the contents of the configuration space."
msgstr "Affiche seulement le contenu de l'espace de configuration."
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563
-#: apt-mark.8.xml:105 apt-sortpkgs.1.xml:69
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:564
+#: apt-sortpkgs.1.xml:70
msgid "&apt-conf;"
msgstr "&apt-conf;"
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:108
+#: apt-config.8.xml:109
msgid ""
"<command>apt-config</command> returns zero on normal operation, decimal 100 "
"on error."
@@ -2175,7 +2304,7 @@ msgstr ""
"le nombre 100 en cas d'erreur."
#. type: Content of: <refentry><refnamediv><refname>
-#: apt-extracttemplates.1.xml:22 apt-extracttemplates.1.xml:28
+#: apt-extracttemplates.1.xml:22 apt-extracttemplates.1.xml:29
msgid "apt-extracttemplates"
msgstr "apt-extracttemplates"
@@ -2185,14 +2314,14 @@ msgid "1"
msgstr "1"
#. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-extracttemplates.1.xml:29
+#: apt-extracttemplates.1.xml:30
msgid "Utility to extract DebConf config and templates from Debian packages"
msgstr ""
-"Outil d'extraction des textes de configuration pour "
-"DebConf dans un paquet Debian"
+"Outil d'extraction des textes de configuration pour DebConf dans un paquet "
+"Debian"
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-extracttemplates.1.xml:35
+#: apt-extracttemplates.1.xml:36
msgid ""
"<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
"<arg><option>-t=<replaceable>temporary directory</replaceable></option></"
@@ -2205,7 +2334,7 @@ msgstr ""
"replaceable></arg>"
#. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:43
+#: apt-extracttemplates.1.xml:44
msgid ""
"<command>apt-extracttemplates</command> will take one or more Debian package "
"files as input and write out (to a temporary directory) all associated "
@@ -2220,12 +2349,12 @@ msgstr ""
"suivant :"
#. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:48
+#: apt-extracttemplates.1.xml:49
msgid "package version template-file config-script"
msgstr "paquet version guide-de-configuration script-de-configuration"
#. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:49
+#: apt-extracttemplates.1.xml:50
msgid ""
"template-file and config-script are written to the temporary directory "
"specified by the -t or --tempdir (<literal>APT::ExtractTemplates::TempDir</"
@@ -2234,22 +2363,22 @@ msgid ""
msgstr ""
"Les scripts et guides de configuration sont écrits dans le répertoire "
"temporaire indiqué par l'option <option>-t</option> ou <option>--tempdir</"
-"option> (<literal>APT::ExtractTemplates::TempDir</literal>) ; les noms "
-"de fichier sont de la forme <filename>package.template.XXXX</filename> ou "
+"option> (<literal>APT::ExtractTemplates::TempDir</literal>) ; les noms de "
+"fichier sont de la forme <filename>package.template.XXXX</filename> ou "
"<filename>package.config.XXXX</filename>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:59 apt-get.8.xml:468
+#: apt-extracttemplates.1.xml:60 apt-get.8.xml:488
msgid "<option>-t</option>"
msgstr "<option>-t</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:59
+#: apt-extracttemplates.1.xml:60
msgid "<option>--tempdir</option>"
msgstr "<option>--tempdir</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-extracttemplates.1.xml:61
+#: apt-extracttemplates.1.xml:62
msgid ""
"Temporary directory in which to write extracted debconf template files and "
"config scripts Configuration Item: <literal>APT::ExtractTemplates::TempDir</"
@@ -2260,7 +2389,7 @@ msgstr ""
"ExtractTemplates::TempDir</literal>."
#. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:78
+#: apt-extracttemplates.1.xml:79
msgid ""
"<command>apt-extracttemplates</command> returns zero on normal operation, "
"decimal 100 on error."
@@ -2269,17 +2398,17 @@ msgstr ""
"le nombre 100 en cas d'erreur."
#. type: Content of: <refentry><refnamediv><refname>
-#: apt-ftparchive.1.xml:22 apt-ftparchive.1.xml:28
+#: apt-ftparchive.1.xml:22 apt-ftparchive.1.xml:29
msgid "apt-ftparchive"
msgstr "apt-ftparchive"
#. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-ftparchive.1.xml:29
+#: apt-ftparchive.1.xml:30
msgid "Utility to generate index files"
msgstr "Outil de création de fichiers d'index"
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-ftparchive.1.xml:35
+#: apt-ftparchive.1.xml:36
msgid ""
"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
@@ -2319,7 +2448,7 @@ msgstr ""
"replaceable></arg></arg> </group>"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:55
+#: apt-ftparchive.1.xml:56
msgid ""
"<command>apt-ftparchive</command> is the command line tool that generates "
"the index files that APT uses to access a distribution source. The index "
@@ -2331,7 +2460,7 @@ msgstr ""
"index doit être créé pour un site et basé sur le contenu de ce site."
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:59
+#: apt-ftparchive.1.xml:60
msgid ""
"<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
"program, incorporating its entire functionality via the <literal>packages</"
@@ -2341,13 +2470,12 @@ msgid ""
msgstr ""
"<command>apt-ftparchive</command> est un ensemble comprenant le programme "
"&dpkg-scanpackages; et toutes ses fonctionnalités via la commande "
-"<literal>packages</literal> ; il comprend aussi un générateur de "
-"fichier « Contents », la commande <literal>contents</literal>, et "
-"une technique élaborée pour « scripter » le processus de création "
-"d'une archive complète."
+"<literal>packages</literal> ; il comprend aussi un générateur de fichier "
+"« Contents », la commande <literal>contents</literal>, et une technique "
+"élaborée pour « scripter » le processus de création d'une archive complète."
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:65
+#: apt-ftparchive.1.xml:66
msgid ""
"Internally <command>apt-ftparchive</command> can make use of binary "
"databases to cache the contents of a .deb file and it does not rely on any "
@@ -2356,44 +2484,45 @@ msgid ""
"output files."
msgstr ""
"<command>Apt-ftparchive</command> peut utiliser lui-même des bases de "
-"données binaires pour « cacher » le contenu d'un fichier ."
-"deb ; il n'a pas besoin de programmes extérieurs, sauf &gzip;. Lors "
-"d'une exécution, il vérifie les changements dans les fichiers et crée les "
-"fichiers compressés voulus."
+"données binaires pour « cacher » le contenu d'un fichier .deb ; il n'a pas "
+"besoin de programmes extérieurs, sauf &gzip;. Lors d'une exécution, il "
+"vérifie les changements dans les fichiers et crée les fichiers compressés "
+"voulus."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:74
+#: apt-ftparchive.1.xml:75
msgid "packages"
msgstr "packages"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:76
+#: apt-ftparchive.1.xml:77
msgid ""
"The packages command generates a package file from a directory tree. It "
"takes the given directory and recursively searches it for .deb files, "
"emitting a package record to stdout for each. This command is approximately "
"equivalent to &dpkg-scanpackages;."
msgstr ""
-"La commande <literal>packages</literal> crée un fichier « "
-"Packages » à partir d'une arborescence. Elle recherche récursivement à "
-"travers le répertoire donné les fichiers .deb et, pour chaque fichier "
-"trouvé, envoie une entrée pour ce paquet sur la sortie standard. Cette "
-"commande est approximativement équivalente à &dpkg-scanpackages;."
+"La commande <literal>packages</literal> crée un fichier « Packages » à partir "
+"d'une arborescence. Elle recherche récursivement à travers le répertoire "
+"donné les fichiers .deb et, pour chaque fichier trouvé, envoie une entrée "
+"pour ce paquet sur la sortie standard. Cette commande est approximativement "
+"équivalente à &dpkg-scanpackages;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:81 apt-ftparchive.1.xml:105
-msgid "The option <option>--db</option> can be used to specify a binary caching DB."
+#: apt-ftparchive.1.xml:82 apt-ftparchive.1.xml:106
+msgid ""
+"The option <option>--db</option> can be used to specify a binary caching DB."
msgstr ""
"On peut se servir de l'option <option>--db</option> pour demander un cache "
"binaire."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:84
+#: apt-ftparchive.1.xml:85
msgid "sources"
msgstr "sources"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:86
+#: apt-ftparchive.1.xml:87
msgid ""
"The <literal>sources</literal> command generates a source index file from a "
"directory tree. It takes the given directory and recursively searches it "
@@ -2407,24 +2536,23 @@ msgstr ""
"équivalente à &dpkg-scansources;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:91
+#: apt-ftparchive.1.xml:92
msgid ""
"If an override file is specified then a source override file will be looked "
"for with an extension of .src. The --source-override option can be used to "
"change the source override file that will be used."
msgstr ""
-"Quand on précise un fichier « override », c'est un fichier source "
-"avec une extension .src qui est recherché. On peut se servir de l'option "
-"<option>--source-override</option> pour changer de fichier source d'« "
-"override »."
+"Quand on précise un fichier « override », c'est un fichier source avec une "
+"extension .src qui est recherché. On peut se servir de l'option <option>--"
+"source-override</option> pour changer de fichier source d'« override »."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:96
+#: apt-ftparchive.1.xml:97
msgid "contents"
msgstr "contents"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:98
+#: apt-ftparchive.1.xml:99
msgid ""
"The <literal>contents</literal> command generates a contents file from a "
"directory tree. It takes the given directory and recursively searches it "
@@ -2433,21 +2561,21 @@ msgid ""
"written to the output. If multiple packages own the same file then each "
"package is separated by a comma in the output."
msgstr ""
-"La commande <literal>contents</literal> crée un fichier « "
-"Contents » à partir d'une arborescence. Elle recherche récursivement à "
-"travers le répertoire donné les fichiers .deb et, pour chaque fichier "
-"trouvé, lit la liste des fichiers. Elle trie la liste des fichiers "
-"correspondant à des paquets et l'envoie sur la sortie standard. Les "
-"répertoires ne font pas partie du résultat. Quand un fichier appartient à "
-"plusieurs paquets, une virgule sépare les paquets."
+"La commande <literal>contents</literal> crée un fichier « Contents » à partir "
+"d'une arborescence. Elle recherche récursivement à travers le répertoire "
+"donné les fichiers .deb et, pour chaque fichier trouvé, lit la liste des "
+"fichiers. Elle trie la liste des fichiers correspondant à des paquets et "
+"l'envoie sur la sortie standard. Les répertoires ne font pas partie du "
+"résultat. Quand un fichier appartient à plusieurs paquets, une virgule "
+"sépare les paquets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:108
+#: apt-ftparchive.1.xml:109
msgid "release"
msgstr "release"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:110
+#: apt-ftparchive.1.xml:111
msgid ""
"The <literal>release</literal> command generates a Release file from a "
"directory tree. It recursively searches the given directory for Packages, "
@@ -2462,7 +2590,7 @@ msgstr ""
"standard avec un résumé MD5 et un résumé SHA1 pour chaque fichier."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:117
+#: apt-ftparchive.1.xml:118
msgid ""
"Values for the additional metadata fields in the Release file are taken from "
"the corresponding variables under <literal>APT::FTPArchive::Release</"
@@ -2481,12 +2609,12 @@ msgstr ""
"<literal>Components</literal>, <literal>Description</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:127
+#: apt-ftparchive.1.xml:128
msgid "generate"
msgstr "generate"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:129
+#: apt-ftparchive.1.xml:130
msgid ""
"The <literal>generate</literal> command is designed to be runnable from a "
"cron script and builds indexes according to the given config file. The "
@@ -2500,12 +2628,12 @@ msgstr ""
"préciser index et répertoires aussi bien que les paramètres requis."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:136 apt-get.8.xml:272
+#: apt-ftparchive.1.xml:137 apt-get.8.xml:292
msgid "clean"
msgstr "clean"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:138
+#: apt-ftparchive.1.xml:139
msgid ""
"The <literal>clean</literal> command tidies the databases used by the given "
"configuration file by removing any records that are no longer necessary."
@@ -2515,12 +2643,12 @@ msgstr ""
"sont plus nécessaires."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:144
+#: apt-ftparchive.1.xml:145
msgid "The Generate Configuration"
msgstr "Configuration de la commande generate"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:146
+#: apt-ftparchive.1.xml:147
msgid ""
"The <literal>generate</literal> command uses a configuration file to "
"describe the archives that are going to be generated. It follows the typical "
@@ -2537,17 +2665,19 @@ msgstr ""
"arborescence. Cela n'affecte que l'usage de l'étiquette de visée (scope tag)."
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:154
-msgid "The generate configuration has 4 separate sections, each described below."
-msgstr "Ce fichier de configuration possède quatre sections, décrites ci-dessous."
+#: apt-ftparchive.1.xml:155
+msgid ""
+"The generate configuration has 4 separate sections, each described below."
+msgstr ""
+"Ce fichier de configuration possède quatre sections, décrites ci-dessous."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:156
+#: apt-ftparchive.1.xml:157
msgid "Dir Section"
msgstr "La section Dir"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:158
+#: apt-ftparchive.1.xml:159
msgid ""
"The <literal>Dir</literal> section defines the standard directories needed "
"to locate the files required during the generation process. These "
@@ -2560,12 +2690,12 @@ msgstr ""
"manière à produire un chemin absolu et complet."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:163
+#: apt-ftparchive.1.xml:164
msgid "ArchiveDir"
msgstr "ArchiveDir"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:165
+#: apt-ftparchive.1.xml:166
msgid ""
"Specifies the root of the FTP archive, in a standard Debian configuration "
"this is the directory that contains the <filename>ls-LR</filename> and dist "
@@ -2576,32 +2706,32 @@ msgstr ""
"filename> et les noeuds des distributions."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:170
+#: apt-ftparchive.1.xml:171
msgid "OverrideDir"
msgstr "OverrideDir"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:172
+#: apt-ftparchive.1.xml:173
msgid "Specifies the location of the override files."
msgstr "Indique l'emplacement des fichiers d'« override »."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:175
+#: apt-ftparchive.1.xml:176
msgid "CacheDir"
msgstr "CacheDir"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:177
+#: apt-ftparchive.1.xml:178
msgid "Specifies the location of the cache files"
msgstr "Indique l'emplacement des fichiers de cache."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:180
+#: apt-ftparchive.1.xml:181
msgid "FileListDir"
msgstr "FileListDir"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:182
+#: apt-ftparchive.1.xml:183
msgid ""
"Specifies the location of the file list files, if the <literal>FileList</"
"literal> setting is used below."
@@ -2610,12 +2740,12 @@ msgstr ""
"sert de la valeur <literal>FileList</literal> définie plus bas)."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:188
+#: apt-ftparchive.1.xml:189
msgid "Default Section"
msgstr "La section Default"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:190
+#: apt-ftparchive.1.xml:191
msgid ""
"The <literal>Default</literal> section specifies default values, and "
"settings that control the operation of the generator. Other sections may "
@@ -2626,12 +2756,12 @@ msgstr ""
"annulées dans d'autres sections (paramètrage par section)."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:194
+#: apt-ftparchive.1.xml:195
msgid "Packages::Compress"
msgstr "Packages::Compress"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:196
+#: apt-ftparchive.1.xml:197
msgid ""
"Sets the default compression schemes to use for the Package index files. It "
"is a string that contains a space separated list of at least one of: '.' (no "
@@ -2639,18 +2769,17 @@ msgid ""
"'. gzip'."
msgstr ""
"Indique comment sont compressés les fichiers d'index. C'est une chaîne qui "
-"contient des valeurs séparées par des espaces ; elle contient au moins "
-"l'une des valeurs suivantes : « . » (pas de compression), "
-"« gzip », « bzip2 ». Par défaut, c'est la chaîne « . "
-"gzip »."
+"contient des valeurs séparées par des espaces ; elle contient au moins l'une "
+"des valeurs suivantes : « . » (pas de compression), « gzip », « bzip2 ». Par "
+"défaut, c'est la chaîne « . gzip »."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:202
+#: apt-ftparchive.1.xml:203
msgid "Packages::Extensions"
msgstr "Packages::Extensions"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:204
+#: apt-ftparchive.1.xml:205
msgid ""
"Sets the default list of file extensions that are package files. This "
"defaults to '.deb'."
@@ -2659,12 +2788,12 @@ msgstr ""
"paquets. Par défaut, c'est « .deb »."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:208
+#: apt-ftparchive.1.xml:209
msgid "Sources::Compress"
msgstr "Sources::Compress"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:210
+#: apt-ftparchive.1.xml:211
msgid ""
"This is similar to <literal>Packages::Compress</literal> except that it "
"controls the compression for the Sources files."
@@ -2673,12 +2802,12 @@ msgstr ""
"compressés les fichiers sources."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:214
+#: apt-ftparchive.1.xml:215
msgid "Sources::Extensions"
msgstr "Sources::Extensions"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:216
+#: apt-ftparchive.1.xml:217
msgid ""
"Sets the default list of file extensions that are source files. This "
"defaults to '.dsc'."
@@ -2687,12 +2816,12 @@ msgstr ""
"fichiers sources. Par défaut, c'est « .dsc »."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:220
+#: apt-ftparchive.1.xml:221
msgid "Contents::Compress"
msgstr "Contents::Compress"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:222
+#: apt-ftparchive.1.xml:223
msgid ""
"This is similar to <literal>Packages::Compress</literal> except that it "
"controls the compression for the Contents files."
@@ -2701,12 +2830,12 @@ msgstr ""
"compressés les fichiers « Contents »."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:226
+#: apt-ftparchive.1.xml:227
msgid "DeLinkLimit"
msgstr "DeLinkLimit"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:228
+#: apt-ftparchive.1.xml:229
msgid ""
"Specifies the number of kilobytes to delink (and replace with hard links) "
"per run. This is used in conjunction with the per-section <literal>External-"
@@ -2717,12 +2846,12 @@ msgstr ""
"paramètre <literal>External-Links</literal>."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:233
+#: apt-ftparchive.1.xml:234
msgid "FileMode"
msgstr "FileMode"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:235
+#: apt-ftparchive.1.xml:236
msgid ""
"Specifies the mode of all created index files. It defaults to 0644. All "
"index files are set to this mode with no regard to the umask."
@@ -2732,12 +2861,12 @@ msgstr ""
"utilisateur (umasq) est ignoré."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:242
+#: apt-ftparchive.1.xml:243
msgid "TreeDefault Section"
msgstr "La section TreeDefault"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:244
+#: apt-ftparchive.1.xml:245
msgid ""
"Sets defaults specific to <literal>Tree</literal> sections. All of these "
"variables are substitution variables and have the strings $(DIST), "
@@ -2749,29 +2878,29 @@ msgstr ""
"respective."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:249
+#: apt-ftparchive.1.xml:250
msgid "MaxContentsChange"
msgstr "MaxContentsChange"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:251
+#: apt-ftparchive.1.xml:252
msgid ""
"Sets the number of kilobytes of contents files that are generated each day. "
"The contents files are round-robined so that over several days they will all "
"be rebuilt."
msgstr ""
-"Indique le nombre de kilo-octets de fichiers « Contents » qui sont "
-"créés chaque jour. Les fichiers « Contents » sont tirés au sort "
-"selon le système <emphasis>round-robin</emphasis> de manière que, sur "
-"plusieurs jours, tous soient reconstruits."
+"Indique le nombre de kilo-octets de fichiers « Contents » qui sont créés "
+"chaque jour. Les fichiers « Contents » sont tirés au sort selon le système "
+"<emphasis>round-robin</emphasis> de manière que, sur plusieurs jours, tous "
+"soient reconstruits."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:256
+#: apt-ftparchive.1.xml:257
msgid "ContentsAge"
msgstr "ContentsAge"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:258
+#: apt-ftparchive.1.xml:259
msgid ""
"Controls the number of days a contents file is allowed to be checked without "
"changing. If this limit is passed the mtime of the contents file is updated. "
@@ -2780,36 +2909,35 @@ msgid ""
"is allowed in hopes that new .debs will be installed, requiring a new file "
"anyhow. The default is 10, the units are in days."
msgstr ""
-"Contrôle le nombre de jours pendant lequel un fichier « Contents » "
-"peut être utilisé sans actualisation. Quand cette limite est franchie, le "
-"« mtime » du fichier « Contents » est mis à jour. Cela "
-"peut arriver quand un fichier est modifié sans que cela modifie le fichier "
-"« Contents » (modification par « override » par exemple). "
-"Un délai est permis dans l'espoir que de nouveaux « .deb » seront "
-"installés, exigeant un nouveau « Contents ». Par défaut ce nombre "
-"vaut 10, l'unité étant le jour."
+"Contrôle le nombre de jours pendant lequel un fichier « Contents » peut être "
+"utilisé sans actualisation. Quand cette limite est franchie, le « mtime » du "
+"fichier « Contents » est mis à jour. Cela peut arriver quand un fichier est "
+"modifié sans que cela modifie le fichier « Contents » (modification par "
+"« override » par exemple). Un délai est permis dans l'espoir que de nouveaux "
+"« .deb » seront installés, exigeant un nouveau « Contents ». Par défaut ce "
+"nombre vaut 10, l'unité étant le jour."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:267
+#: apt-ftparchive.1.xml:268
msgid "Directory"
msgstr "Directory"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:269
+#: apt-ftparchive.1.xml:270
msgid ""
"Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
"$(SECTION)/binary-$(ARCH)/</filename>"
msgstr ""
-"Indique la racine de l'arborescence des « .deb ». Par défaut, c'est "
-"<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>."
+"Indique la racine de l'arborescence des « .deb ». Par défaut, c'est <filename>"
+"$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:273
+#: apt-ftparchive.1.xml:274
msgid "SrcDirectory"
msgstr "SrcDirectory"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:275
+#: apt-ftparchive.1.xml:276
msgid ""
"Sets the top of the source package directory tree. Defaults to <filename>"
"$(DIST)/$(SECTION)/source/</filename>"
@@ -2818,85 +2946,84 @@ msgstr ""
"<filename>$(DIST)/$(SECTION)/source/</filename>."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:279 apt-ftparchive.1.xml:405
+#: apt-ftparchive.1.xml:280 apt-ftparchive.1.xml:406
msgid "Packages"
msgstr "Packages"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:281
+#: apt-ftparchive.1.xml:282
msgid ""
"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
"binary-$(ARCH)/Packages</filename>"
msgstr ""
-"Indique le fichier « Packages » créé. Par défaut, c'est <filename>"
-"$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename>."
+"Indique le fichier « Packages » créé. Par défaut, c'est <filename>$(DIST)/"
+"$(SECTION)/binary-$(ARCH)/Packages</filename>."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:285 apt-ftparchive.1.xml:410
+#: apt-ftparchive.1.xml:286 apt-ftparchive.1.xml:411
msgid "Sources"
msgstr "Sources"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:287
+#: apt-ftparchive.1.xml:288
msgid ""
"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
"source/Sources</filename>"
msgstr ""
-"Indique le fichier « Packages » crée. Par défaut, c'est <filename>"
-"$(DIST)/$(SECTION)/source/Sources</filename>."
+"Indique le fichier « Packages » crée. Par défaut, c'est <filename>$(DIST)/"
+"$(SECTION)/source/Sources</filename>."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:291
+#: apt-ftparchive.1.xml:292
msgid "InternalPrefix"
msgstr "InternalPrefix"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:293
+#: apt-ftparchive.1.xml:294
msgid ""
"Sets the path prefix that causes a symlink to be considered an internal link "
"instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
"filename>"
msgstr ""
-"Indique un préfixe de chemin ; ce préfixe fait qu'un lien symbolique "
-"sera considéré comme un lien interne plutôt que comme un lien externe. Par "
+"Indique un préfixe de chemin ; ce préfixe fait qu'un lien symbolique sera "
+"considéré comme un lien interne plutôt que comme un lien externe. Par "
"défaut, c'est <filename>$(DIST)/$(SECTION)/</filename>."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:298 apt-ftparchive.1.xml:416
+#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:417
msgid "Contents"
msgstr "Contents"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:300
+#: apt-ftparchive.1.xml:301
msgid ""
"Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
"</filename>. If this setting causes multiple Packages files to map onto a "
"single Contents file (such as the default) then <command>apt-ftparchive</"
"command> will integrate those package files together automatically."
msgstr ""
-"Indique le fichier « Contents » créé. Par défaut, c'est <filename>"
-"$(DIST)/Contents-$(ARCH)</filename>. Quand le paramètrage fait que "
-"différents fichiers « Packages » se réfèrent à un seul fichier "
-"« Contents », <command>apt-ftparchive</command> les intègre "
-"automatiquement."
+"Indique le fichier « Contents » créé. Par défaut, c'est <filename>$(DIST)/"
+"Contents-$(ARCH)</filename>. Quand le paramètrage fait que différents "
+"fichiers « Packages » se réfèrent à un seul fichier « Contents », <command>apt-"
+"ftparchive</command> les intègre automatiquement."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:307
+#: apt-ftparchive.1.xml:308
msgid "Contents::Header"
msgstr "Contents::Header"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:309
+#: apt-ftparchive.1.xml:310
msgid "Sets header file to prepend to the contents output."
msgstr "Indique l'en-tête à préfixer au fichier « Contents » créé."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:312 apt-ftparchive.1.xml:441
+#: apt-ftparchive.1.xml:313 apt-ftparchive.1.xml:442
msgid "BinCacheDB"
msgstr "BinCacheDB"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:314
+#: apt-ftparchive.1.xml:315
msgid ""
"Sets the binary cache database to use for this section. Multiple sections "
"can share the same database."
@@ -2905,12 +3032,12 @@ msgstr ""
"Différentes sections peuvent partager cette base de données."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:318
+#: apt-ftparchive.1.xml:319
msgid "FileList"
msgstr "FileList"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:320
+#: apt-ftparchive.1.xml:321
msgid ""
"Specifies that instead of walking the directory tree, <command>apt-"
"ftparchive</command> should read the list of files from the given file. "
@@ -2921,12 +3048,12 @@ msgstr ""
"relatifs sont préfixés par le répertoire de l'archive."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:325
+#: apt-ftparchive.1.xml:326
msgid "SourceFileList"
msgstr "SourceFileList"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:327
+#: apt-ftparchive.1.xml:328
msgid ""
"Specifies that instead of walking the directory tree, <command>apt-"
"ftparchive</command> should read the list of files from the given file. "
@@ -2939,12 +3066,12 @@ msgstr ""
"traiter les index de sources."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:335
+#: apt-ftparchive.1.xml:336
msgid "Tree Section"
msgstr "La section Tree"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:337
+#: apt-ftparchive.1.xml:338
msgid ""
"The <literal>Tree</literal> section defines a standard Debian file tree "
"which consists of a base directory, then multiple sections in that base "
@@ -2958,7 +3085,7 @@ msgstr ""
"par la variable de substitution <literal>Directory</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:342
+#: apt-ftparchive.1.xml:343
msgid ""
"The <literal>Tree</literal> section takes a scope tag which sets the "
"<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@ -2971,7 +3098,7 @@ msgstr ""
"C'est par exemple : <filename>dists/woody</filename>."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:347
+#: apt-ftparchive.1.xml:348
msgid ""
"All of the settings defined in the <literal>TreeDefault</literal> section "
"can be use in a <literal>Tree</literal> section as well as three new "
@@ -2982,7 +3109,7 @@ msgstr ""
"trois nouvelles variables suivantes."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:350
+#: apt-ftparchive.1.xml:351
msgid ""
"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
"command> performs an operation similar to:"
@@ -2991,7 +3118,8 @@ msgstr ""
"ftparchive</command> agit ainsi :"
#. type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting>
-#: apt-ftparchive.1.xml:353, no-wrap
+#: apt-ftparchive.1.xml:354
+#, no-wrap
msgid ""
"for i in Sections do \n"
" for j in Architectures do\n"
@@ -3002,12 +3130,12 @@ msgstr ""
" Generate for DIST=scope SECTION=i ARCH=j\n"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:359
+#: apt-ftparchive.1.xml:360
msgid "Sections"
msgstr "Sections"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:361
+#: apt-ftparchive.1.xml:362
msgid ""
"This is a space separated list of sections which appear under the "
"distribution, typically this is something like <literal>main contrib non-"
@@ -3018,28 +3146,28 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:366
+#: apt-ftparchive.1.xml:367
msgid "Architectures"
msgstr "Architectures"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:368
+#: apt-ftparchive.1.xml:369
msgid ""
"This is a space separated list of all the architectures that appear under "
"search section. The special architecture 'source' is used to indicate that "
"this tree has a source archive."
msgstr ""
"C'est une liste de toutes les architectures qui appartiennent à chaque "
-"section. L'architecture spéciale « source » indique que "
-"l'arborescence est une arborescence de sources."
+"section. L'architecture spéciale « source » indique que l'arborescence est "
+"une arborescence de sources."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:373 apt-ftparchive.1.xml:421
+#: apt-ftparchive.1.xml:374 apt-ftparchive.1.xml:422
msgid "BinOverride"
msgstr "BinOverride"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:375
+#: apt-ftparchive.1.xml:376
msgid ""
"Sets the binary override file. The override file contains section, priority "
"and maintainer address information."
@@ -3048,12 +3176,12 @@ msgstr ""
"informations sur la section, la priorité et le responsable du paquet."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:379 apt-ftparchive.1.xml:426
+#: apt-ftparchive.1.xml:380 apt-ftparchive.1.xml:427
msgid "SrcOverride"
msgstr "SrcOverride"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:381
+#: apt-ftparchive.1.xml:382
msgid ""
"Sets the source override file. The override file contains section "
"information."
@@ -3062,32 +3190,32 @@ msgstr ""
"informations sur la section."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:385 apt-ftparchive.1.xml:431
+#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:432
msgid "ExtraOverride"
msgstr "ExtraOverride"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:387 apt-ftparchive.1.xml:433
+#: apt-ftparchive.1.xml:388 apt-ftparchive.1.xml:434
msgid "Sets the binary extra override file."
msgstr "Indique un autre fichier d'« override » pour les binaires."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:390 apt-ftparchive.1.xml:436
+#: apt-ftparchive.1.xml:391 apt-ftparchive.1.xml:437
msgid "SrcExtraOverride"
msgstr "SrcExtraOverride"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:438
+#: apt-ftparchive.1.xml:393 apt-ftparchive.1.xml:439
msgid "Sets the source extra override file."
msgstr "Indique un autre fichier d'« override » pour les sources."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:397
+#: apt-ftparchive.1.xml:398
msgid "BinDirectory Section"
msgstr "La section BinDirectory"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:399
+#: apt-ftparchive.1.xml:400
msgid ""
"The <literal>bindirectory</literal> section defines a binary directory tree "
"with no special structure. The scope tag specifies the location of the "
@@ -3102,12 +3230,12 @@ msgstr ""
"paramètrage de <literal>Section</literal><literal>Architecture</literal>."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:407
+#: apt-ftparchive.1.xml:408
msgid "Sets the Packages file output."
msgstr "Définit le fichier « Packages » créé."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:412
+#: apt-ftparchive.1.xml:413
msgid ""
"Sets the Sources file output. At least one of <literal>Packages</literal> or "
"<literal>Sources</literal> is required."
@@ -3116,52 +3244,52 @@ msgstr ""
"<literal>Packages</literal> ou <literal>Sources</literal> est nécessaire."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:418
+#: apt-ftparchive.1.xml:419
msgid "Sets the Contents file output. (optional)"
msgstr "Définit le fichier « Contents » créé."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:423
+#: apt-ftparchive.1.xml:424
msgid "Sets the binary override file."
msgstr "Définit le fichier d'« override » pour les binaires."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:428
+#: apt-ftparchive.1.xml:429
msgid "Sets the source override file."
msgstr "Définit le fichier d'« override » pour les sources."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:443
+#: apt-ftparchive.1.xml:444
msgid "Sets the cache DB."
msgstr "Définit la base de données cache."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:446
+#: apt-ftparchive.1.xml:447
msgid "PathPrefix"
msgstr "PathPrefix"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:448
+#: apt-ftparchive.1.xml:449
msgid "Appends a path to all the output paths."
msgstr "Ajoute un chemin à tous les chemins créés."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:451
+#: apt-ftparchive.1.xml:452
msgid "FileList, SourceFileList"
msgstr "FileList, SourceFileList"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:453
+#: apt-ftparchive.1.xml:454
msgid "Specifies the file list file."
msgstr "Définit le fichier contenant la liste des fichiers."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:460
+#: apt-ftparchive.1.xml:461
msgid "The Binary Override File"
msgstr "Le fichier d'« Override » pour les binaires."
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:461
+#: apt-ftparchive.1.xml:462
msgid ""
"The binary override file is fully compatible with &dpkg-scanpackages;. It "
"contains 4 fields separated by spaces. The first field is the package name, "
@@ -3169,24 +3297,26 @@ msgid ""
"section to force that package to and the final field is the maintainer "
"permutation field."
msgstr ""
-"Le fichier d'« Override » est pleinement compatible avec &dpkg-"
-"scanpackages;. Il contient quatre champs séparés par des espaces. Le premier "
-"est le nom du paquet ; le deuxième est la priorité à donner à ce "
-"paquet ; le troisième est sa section et le dernier champ est un champ "
-"pour changer le nom du responsable de paquet."
+"Le fichier d'« Override » est pleinement compatible avec &dpkg-scanpackages;. "
+"Il contient quatre champs séparés par des espaces. Le premier est le nom du "
+"paquet ; le deuxième est la priorité à donner à ce paquet ; le troisième est "
+"sa section et le dernier champ est un champ pour changer le nom du "
+"responsable de paquet."
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:467, no-wrap
+#: apt-ftparchive.1.xml:468
+#, no-wrap
msgid "old [// oldn]* => new"
msgstr "old [// oldn]* =&gt; new"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:469, no-wrap
+#: apt-ftparchive.1.xml:470
+#, no-wrap
msgid "new"
msgstr "new"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:466
+#: apt-ftparchive.1.xml:467
msgid ""
"The general form of the maintainer field is: <placeholder type="
"\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -3203,45 +3333,45 @@ msgstr ""
"deuxième forme remplace inconditionnellement le champ."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:477
+#: apt-ftparchive.1.xml:478
msgid "The Source Override File"
msgstr "Le fichier d'« Override » pour les sources"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:479
+#: apt-ftparchive.1.xml:480
msgid ""
"The source override file is fully compatible with &dpkg-scansources;. It "
"contains 2 fields separated by spaces. The first fields is the source "
"package name, the second is the section to assign it."
msgstr ""
-"Le fichier d'« Override » est pleinement compatible avec &dpkg-"
-"scansources;. Il contient deux champs. Le premier est le nom du paquet "
-"source ; le second, sa section."
+"Le fichier d'« Override » est pleinement compatible avec &dpkg-scansources;. "
+"Il contient deux champs. Le premier est le nom du paquet source ; le second, "
+"sa section."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:484
+#: apt-ftparchive.1.xml:485
msgid "The Extra Override File"
msgstr "Le fichier supplémentaire d'« Override »"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:486
+#: apt-ftparchive.1.xml:487
msgid ""
"The extra override file allows any arbitrary tag to be added or replaced in "
"the output. It has 3 columns, the first is the package, the second is the "
"tag and the remainder of the line is the new value."
msgstr ""
-"Le fichier supplémentaire d'« Override » permet d'ajouter ou de "
-"remplacer des étiquettes sur la sortie. Il possède trois colonnes : la "
-"première représente le paquet, la seconde est une étiquette et la troisième "
-"en fin de ligne est la nouvelle valeur."
+"Le fichier supplémentaire d'« Override » permet d'ajouter ou de remplacer des "
+"étiquettes sur la sortie. Il possède trois colonnes : la première représente "
+"le paquet, la seconde est une étiquette et la troisième en fin de ligne est "
+"la nouvelle valeur."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:495
+#: apt-ftparchive.1.xml:496
msgid "<option>--md5</option>"
msgstr "<option>--md5</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:497
+#: apt-ftparchive.1.xml:498
msgid ""
"Generate MD5 sums. This defaults to on, when turned off the generated index "
"files will not have MD5Sum fields where possible. Configuration Item: "
@@ -3249,26 +3379,26 @@ msgid ""
msgstr ""
"Créer la somme de contrôle MD5. Cette option est activée par défaut. Quand "
"elle est désactivée, les fichiers d'index n'ont pas les champs MD5Sum là où "
-"c'est possible. Élément de configuration : <literal>APT::FTPArchive::"
-"MD5</literal>."
+"c'est possible. Élément de configuration : <literal>APT::FTPArchive::MD5</"
+"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:502
+#: apt-ftparchive.1.xml:503
msgid "<option>--db</option>"
msgstr "<option>--db</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:504
+#: apt-ftparchive.1.xml:505
msgid ""
"Use a binary caching DB. This has no effect on the generate command. "
"Configuration Item: <literal>APT::FTPArchive::DB</literal>."
msgstr ""
"Utiliser une base de données binaire pour cache. Cela n'a aucun effet sur la "
-"commande generate. Élément de configuration : <literal>APT::"
-"FTPArchive::DB</literal>."
+"commande generate. Élément de configuration : <literal>APT::FTPArchive::DB</"
+"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:510
+#: apt-ftparchive.1.xml:511
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3277,18 +3407,18 @@ msgid ""
msgstr ""
"Mode silencieux ; cette commande produit une sortie destinée à "
"l'enregistrement dans un fichier-journal en omettant les indicateurs de "
-"progression. Un plus grand nombre de « q » (2 au plus) produit un "
-"plus grand silence. On peut aussi utiliser <option>-q=#</option> pour "
-"positionner le niveau de silence, et annuler le fichier de configuration. "
-"Élément de configuration : <literal>quiet</literal>."
+"progression. Un plus grand nombre de « q » (2 au plus) produit un plus grand "
+"silence. On peut aussi utiliser <option>-q=#</option> pour positionner le "
+"niveau de silence, et annuler le fichier de configuration. Élément de "
+"configuration : <literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:516
+#: apt-ftparchive.1.xml:517
msgid "<option>--delink</option>"
msgstr "<option>--delink</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:518
+#: apt-ftparchive.1.xml:519
msgid ""
"Perform Delinking. If the <literal>External-Links</literal> setting is used "
"then this option actually enables delinking of the files. It defaults to on "
@@ -3298,16 +3428,16 @@ msgstr ""
"Défaire une liaison. Si <literal>External-Links</literal> est activé, cette "
"option permet réellement de délier les fichiers. Par défaut, elle est "
"activée mais elle peut être désactivée avec l'option <option>--no-delink</"
-"option>. Élément de configuration : <literal>APT::FTPArchive::"
-"DeLinkAct</literal>."
+"option>. Élément de configuration : <literal>APT::FTPArchive::DeLinkAct</"
+"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:524
+#: apt-ftparchive.1.xml:525
msgid "<option>--contents</option>"
msgstr "<option>--contents</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:526
+#: apt-ftparchive.1.xml:527
msgid ""
"Perform contents generation. When this option is set and package indexes are "
"being generated with a cache DB then the file listing will also be extracted "
@@ -3315,21 +3445,20 @@ msgid ""
"option also allows the creation of any Contents files. The default is on. "
"Configuration Item: <literal>APT::FTPArchive::Contents</literal>."
msgstr ""
-"Permettre la création d'un fichier « Contents ». Quand cette option "
-"est activée et que les index sont créés sous forme de base de données "
-"binaire, la liste des fichiers est aussi extraite et conservée dans la base "
-"de données pour un usage futur. Avec la commande generate, cette option "
-"permet la création de fichiers « Contents ». Par défaut, elle est "
-"activée. Élément de configuration : <literal>APT::FTPArchive::"
-"Contents</literal>."
+"Permettre la création d'un fichier « Contents ». Quand cette option est "
+"activée et que les index sont créés sous forme de base de données binaire, "
+"la liste des fichiers est aussi extraite et conservée dans la base de "
+"données pour un usage futur. Avec la commande generate, cette option permet "
+"la création de fichiers « Contents ». Par défaut, elle est activée. Élément "
+"de configuration : <literal>APT::FTPArchive::Contents</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:534
+#: apt-ftparchive.1.xml:535
msgid "<option>--source-override</option>"
msgstr "<option>--source-override</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:536
+#: apt-ftparchive.1.xml:537
msgid ""
"Select the source override file to use with the <literal>sources</literal> "
"command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -3340,12 +3469,12 @@ msgstr ""
"FTPArchive::SourceOverride</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:540
+#: apt-ftparchive.1.xml:541
msgid "<option>--readonly</option>"
msgstr "<option>--readonly</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:542
+#: apt-ftparchive.1.xml:543
msgid ""
"Make the caching databases read only. Configuration Item: <literal>APT::"
"FTPArchive::ReadOnlyDB</literal>."
@@ -3354,29 +3483,28 @@ msgstr ""
"configuration : <literal>APT::FTPArchive::ReadOnlyDB</literal>."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:551 apt.conf.5.xml:818 apt_preferences.5.xml:460
-#: sources.list.5.xml:180
+#: apt-ftparchive.1.xml:552 apt.conf.5.xml:934 apt_preferences.5.xml:462
+#: sources.list.5.xml:181
msgid "Examples"
msgstr "Exemples"
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:557
+#: apt-ftparchive.1.xml:558
#, no-wrap
msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
-msgstr ""
-"<command>apt-ftparchive</command> packages <replaceable>répertoire</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
+msgstr "<command>apt-ftparchive</command> packages <replaceable>répertoire</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:553
+#: apt-ftparchive.1.xml:554
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
msgstr ""
-"Création d'un fichier « Packages » compressé pour un répertoire contenant des paquets binaires (.deb): <placeholder type=\"programlisting\" "
-"id=\"0\"/>"
+"Création d'un fichier « Packages » compressé pour un répertoire contenant des "
+"paquets binaires (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:567
+#: apt-ftparchive.1.xml:568
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -3384,7 +3512,7 @@ msgstr ""
"<command>apt-ftparchive</command> retourne zéro si tout se passe bien, le "
"nombre 100 en cas d'erreur."
-#. The last update date
+#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-get.8.xml:13
msgid ""
@@ -3395,19 +3523,51 @@ msgstr ""
"Novembre 2008</date>"
#. type: Content of: <refentry><refnamediv><refname>
-#: apt-get.8.xml:22 apt-get.8.xml:28
+#: apt-get.8.xml:22 apt-get.8.xml:29
msgid "apt-get"
msgstr "apt-get"
#. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-get.8.xml:29
+#: apt-get.8.xml:30
msgid "APT package handling utility -- command-line interface"
msgstr ""
"Utilitaire APT pour la manipulation de paquets -- interface en ligne de "
"commande."
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-get.8.xml:35
+#: 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> "
@@ -3428,9 +3588,12 @@ msgid ""
"\"><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 "
+"\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
+"choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> <arg "
+"choice='plain'> /<replaceable>target_release_name</replaceable> </arg> <arg "
+"choice='plain'> /<replaceable>target_release_codename</replaceable> </arg> </"
+"group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=\"plain"
+"\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
"choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
"choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
"choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
@@ -3439,16 +3602,16 @@ msgid ""
"</group> </arg> </group>"
msgstr ""
"<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-"<option>-o= <replaceable>option_de_configuration</replaceable> </option> </arg> <arg> "
-"<option>-c= <replaceable>fichier_de_configuration</replaceable> </option> </arg> <arg> "
-"<option>-t=</option> <group choice='req'> <arg choice='plain'> "
-"<replaceable>nom_version_cible</replaceable> </arg> <arg choice='plain'> "
-"<replaceable>expression_numéro_version_cible</replaceable> </arg> <arg "
-"choice='plain'> <replaceable>nom_code_version_cible</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 "
+"<option>-o= <replaceable>option_de_configuration</replaceable> </option> </"
+"arg> <arg> <option>-c= <replaceable>fichier_de_configuration</replaceable> </"
+"option> </arg> <arg> <option>-t=</option> <group choice='req'> <arg "
+"choice='plain'> <replaceable>nom_version_cible</replaceable> </arg> <arg "
+"choice='plain'> <replaceable>expression_numéro_version_cible</replaceable> </"
+"arg> <arg choice='plain'> <replaceable>nom_code_version_cible</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>numero_version_paquet</"
"replaceable> </arg> <arg choice='plain'> /<replaceable>nom_version_cible</"
"replaceable> </arg> <arg choice='plain'> /"
@@ -3457,18 +3620,19 @@ msgstr ""
"\"><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>paquet</replaceable> <arg> =<replaceable>numéro_version_paquet</"
-"replaceable> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>paquet</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>"
+"\"><replaceable>paquet</replaceable> <arg> "
+"=<replaceable>numéro_version_paquet</replaceable> </arg> </arg> </arg> <arg "
+"choice='plain'>build-dep <arg choice=\"plain\" rep=\"repeat"
+"\"><replaceable>paquet</replaceable></arg></arg> <arg choice='plain'>check</"
+"arg> <arg choice='plain'>clean</arg> <arg choice='plain'>autoclean</arg> "
+"<arg choice='plain'>autoremove</arg> <arg choice='plain'> <group "
+"choice='req'> <arg choice='plain'>-v</arg> <arg choice='plain'>--version</"
+"arg> </group> </arg> <arg choice='plain'> <group choice='req'> <arg "
+"choice='plain'>-h</arg> <arg choice='plain'>--help</arg> </group> </arg> </"
+"group>"
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:115
+#: apt-get.8.xml:126
msgid ""
"<command>apt-get</command> is the command-line tool for handling packages, "
"and may be considered the user's \"back-end\" to other tools using the APT "
@@ -3476,16 +3640,17 @@ msgid ""
"&aptitude;, &synaptic;, &gnome-apt; and &wajig;."
msgstr ""
"<command>Apt-get</command> est l'outil en ligne de commande pour manipuler "
-"les paquets. Il peut être considéré comme l'outil de base (« backend ») pour les autres outils de la bibliothèque APT. Plusieurs interfaces "
-"utilisateur existent, comme dselect, aptitude, synaptic, gnome-apt ou wajig."
+"les paquets. Il peut être considéré comme l'outil de base (« backend ») pour "
+"les autres outils de la bibliothèque APT. Plusieurs interfaces utilisateur "
+"existent, comme dselect, aptitude, synaptic, gnome-apt ou wajig."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:124 apt-key.8.xml:122
+#: apt-get.8.xml:135 apt-key.8.xml:123
msgid "update"
msgstr "update"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:125
+#: apt-get.8.xml:136
msgid ""
"<literal>update</literal> is used to resynchronize the package index files "
"from their sources. The indexes of available packages are fetched from the "
@@ -3510,12 +3675,12 @@ msgstr ""
"ne peut être connue à l'avance."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:136
+#: apt-get.8.xml:147
msgid "upgrade"
msgstr "upgrade"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:137
+#: apt-get.8.xml:148
msgid ""
"<literal>upgrade</literal> is used to install the newest versions of all "
"packages currently installed on the system from the sources enumerated in "
@@ -3532,8 +3697,8 @@ msgstr ""
"plus récentes de tous les paquets présents sur le système en utilisant les "
"sources énumérées dans <filename>/etc/apt/sources.list</filename>. Les "
"paquets installés dont il existe de nouvelles versions sont récupérés et mis "
-"à niveau. En aucun cas des paquets déjà installés ne sont supprimés ; "
-"de même, des paquets qui ne sont pas déjà installés ne sont ni récupérés ni "
+"à niveau. En aucun cas des paquets déjà installés ne sont supprimés ; de "
+"même, des paquets qui ne sont pas déjà installés ne sont ni récupérés ni "
"installés. Les paquets dont de nouvelles versions ne peuvent pas être "
"installées sans changer le statut d'installation d'un autre paquet sont "
"laissés dans leur version courante. On doit d'abord exécuter la commande "
@@ -3541,12 +3706,12 @@ msgstr ""
"l'existence de nouvelles versions des paquets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:149
+#: apt-get.8.xml:160
msgid "dselect-upgrade"
msgstr "dselect-upgrade"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:150
+#: apt-get.8.xml:161
msgid ""
"<literal>dselect-upgrade</literal> is used in conjunction with the "
"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -3556,20 +3721,20 @@ msgid ""
"new packages)."
msgstr ""
"<literal>dselect-upgrade</literal> est utilisée conjointement avec "
-"&dselect;, l'interface originelle Debian pour la gestion des paquets. "
-"La commande <literal>dselect-upgrade</literal> suit les modifications faites "
+"&dselect;, l'interface originelle Debian pour la gestion des paquets. La "
+"commande <literal>dselect-upgrade</literal> suit les modifications faites "
"par &dselect; dans le champ <literal>Status</literal> des paquets "
"disponibles, et effectue les actions nécessaires à la réalisation de cet "
"état (par exemple, suppression d'anciens paquets, installation de nouveaux "
"paquets)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:159
+#: apt-get.8.xml:170
msgid "dist-upgrade"
msgstr "dist-upgrade"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:160
+#: apt-get.8.xml:171
msgid ""
"<literal>dist-upgrade</literal> in addition to performing the function of "
"<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -3584,21 +3749,20 @@ msgstr ""
"La commande <literal>dist-upgrade</literal> effectue la fonction "
"<literal>upgrade</literal> en y ajoutant une gestion intelligente des "
"changements de dépendances dans les nouvelles versions des paquets ; "
-"<command>apt-get</command> possède un système « intelligent » de "
-"résolution des conflits et il essaye, quand c'est nécessaire, de mettre à "
-"niveau les paquets les plus importants aux dépens des paquets les moins "
-"importants. Le fichier <filename>/etc/apt/sources.list</filename> contient "
-"une liste de 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."
+"<command>apt-get</command> possède un système « intelligent » de résolution "
+"des conflits et il essaye, quand c'est nécessaire, de mettre à niveau les "
+"paquets les plus importants aux dépens des paquets les moins importants. Le "
+"fichier <filename>/etc/apt/sources.list</filename> contient une liste de "
+"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: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:172
+#: apt-get.8.xml:183
msgid "install"
msgstr "install"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:174
+#: apt-get.8.xml:185
msgid ""
"<literal>install</literal> is followed by one or more packages desired for "
"installation or upgrading. Each package is a package name, not a fully "
@@ -3613,20 +3777,20 @@ msgid ""
"decisions made by apt-get's conflict resolution system."
msgstr ""
"La commande <literal>install</literal> est suivie par un ou plusieurs "
-"paquets à installer. Chaque paquet est un nom de paquet ; ce n'est pas "
-"un nom complet de fichier (par exemple, dans un système Debian "
-"GNU/Linux, on indiquera libc6 et non pas <literal>libc6_1.9.6-2.deb</"
-"literal>). Tous les paquets requis par le(s) paquet(s) que l'on veut "
-"installer sont aussi récupérés et installés. Le fichier "
-"<filename>/etc/apt/sources.list</filename> est utilisé pour retrouver les paquets "
-"désirés. Quand un trait d'union est accolé (sans espace intermédiaire) au "
-"nom d'un paquet déjà installé, ce paquet est supprimé. De même on peut "
-"ajouter un signe « + » pour désigner un paquet à installer. Cette "
-"dernière fonctionnalité peut être utilisée pour annuler les décisions prises "
-"par le système de résolution des conflits d'apt-get."
+"paquets à installer. Chaque paquet est un nom de paquet ; ce n'est pas un "
+"nom complet de fichier (par exemple, dans un système Debian GNU/Linux, on "
+"indiquera libc6 et non pas <literal>libc6_1.9.6-2.deb</literal>). Tous les "
+"paquets requis par le(s) paquet(s) que l'on veut installer sont aussi "
+"récupérés et installés. Le fichier <filename>/etc/apt/sources.list</"
+"filename> est utilisé pour retrouver les paquets désirés. Quand un trait "
+"d'union est accolé (sans espace intermédiaire) au nom d'un paquet déjà "
+"installé, ce paquet est supprimé. De même on peut ajouter un signe « + » pour "
+"désigner un paquet à installer. Cette dernière fonctionnalité peut être "
+"utilisée pour annuler les décisions prises par le système de résolution des "
+"conflits d'apt-get."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:192
+#: apt-get.8.xml:203
msgid ""
"A specific version of a package can be selected for installation by "
"following the package name with an equals and the version of the package to "
@@ -3643,16 +3807,17 @@ msgstr ""
"unstable)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:199
+#: apt-get.8.xml:210
msgid ""
"Both of the version selection mechanisms can downgrade packages and must be "
"used with care."
msgstr ""
"Avec ces possibilités de choisir la version, de vieilles versions d'un "
-"paquet peuvent être installées. Cette fonctionnalité est donc à utiliser avec précaution."
+"paquet peuvent être installées. Cette fonctionnalité est donc à utiliser "
+"avec précaution."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:202
+#: apt-get.8.xml:213
msgid ""
"This is also the target to use if you want to upgrade one or more already-"
"installed packages without upgrading every package you have on your system. "
@@ -3662,13 +3827,17 @@ msgid ""
"you wish to upgrade, and if a newer version is available, it (and its "
"dependencies, as described above) will be downloaded and installed."
msgstr ""
-"Cette méthode est aussi utile pour mettre à jour un ou plusieurs paquets déjà installés sans mettre à jour les autres paquets du système. À la "
-"différence de la commande « upgrade » qui installera le dernière version disponible de tous les paquets installés au moment de son exécution, « "
-"install » n'installera la nouvelle version que pour le(s) paquet(s) indiqué(s). Il suffit de fournir le nom du(des) paquet(s) à mettre à jour et si "
-"une nouvelle version est disponible, cette version (et ses dépendances, comme décrit plus haut) sera récupérée et installée."
+"Cette méthode est aussi utile pour mettre à jour un ou plusieurs paquets "
+"déjà installés sans mettre à jour les autres paquets du système. À la "
+"différence de la commande « upgrade » qui installera le dernière version "
+"disponible de tous les paquets installés au moment de son exécution, « "
+"install » n'installera la nouvelle version que pour le(s) paquet(s) indiqué"
+"(s). Il suffit de fournir le nom du(des) paquet(s) à mettre à jour et si une "
+"nouvelle version est disponible, cette version (et ses dépendances, comme "
+"décrit plus haut) sera récupérée et installée."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:213
+#: apt-get.8.xml:224
msgid ""
"Finally, the &apt-preferences; mechanism allows you to create an alternative "
"installation policy for individual packages."
@@ -3677,7 +3846,7 @@ msgstr ""
"l'installation des paquets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:217
+#: apt-get.8.xml:228
msgid ""
"If no package matches the given expression and the expression contains one "
"of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@ -3688,21 +3857,22 @@ msgid ""
"expression."
msgstr ""
"Quand aucun paquet ne correspond à l'expression donnée en paramètre et que "
-"cette expression contient l'un des caractères « . », « ? » "
-"ou « * », elle est considérée comme une expression rationnelle POSIX "
-"et elle est appliquée à tous les paquets de la base de données. Tout paquet "
-"correspondant est installé (ou supprimé). Veuillez noter que la comparaison est "
-"effectuée par sous-chaîne et « lo.* » correspond aussi bien à « "
-"how-lo » qu'à « lowest ». Si ce n'est pas le comportement souhaité, l'expression peut être ancrée avec un caractère « ^ » ou un caractère « $ », "
-"une autre possibilité étant d'utiliser une expression plus précise."
+"cette expression contient l'un des caractères « . », « ? » ou « * », elle est "
+"considérée comme une expression rationnelle POSIX et elle est appliquée à "
+"tous les paquets de la base de données. Tout paquet correspondant est "
+"installé (ou supprimé). Veuillez noter que la comparaison est effectuée par "
+"sous-chaîne et « lo.* » correspond aussi bien à « how-lo » qu'à « lowest ». Si "
+"ce n'est pas le comportement souhaité, l'expression peut être ancrée avec un "
+"caractère « ^ » ou un caractère « $ », une autre possibilité étant d'utiliser "
+"une expression plus précise."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:226
+#: apt-get.8.xml:237
msgid "remove"
msgstr "remove"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:227
+#: apt-get.8.xml:238
msgid ""
"<literal>remove</literal> is identical to <literal>install</literal> except "
"that packages are removed instead of installed. Note the removing a package "
@@ -3711,54 +3881,99 @@ msgid ""
"installed instead of removed."
msgstr ""
"La commande <literal>remove</literal> est identique à la commande "
-"<literal>install</literal>, les paquets étant alors supprimés et non installés. Veuillez noter que la suppression d'un paquet en laisse les "
-"fichiers de configuration sur le système. Quand un signe plus est accolé (sans espace intermédiaire) au nom "
-"du paquet, le paquet est installé au lieu d'être supprimé."
+"<literal>install</literal>, les paquets étant alors supprimés et non "
+"installés. Veuillez noter que la suppression d'un paquet en laisse les "
+"fichiers de configuration sur le système. Quand un signe plus est accolé "
+"(sans espace intermédiaire) au nom du paquet, le paquet est installé au lieu "
+"d'être supprimé."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:234
+#: apt-get.8.xml:245
msgid "purge"
msgstr "purge"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:235
+#: apt-get.8.xml:246
msgid ""
"<literal>purge</literal> is identical to <literal>remove</literal> except "
"that packages are removed and purged (any configuration files are deleted "
"too)."
msgstr ""
-"La commande <literal>purge</literal> est identique à <literal>remove</literal> mais les paquets indiqués sont supprimés et purgés (leur fichiers de "
-"configuration sont également effacés)."
+"La commande <literal>purge</literal> est identique à <literal>remove</"
+"literal> mais les paquets indiqués sont supprimés et purgés (leur fichiers "
+"de configuration sont également effacés)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:239
+#: apt-get.8.xml:250
msgid "source"
msgstr "source"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:240
+#: 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 "
"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."
+"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."
msgstr ""
"Avec la commande <literal>source</literal>, <command>apt-get</command> "
"récupère des paquets sources. APT examine les paquets disponibles pour "
-"choisir le paquet source à récupérer. Il trouve ensuite et récupère dans "
-"le répertoire courant leur version la plus récente. Les paquets source sont suivis séparément des paquets binaires en utilisant les lignes de type "
-"<literal>deb-src</literal> dans le fichier &sources-list;. Cela signifie qu'il n'est pas garanti que vous récupérerez le paquet source "
-"correspondant à un paquet binaire présent sur le système. Si l'option --compile est utilisée, e paquet sera compilé en paquet(s) .deb binaire(s) "
-"avec dpkg-buildpackage. Si l'option --download-only est utilisée, le paquet source sera seulement récupéré et pas décompressé."
+"choisir le paquet source à récupérer. Il trouve ensuite et récupère dans le "
+"répertoire courant leur version la plus récente. Les paquets source sont "
+"suivis séparément des paquets binaires en utilisant les lignes de type "
+"<literal>deb-src</literal> dans le fichier &sources-list;. Cela signifie "
+"qu'il n'est pas garanti que vous récupérerez le paquet source correspondant "
+"à un paquet binaire présent sur le système. Si l'option --compile est "
+"utilisée, e paquet sera compilé en paquet(s) .deb binaire(s) avec dpkg-"
+"buildpackage. Si l'option --download-only est utilisée, le paquet source "
+"sera seulement récupéré et pas décompressé."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:259
+#, fuzzy
+msgid ""
+"Source packages are tracked separately from binary packages via <literal>deb-"
+"src</literal> type lines in the &sources-list; file. This means that you "
+"will need to add such a line for each repository you want to get sources "
+"from. If you don't do this you will properly get another (newer, older or "
+"none) source version than the one you have installed or could install."
+msgstr ""
+"Les paquets source sont gérés indépendamment des paquets binaires, via les "
+"lignes de type <literal>deb-src</literal> dans le fichier &sources-list;. On "
+"n'obtiendra probablement pas les mêmes sources que celles du paquet installé "
+"ou celles du paquet qu'on pourrait installer."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:251
+#: 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."
+msgstr ""
+"Si l'option <option>--compile</option> est spécifiée, le paquet est compilé "
+"en un binaire .deb avec <command>dpkg-buildpackage</command>. Si <option>--"
+"download-only</option> est spécifié, le source n'est pas décompacté."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:271
msgid ""
"A specific source version can be retrieved by postfixing the source name "
"with an equals and then the version to fetch, similar to the mechanism used "
@@ -3769,26 +3984,27 @@ msgstr ""
"De la même façon qu'avec les paquets binaires, on peut récupérer une version "
"particulière d'un paquet source en faisant suivre son nom par un signe égal "
"et par la version. Cela permet une comparaison exacte entre le nom du paquet "
-"source et la version ; l'option correspondante est : <literal>APT::Get::Only-Source</literal>."
+"source et la version ; l'option correspondante est : <literal>APT::Get::Only-"
+"Source</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:257
+#: apt-get.8.xml:277
msgid ""
"Note that source packages are not tracked like binary packages, they exist "
"only in the current directory and are similar to downloading source tar "
"balls."
msgstr ""
-"Veuillez noter que les paquets sources ne sont pas suivis comme le sont les paquets "
-"binaires. Ils ne sont présents que dans le répertoire courant et sont "
-"semblables à des sources téléchargées sous forme d'archives tar."
+"Veuillez noter que les paquets sources ne sont pas suivis comme le sont les "
+"paquets binaires. Ils ne sont présents que dans le répertoire courant et "
+"sont semblables à des sources téléchargées sous forme d'archives tar."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:262
+#: apt-get.8.xml:282
msgid "build-dep"
msgstr "build-dep"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:263
+#: apt-get.8.xml:283
msgid ""
"<literal>build-dep</literal> causes apt-get to install/remove packages in an "
"attempt to satisfy the build dependencies for a source package."
@@ -3798,21 +4014,21 @@ msgstr ""
"paquet source."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:267
+#: apt-get.8.xml:287
msgid "check"
msgstr "check"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:268
+#: apt-get.8.xml:288
msgid ""
"<literal>check</literal> is a diagnostic tool; it updates the package cache "
"and checks for broken dependencies."
msgstr ""
-"La commande <literal>check</literal> est un outil de diagnostic ; il "
-"met à jour le cache des paquets et cherche des dépendances défectueuses."
+"La commande <literal>check</literal> est un outil de diagnostic ; il met à "
+"jour le cache des paquets et cherche des dépendances défectueuses."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:273
+#: apt-get.8.xml:293
msgid ""
"<literal>clean</literal> clears out the local repository of retrieved "
"package files. It removes everything but the lock file from "
@@ -3823,20 +4039,20 @@ msgid ""
"disk space."
msgstr ""
"La commande <literal>clean</literal> nettoie le référentiel local des "
-"paquets récupérés. Elle supprime tout, excepté le fichier de verrou situé dans "
-"<filename>&cachedir;/archives/</filename> et <filename>&cachedir;/archives/"
-"partial/</filename>. Quand APT est utilisé comme mode de &dselect;, "
-"<literal>clean</literal> est exécuté automatiquement. Quand on n'utilise "
-"pas dselect, il faut exécuter <literal>apt-get clean</literal> de temps en "
-"temps si l'on veut libérer de l'espace disque."
+"paquets récupérés. Elle supprime tout, excepté le fichier de verrou situé "
+"dans <filename>&cachedir;/archives/</filename> et <filename>&cachedir;/"
+"archives/partial/</filename>. Quand APT est utilisé comme mode de "
+"&dselect;, <literal>clean</literal> est exécuté automatiquement. Quand on "
+"n'utilise pas dselect, il faut exécuter <literal>apt-get clean</literal> de "
+"temps en temps si l'on veut libérer de l'espace disque."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:282
+#: apt-get.8.xml:302
msgid "autoclean"
msgstr "autoclean"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:283
+#: apt-get.8.xml:303
msgid ""
"Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
"local repository of retrieved package files. The difference is that it only "
@@ -3855,55 +4071,57 @@ msgstr ""
"installés."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:292
+#: apt-get.8.xml:312
msgid "autoremove"
msgstr "autoremove"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:293
+#: apt-get.8.xml:313
msgid ""
"<literal>autoremove</literal> is used to remove packages that were "
"automatically installed to satisfy dependencies for some package and that "
"are no more needed."
msgstr ""
-"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 ne sont plus nécessaires."
+"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 "
+"ne sont plus nécessaires."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:303 apt-get.8.xml:409
+#: apt-get.8.xml:323 apt-get.8.xml:429
msgid "<option>--no-install-recommends</option>"
msgstr "<option>--no-install-recommends</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:304
+#: apt-get.8.xml:324
msgid ""
"Do not consider recommended packages as a dependency for installing. "
"Configuration Item: <literal>APT::Install-Recommends</literal>."
msgstr ""
-"Ne pas considérer les paquets recommandés comme des dépendances à installer. Élément de configuration : <literal>APT::Install-Recommends</literal>."
+"Ne pas considérer les paquets recommandés comme des dépendances à installer. "
+"Élément de configuration : <literal>APT::Install-Recommends</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:308
+#: apt-get.8.xml:328
msgid "<option>--download-only</option>"
msgstr "<option>--download-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:309
+#: apt-get.8.xml:329
msgid ""
"Download only; package files are only retrieved, not unpacked or installed. "
"Configuration Item: <literal>APT::Get::Download-Only</literal>."
msgstr ""
-"Récupération seule ; les paquets sont récupérés mais ne sont ni "
-"dépaquetés ni installés. Élément de configuration : <literal>APT::Get::"
-"Download-Only</literal>."
+"Récupération seule ; les paquets sont récupérés mais ne sont ni dépaquetés "
+"ni installés. Élément de configuration : <literal>APT::Get::Download-Only</"
+"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:313
+#: apt-get.8.xml:333
msgid "<option>--fix-broken</option>"
msgstr "<option>--fix-broken</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:314
+#: apt-get.8.xml:334
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
@@ -3921,28 +4139,27 @@ msgstr ""
"défectueuses. Cette option, utilisée avec install ou remove, peut omettre "
"tout paquet de façon à permettre à APT de déduire une solution viable. "
"Chaque paquet spécifié doit complètement corriger le problème. Cette option "
-"est quelquefois nécessaire lorsque l'on exécute APT pour la première "
-"fois ; APT lui-même interdit les dépendances défectueuses dans un "
-"système. Il est possible que la structure de dépendances d'un système soit "
-"tellement corrompue qu'elle requiert une intervention manuelle (ce qui veut "
-"dire la plupart du temps utiliser &dselect; ou <command>dpkg --remove</"
-"command> pour éliminer les paquets en cause). L'utilisation de cette option "
-"conjointement avec <option>-m</option> peut produire une erreur dans "
-"certaines situations. Élément de configuration : <literal>APT::Get::"
-"Fix-Broken</literal>."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:327
+"est quelquefois nécessaire lorsque l'on exécute APT pour la première fois ; "
+"APT lui-même interdit les dépendances défectueuses dans un système. Il est "
+"possible que la structure de dépendances d'un système soit tellement "
+"corrompue qu'elle requiert une intervention manuelle (ce qui veut dire la "
+"plupart du temps utiliser &dselect; ou <command>dpkg --remove</command> pour "
+"éliminer les paquets en cause). L'utilisation de cette option conjointement "
+"avec <option>-m</option> peut produire une erreur dans certaines situations. "
+"Élément de configuration : <literal>APT::Get::Fix-Broken</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml:347
msgid "<option>--ignore-missing</option>"
msgstr "<option>--ignore-missing</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:328
+#: apt-get.8.xml:348
msgid "<option>--fix-missing</option>"
msgstr "<option>--fix-missing</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:329
+#: apt-get.8.xml:349
msgid ""
"Ignore missing packages; If packages cannot be retrieved or fail the "
"integrity check after retrieval (corrupted package files), hold back those "
@@ -3952,22 +4169,22 @@ msgid ""
"it could not be downloaded then it will be silently held back. "
"Configuration Item: <literal>APT::Get::Fix-Missing</literal>."
msgstr ""
-"Ignorer les paquets manquants ; si des paquets ne peuvent être "
-"récupérés, ou, après récupération, ne satisfont pas au contrôle d'intégrité, "
-"cette commande met ces paquets de côté et gère le résultat. Utiliser cette "
-"option conjointement avec <option>-f</option> peut produire une erreur dans "
+"Ignorer les paquets manquants ; si des paquets ne peuvent être récupérés, "
+"ou, après récupération, ne satisfont pas au contrôle d'intégrité, cette "
+"commande met ces paquets de côté et gère le résultat. Utiliser cette option "
+"conjointement avec <option>-f</option> peut produire une erreur dans "
"certaines situations. Quand un paquet, sélectionné pour une installation "
"(particulièrement si c'est mentionné en ligne de commande), ne peut être "
-"récupéré, il est mis silencieusement de côté. Élément de "
-"configuration : <literal>APT::Get::Fix-Missing</literal>."
+"récupéré, il est mis silencieusement de côté. Élément de configuration : "
+"<literal>APT::Get::Fix-Missing</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:339
+#: apt-get.8.xml:359
msgid "<option>--no-download</option>"
msgstr "<option>--no-download</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:340
+#: apt-get.8.xml:360
msgid ""
"Disables downloading of packages. This is best used with <option>--ignore-"
"missing</option> to force APT to use only the .debs it has already "
@@ -3975,11 +4192,11 @@ msgid ""
msgstr ""
"Pas de récupération. Le mieux est d'utiliser cette option avec <option>--"
"ignore-missing</option> pour forcer APT à n'utiliser que les .deb qu'il a "
-"déjà récupérés. Élément de configuration : <literal>APT::Get::"
-"Download</literal>."
+"déjà récupérés. Élément de configuration : <literal>APT::Get::Download</"
+"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:347
+#: apt-get.8.xml:367
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3991,54 +4208,66 @@ msgid ""
msgstr ""
"Mode silencieux ; cette commande produit une sortie destinée à "
"l'enregistrement dans un fichier-journal en omettant les indicateurs de "
-"progression. Un plus grand nombre de « q » (2 au plus) produit un "
-"plus grand silence. On peut aussi utiliser <option>-q=#</option> pour "
-"positionner le niveau de silence, et annuler le fichier de configuration. "
-"Notez qu'un niveau de silence égal à 2 implique <option>-y</option> et vous "
-"ne devez jamais utiliser <option>-qq</option> sans l'accompagner d'un "
-"modificateur tel que <option>-d</option>, <option>--print-uris</option> ou "
-"<option>-s</option> : APT pourrait alors exécuter des actions "
-"inattendues. Élément de configuration : <literal>quiet</literal>."
+"progression. Un plus grand nombre de « q » (2 au plus) produit un plus grand "
+"silence. On peut aussi utiliser <option>-q=#</option> pour positionner le "
+"niveau de silence, et annuler le fichier de configuration. Notez qu'un "
+"niveau de silence égal à 2 implique <option>-y</option> et vous ne devez "
+"jamais utiliser <option>-qq</option> sans l'accompagner d'un modificateur "
+"tel que <option>-d</option>, <option>--print-uris</option> ou <option>-s</"
+"option> : APT pourrait alors exécuter des actions inattendues. Élément de "
+"configuration : <literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:357
+#: apt-get.8.xml:377
msgid "<option>--simulate</option>"
msgstr "<option>--simulate</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:359
+#: apt-get.8.xml:379
msgid "<option>--dry-run</option>"
msgstr "<option>--dry-run</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:362
+#: apt-get.8.xml:382
msgid ""
"No action; perform a simulation of events that would occur but do not "
"actually change the system. Configuration Item: <literal>APT::Get::"
"Simulate</literal>."
msgstr ""
-"Pas d'action ; simule les événements qui devraient se produire sans effectuer de changement réel sur le système. Élément de "
-"configuration : <literal>APT::Get::Simulate</literal>."
+"Pas d'action ; simule les événements qui devraient se produire sans "
+"effectuer de changement réel sur le système. Élément de configuration : "
+"<literal>APT::Get::Simulate</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:366
+#: 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>) automatical. Also a notice will be displayed indicating that this "
+"literal>) automatic. Also a notice will be displayed indicating that this "
"is only a simulation, if the option <literal>APT::Get::Show-User-Simulation-"
-"Note</literal> is set (Default: true) Neigther NoLocking nor the notice "
+"Note</literal> is set (Default: true). Neither NoLocking nor the notice "
"will be triggered if run as root (root should know what he is doing without "
"further warnings by <literal>apt-get</literal>)."
msgstr ""
-"Lorsque la simulation est effectuée par un utilisateur sans privilèges, le verrouillage (<literal>Debug::NoLocking</"
-"literal>) sera désactivé automatiquement. Une mention explicite qu'il s'agit d'une simple simulation sera affichée si l'option <literal>"
-"APT::Get::Show-User-Simulation-"
-"Note</literal> est activée (elle est active par défaut). Ni la désactivation du verrou ni l'affichage de la mention de simulation ne seront "
-"utilisées si la commande est lancée par l'utilisateur root (pour qui il n'est pas jugé utile qu'<literal>apt-get</literal> envoie de telles "
-"notifications)."
+"Lorsque la simulation est effectuée par un utilisateur sans privilèges, le "
+"verrouillage (<literal>Debug::NoLocking</literal>) sera désactivé "
+"automatiquement. Une mention explicite qu'il s'agit d'une simple simulation "
+"sera affichée si l'option <literal>APT::Get::Show-User-Simulation-Note</"
+"literal> est activée (elle est active par défaut). Ni la désactivation du "
+"verrou ni l'affichage de la mention de simulation ne seront utilisées si la "
+"commande est lancée par l'utilisateur root (pour qui il n'est pas jugé utile "
+"qu'<literal>apt-get</literal> envoie de telles notifications)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:372
+#: apt-get.8.xml:392
msgid ""
"Simulate prints out a series of lines each one representing a dpkg "
"operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@ -4051,22 +4280,22 @@ msgstr ""
"que les dommages n'ont aucune conséquence (rare)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:379
+#: apt-get.8.xml:399
msgid "<option>-y</option>"
msgstr "<option>-y</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:379
+#: apt-get.8.xml:399
msgid "<option>--yes</option>"
msgstr "<option>--yes</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:380
+#: apt-get.8.xml:400
msgid "<option>--assume-yes</option>"
msgstr "<option>--assume-yes</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:381
+#: apt-get.8.xml:401
msgid ""
"Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
"non-interactively. If an undesirable situation, such as changing a held "
@@ -4074,45 +4303,45 @@ msgid ""
"essential package occurs then <literal>apt-get</literal> will abort. "
"Configuration Item: <literal>APT::Get::Assume-Yes</literal>."
msgstr ""
-"Répondre automatiquement oui aux questions ; présume « oui » "
-"comme réponse à toutes les questions et s'exécute de manière non "
-"interactive. Dans le cas d'une situation indésirable, comme le changement "
-"d'un paquet gelé, l'installation d'un paquet non authentifié ou la "
-"suppression d'un paquet essentiel, <literal>apt-get</literal> s'interrompt. "
-"Élément de configuration : <literal>APT::Get::Assume-Yes</literal>."
+"Répondre automatiquement oui aux questions ; présume « oui » comme réponse à "
+"toutes les questions et s'exécute de manière non interactive. Dans le cas "
+"d'une situation indésirable, comme le changement d'un paquet gelé, "
+"l'installation d'un paquet non authentifié ou la suppression d'un paquet "
+"essentiel, <literal>apt-get</literal> s'interrompt. Élément de "
+"configuration : <literal>APT::Get::Assume-Yes</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:388
+#: apt-get.8.xml:408
msgid "<option>-u</option>"
msgstr "<option>-u</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:388
+#: apt-get.8.xml:408
msgid "<option>--show-upgraded</option>"
msgstr "<option>--show-upgraded</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:389
+#: apt-get.8.xml:409
msgid ""
"Show upgraded packages; Print out a list of all packages that are to be "
"upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
msgstr ""
-"Afficher les paquets mis à niveau ; affiche une liste de tous les "
-"paquets à mettre à niveau. Élément de configuration : <literal>APT::"
-"Get::Show-Upgraded</literal>."
+"Afficher les paquets mis à niveau ; affiche une liste de tous les paquets à "
+"mettre à niveau. Élément de configuration : <literal>APT::Get::Show-"
+"Upgraded</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:394
+#: apt-get.8.xml:414
msgid "<option>-V</option>"
msgstr "<option>-V</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:394
+#: apt-get.8.xml:414
msgid "<option>--verbose-versions</option>"
msgstr "<option>--verbose-versions</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:395
+#: apt-get.8.xml:415
msgid ""
"Show full versions for upgraded and installed packages. Configuration Item: "
"<literal>APT::Get::Show-Versions</literal>."
@@ -4121,22 +4350,22 @@ msgstr ""
"Élément de configuration : <literal>APT::Get::Show-Versions</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:399
+#: apt-get.8.xml:419
msgid "<option>-b</option>"
msgstr "<option>-b</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:399
+#: apt-get.8.xml:419
msgid "<option>--compile</option>"
msgstr "<option>--compile</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:400
+#: apt-get.8.xml:420
msgid "<option>--build</option>"
msgstr "<option>--build</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:401
+#: apt-get.8.xml:421
msgid ""
"Compile source packages after downloading them. Configuration Item: "
"<literal>APT::Get::Compile</literal>."
@@ -4145,27 +4374,27 @@ msgstr ""
"configuration : <literal>APT::Get::Compile</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:405
+#: apt-get.8.xml:425
msgid "<option>--install-recommends</option>"
msgstr "<option>--install-recommends</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:406
+#: apt-get.8.xml:426
msgid "Also install recommended packages."
msgstr "Installer également les paquets recommandés."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:410
+#: apt-get.8.xml:430
msgid "Do not install recommended packages."
msgstr "Ne pas installer les paquets recommandés."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:413
+#: apt-get.8.xml:433
msgid "<option>--ignore-hold</option>"
msgstr "<option>--ignore-hold</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:414
+#: apt-get.8.xml:434
msgid ""
"Ignore package Holds; This causes <command>apt-get</command> to ignore a "
"hold placed on a package. This may be useful in conjunction with "
@@ -4173,18 +4402,18 @@ msgid ""
"holds. Configuration Item: <literal>APT::Ignore-Hold</literal>."
msgstr ""
"Cette commande ignore la marque « Hold » (« garder ») d'un paquet ; par ce "
-"biais, <command>apt-get</command> ignore un « hold » placé sur un "
-"paquet. cela peut être utile avec <literal>dist-upgrade</literal> pour "
-"annuler un grand nombre de « hold » indésirables. Élément de "
-"configuration : <literal>APT::Ignore-Hold</literal>."
+"biais, <command>apt-get</command> ignore un « hold » placé sur un paquet. "
+"cela peut être utile avec <literal>dist-upgrade</literal> pour annuler un "
+"grand nombre de « hold » indésirables. Élément de configuration : "
+"<literal>APT::Ignore-Hold</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:420
+#: apt-get.8.xml:440
msgid "<option>--no-upgrade</option>"
msgstr "<option>--no-upgrade</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:421
+#: apt-get.8.xml:441
msgid ""
"Do not upgrade packages; When used in conjunction with <literal>install</"
"literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -4192,17 +4421,17 @@ msgid ""
"<literal>APT::Get::Upgrade</literal>."
msgstr ""
"Aucune mise à niveau ; quand elle est utilisée avec <literal>install</"
-"literal>, cette commande empêche les paquets mentionnés sur la ligne de commande "
-"d'être mis à niveau. Élément de configuration : <literal>APT::Get::"
+"literal>, cette commande empêche les paquets mentionnés sur la ligne de "
+"commande d'être mis à niveau. Élément de configuration : <literal>APT::Get::"
"Upgrade</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:427
+#: apt-get.8.xml:447
msgid "<option>--force-yes</option>"
msgstr "<option>--force-yes</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:428
+#: apt-get.8.xml:448
msgid ""
"Force yes; This is a dangerous option that will cause apt to continue "
"without prompting if it is doing something potentially harmful. It should "
@@ -4210,20 +4439,20 @@ msgid ""
"literal> can potentially destroy your system! Configuration Item: "
"<literal>APT::Get::force-yes</literal>."
msgstr ""
-"Forcer l'acceptation ; cette option est dangereuse parce qu'elle laisse "
-"APT continuer sans poser de questions quand il réalise quelque chose de "
+"Forcer l'acceptation ; cette option est dangereuse parce qu'elle laisse APT "
+"continuer sans poser de questions quand il réalise quelque chose de "
"potentiellement dommageable. Cette option ne doit être utilisée que dans des "
"circonstances très spéciales. Utiliser <literal>force-yes</literal> peut "
-"détruire le système... Élément de configuration : <literal>APT::"
-"Get::force-yes</literal>."
+"détruire le système... Élément de configuration : <literal>APT::Get::force-"
+"yes</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:435
+#: apt-get.8.xml:455
msgid "<option>--print-uris</option>"
msgstr "<option>--print-uris</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:436
+#: apt-get.8.xml:456
msgid ""
"Instead of fetching the files to install their URIs are printed. Each URI "
"will have the path, the destination file name, the size and the expected md5 "
@@ -4236,38 +4465,38 @@ msgid ""
msgstr ""
"Au lieu de récupérer les paquets à installer, leurs URI sont affichées. "
"Chaque URI a un chemin, un nom de fichier destination, une taille et une clé "
-"md5 attendue. Veuillez noter que le nom de fichier à afficher ne correspond pas "
-"toujours au nom de fichier sur le site distant. Cette option "
-"fonctionne aussi avec la commande <literal>source</literal> et avec la "
-"commande <literal>update</literal>. Avec la commande <literal>update</"
-"literal>, la somme MD5 et la taille ne sont pas données et c'est à "
-"l'utilisateur de décompresser les fichiers compressés. Élément de "
-"configuration : <literal>APT::Get::Print-URIs</literal>."
+"md5 attendue. Veuillez noter que le nom de fichier à afficher ne correspond "
+"pas toujours au nom de fichier sur le site distant. Cette option fonctionne "
+"aussi avec la commande <literal>source</literal> et avec la commande "
+"<literal>update</literal>. Avec la commande <literal>update</literal>, la "
+"somme MD5 et la taille ne sont pas données et c'est à l'utilisateur de "
+"décompresser les fichiers compressés. Élément de configuration : "
+"<literal>APT::Get::Print-URIs</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:446
+#: apt-get.8.xml:466
msgid "<option>--purge</option>"
msgstr "<option>--purge</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:447
+#: apt-get.8.xml:467
msgid ""
"Use purge instead of remove for anything that would be removed. An asterisk "
"(\"*\") will be displayed next to packages which are scheduled to be purged. "
"<option>remove --purge</option> is equivalent for <option>purge</option> "
"command. Configuration Item: <literal>APT::Get::Purge</literal>."
msgstr ""
-"Utiliser « purge » à la place de « remove » pour supprimer tout ce qui peut être "
-"supprimé. Une astérisque (*) sera affichée près des paquets qui vont être "
-"purgés. Élément de configuration : <literal>APT::Get::Purge</literal>."
+"Utiliser « purge » à la place de « remove » pour supprimer tout ce qui peut "
+"être supprimé. Une astérisque (*) sera affichée près des paquets qui vont "
+"être purgés. Élément de configuration : <literal>APT::Get::Purge</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:454
+#: apt-get.8.xml:474
msgid "<option>--reinstall</option>"
msgstr "<option>--reinstall</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:455
+#: apt-get.8.xml:475
msgid ""
"Re-Install packages that are already installed and at the newest version. "
"Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -4276,12 +4505,12 @@ msgstr ""
"Élément de configuration : <literal>APT::Get::ReInstall</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:459
+#: apt-get.8.xml:479
msgid "<option>--list-cleanup</option>"
msgstr "<option>--list-cleanup</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:460
+#: apt-get.8.xml:480
msgid ""
"This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
"it off. When on <command>apt-get</command> will automatically manage the "
@@ -4290,26 +4519,26 @@ msgid ""
"change your source list. Configuration Item: <literal>APT::Get::List-"
"Cleanup</literal>."
msgstr ""
-"Cette option est activée par défaut ; utilisez <literal>--no-list-"
-"cleanup</literal> pour la désactiver. Quand elle est activée, <command>apt-"
-"get</command> gère automatiquement le contenu de <filename>&statedir;/lists</"
+"Cette option est activée par défaut ; utilisez <literal>--no-list-cleanup</"
+"literal> pour la désactiver. Quand elle est activée, <command>apt-get</"
+"command> gère automatiquement le contenu de <filename>&statedir;/lists</"
"filename> afin d'assurer que les fichiers obsolètes soient effacés. La seule "
"raison de la désactiver est une modification fréquente de la liste de "
"sources. Élément de configuration : <literal>APT::Get::List-Cleanup</"
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:469
+#: apt-get.8.xml:489
msgid "<option>--target-release</option>"
msgstr "<option>--target-release</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:470
+#: apt-get.8.xml:490
msgid "<option>--default-release</option>"
msgstr "<option>--default-release</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:471
+#: apt-get.8.xml:491
msgid ""
"This option controls the default input to the policy engine, it creates a "
"default pin at priority 990 using the specified release string. This "
@@ -4322,72 +4551,73 @@ msgid ""
"also the &apt-preferences; manual page."
msgstr ""
"Cette option contrôle l'entrée par défaut pour les questions de "
-"distribution ; une étiquette (pin) par défaut dont la priorité vaut 990 "
-"est créé en utilisant la chaîne spécifiée. Le fichier des préférences peut "
+"distribution ; une étiquette (pin) par défaut dont la priorité vaut 990 est "
+"créé en utilisant la chaîne spécifiée. Le fichier des préférences peut "
"annuler cette décision. En clair, cette option permet de contrôler "
"simplement dans quelle distribution seront récupérés les paquets. Par "
-"exemple : <option>-t '2.1*'</option>, <option>-t unstable</option> ou <option>-t sid</option>. "
-"Élément de configuration : <literal>APT::Default-Release</literal>. "
-"Voyez aussi la page de manuel d'&apt-preferences;."
+"exemple : <option>-t '2.1*'</option>, <option>-t unstable</option> ou "
+"<option>-t sid</option>. Élément de configuration : <literal>APT::Default-"
+"Release</literal>. Voyez aussi la page de manuel d'&apt-preferences;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:484
+#: apt-get.8.xml:504
msgid "<option>--trivial-only</option>"
msgstr "<option>--trivial-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:486
+#: apt-get.8.xml:506
msgid ""
"Only perform operations that are 'trivial'. Logically this can be considered "
"related to <option>--assume-yes</option>, where <option>--assume-yes</"
"option> will answer yes to any prompt, <option>--trivial-only</option> will "
"answer no. Configuration Item: <literal>APT::Get::Trivial-Only</literal>."
msgstr ""
-"Ne réalise que les opérations « triviales ». Logiquement ceci peut "
-"être considéré comme relatif à <option>--assume-yes</option>. Alors que "
-"<option>--assume-yes</option> répond oui à n'importe quelle question, "
-"<option>--trivial-only</option> répond non. Élément de configuration : "
-"<literal>APT::Get::Trivial-Only</literal>."
+"Ne réalise que les opérations « triviales ». Logiquement ceci peut être "
+"considéré comme relatif à <option>--assume-yes</option>. Alors que <option>--"
+"assume-yes</option> répond oui à n'importe quelle question, <option>--"
+"trivial-only</option> répond non. Élément de configuration : <literal>APT::"
+"Get::Trivial-Only</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:492
+#: apt-get.8.xml:512
msgid "<option>--no-remove</option>"
msgstr "<option>--no-remove</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:493
+#: apt-get.8.xml:513
msgid ""
"If any packages are to be removed apt-get immediately aborts without "
"prompting. Configuration Item: <literal>APT::Get::Remove</literal>."
msgstr ""
-"Arrêter immédiatement apt-get, sans poser de questions, si des paquets doivent être supprimés. Élément de configuration : <literal>APT::Get::"
+"Arrêter immédiatement apt-get, sans poser de questions, si des paquets "
+"doivent être supprimés. Élément de configuration : <literal>APT::Get::"
"Remove</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:498
+#: apt-get.8.xml:518
msgid "<option>--auto-remove</option>"
msgstr "<option>--auto-remove</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:499
+#: apt-get.8.xml:519
msgid ""
"If the command is either <literal>install</literal> or <literal>remove</"
"literal>, then this option acts like running <literal>autoremove</literal> "
"command, removing the unused dependency packages. Configuration Item: "
"<literal>APT::Get::AutomaticRemove</literal>."
msgstr ""
-"Si la commande utilisée est soit <literal>install</literal> soit <literal>remove</"
-"literal>, cette option a le même effet qu'<literal>autoremove</literal> et supprime les paquets de dépendance inutilisés. Élément de "
-"configuration : <literal>APT::Get::"
-"Upgrade</literal>."
+"Si la commande utilisée est soit <literal>install</literal> soit "
+"<literal>remove</literal>, cette option a le même effet "
+"qu'<literal>autoremove</literal> et supprime les paquets de dépendance "
+"inutilisés. Élément de configuration : <literal>APT::Get::Upgrade</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:505
+#: apt-get.8.xml:525
msgid "<option>--only-source</option>"
msgstr "<option>--only-source</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:506
+#: apt-get.8.xml:526
msgid ""
"Only has meaning for the <literal>source</literal> and <literal>build-dep</"
"literal> commands. Indicates that the given source names are not to be "
@@ -4403,152 +4633,88 @@ msgstr ""
"que si cette option est choisie, la commande <literal>source</literal> "
"acceptera seulement des noms de paquets source comme argument ; elle "
"n'acceptera pas de les rechercher à partir des noms de paquets binaires "
-"correspondants. Élément de configuration : <literal>APT::Get::Only-"
-"Source</literal>"
+"correspondants. Élément de configuration : <literal>APT::Get::Only-Source</"
+"literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:516
+#: apt-get.8.xml:536
msgid "<option>--diff-only</option>"
msgstr "<option>--diff-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:516
+#: apt-get.8.xml:536
msgid "<option>--dsc-only</option>"
msgstr "<option>--dsc-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:516
+#: apt-get.8.xml:536
msgid "<option>--tar-only</option>"
msgstr "<option>--tar-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:517
+#: apt-get.8.xml:537
msgid ""
"Download only the diff, dsc, or tar file of a source archive. Configuration "
"Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
"literal>, and <literal>APT::Get::Tar-Only</literal>."
msgstr ""
-"Ne télécharger que le fichier .diff, .dsc ou .tar d'une archive source. Élément de configuration : <literal>APT::Get::Diff-Only</literal>, <literal>"
-"APT::Get::Dsc-Only</literal> et <literal>APT::Get::Tar-Only</literal>, "
+"Ne télécharger que le fichier .diff, .dsc ou .tar d'une archive source. "
+"Élément de configuration : <literal>APT::Get::Diff-Only</literal>, "
+"<literal>APT::Get::Dsc-Only</literal> et <literal>APT::Get::Tar-Only</"
+"literal>, "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:522
+#: apt-get.8.xml:542
msgid "<option>--arch-only</option>"
msgstr "<option>--arch-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:523
+#: apt-get.8.xml:543
msgid ""
"Only process architecture-dependent build-dependencies. Configuration Item: "
"<literal>APT::Get::Arch-Only</literal>."
msgstr ""
-"Ne traiter que les dépendances de construction dépendantes de l'architecture. Élément de configuration : <literal>APT::Get::Arch-Only</literal>."
+"Ne traiter que les dépendances de construction dépendantes de "
+"l'architecture. Élément de configuration : <literal>APT::Get::Arch-Only</"
+"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:527
+#: apt-get.8.xml:547
msgid "<option>--allow-unauthenticated</option>"
msgstr "<option>--allow-unauthenticated</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:528
+#: apt-get.8.xml:548
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
"is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::"
"AllowUnauthenticated</literal>."
msgstr ""
"Ignorer le fait que les paquets ne peuvent pas être authentifiés ; pas "
-"d'interrogation de l'utilisateur. Cette option est très utile pour certains outils "
-"comme pbuilder. Élément de configuration : <literal>APT::Get::"
+"d'interrogation de l'utilisateur. Cette option est très utile pour certains "
+"outils comme pbuilder. Élément de configuration : <literal>APT::Get::"
"AllowUnauthenticated</literal>."
-#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:546 apt.conf.5.xml:825
-msgid "<filename>/etc/apt/apt.conf</filename>"
-msgstr "<filename>/etc/apt/apt.conf</filename>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:547
-msgid ""
-"APT configuration file. Configuration Item: <literal>Dir::Etc::Main</"
-"literal>."
-msgstr ""
-"Fichier de configuration d'APT. Élément de configuration : "
-"<literal>Dir::Etc::Main</literal>."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:551
-msgid "<filename>/etc/apt/apt.conf.d/</filename>"
-msgstr "<filename>/etc/apt/apt.conf.d/</filename>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:552
-msgid ""
-"APT configuration file fragments. Configuration Item: <literal>Dir::Etc::"
-"Parts</literal>."
-msgstr ""
-"Éléments du fichier de configuration d'APT. Élément de configuration : "
-"<literal>Dir::Etc::Parts</literal>."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:556
-msgid "<filename>/etc/apt/preferences</filename>"
-msgstr "<filename>/etc/apt/preferences</filename>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:557
-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>."
-msgstr ""
-"Fichier des préférences. C'est dans ce fichier qu'on peut faire de "
-"l'étiquetage (pinning) c'est-à-dire, choisir d'obtenir des paquets d'une "
-"source distincte ou d'une distribution différente. Élément de "
-"configuration : <literal>Dir::Etc::Preferences</literal>."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:565
-msgid "<filename>&cachedir;/archives/</filename>"
-msgstr "<filename>&cachedir;/archives/</filename>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:566
-msgid ""
-"Storage area for retrieved package files. Configuration Item: <literal>Dir::"
-"Cache::Archives</literal>."
-msgstr ""
-"Zone de stockage pour les paquets récupérés. Élément de "
-"configuration : <literal>Dir::Cache::Archives</literal>."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:570
-msgid "<filename>&cachedir;/archives/partial/</filename>"
-msgstr "<filename>&cachedir;/archives/partial/</filename>"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:571
+#. type: Content of: <refentry><refsect1><variablelist>
+#: apt-get.8.xml:561
msgid ""
-"Storage area for package files in transit. Configuration Item: "
-"<literal>Dir::Cache::Archives</literal> (implicit partial)."
+"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
+"&file-statelists;"
msgstr ""
-"Zone de stockage pour les paquets en transit. Élément de "
-"configuration : <literal>Dir::Cache::Archives</literal> (implicitement, "
-"partial)."
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:589
+#: apt-get.8.xml:570
msgid ""
"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
"preferences;, the APT Howto."
msgstr ""
"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
-"&apt-config;, le guide d'APT dans &guidesdir;, &apt-"
-"preferences;, le « HOWTO » d'APT."
+"&apt-config;, le guide d'APT dans &guidesdir;, &apt-preferences;, le "
+"« HOWTO » d'APT."
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:595
+#: apt-get.8.xml:576
msgid ""
"<command>apt-get</command> returns zero on normal operation, decimal 100 on "
"error."
@@ -4557,37 +4723,37 @@ msgstr ""
"décimal 100 en cas d'erreur."
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:598
+#: apt-get.8.xml:579
msgid "ORIGINAL AUTHORS"
msgstr "AUTEURS D'ORIGINE"
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:599
+#: apt-get.8.xml:580
msgid "&apt-author.jgunthorpe;"
msgstr "&apt-author.jgunthorpe;"
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:602
+#: apt-get.8.xml:583
msgid "CURRENT AUTHORS"
msgstr "AUTEURS ACTUELS"
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:604
+#: apt-get.8.xml:585
msgid "&apt-author.team;"
msgstr "&apt-author.team;"
#. type: Content of: <refentry><refnamediv><refname>
-#: apt-key.8.xml:14 apt-key.8.xml:20
+#: apt-key.8.xml:14 apt-key.8.xml:21
msgid "apt-key"
msgstr "apt-key"
#. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-key.8.xml:21
+#: apt-key.8.xml:22
msgid "APT key management utility"
msgstr "Utilitaire de gestion des clés d'APT"
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-key.8.xml:27
+#: apt-key.8.xml:28
msgid ""
"<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> "
"<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></"
@@ -4598,7 +4764,7 @@ msgstr ""
"arg>"
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:35
+#: apt-key.8.xml:36
msgid ""
"<command>apt-key</command> is used to manage the list of keys used by apt to "
"authenticate packages. Packages which have been authenticated using these "
@@ -4608,17 +4774,17 @@ msgstr ""
"les paquets. Les paquets authentifiés par ces clés seront réputés fiables."
#. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:41
+#: apt-key.8.xml:42
msgid "Commands"
msgstr "Commandes"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:43
+#: apt-key.8.xml:44
msgid "add <replaceable>filename</replaceable>"
msgstr "add <replaceable>fichier</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:47
+#: apt-key.8.xml:48
msgid ""
"Add a new key to the list of trusted keys. The key is read from "
"<replaceable>filename</replaceable>, or standard input if "
@@ -4629,69 +4795,71 @@ msgstr ""
"<replaceable>fichier</replaceable> est <literal>-</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:55
+#: apt-key.8.xml:56
msgid "del <replaceable>keyid</replaceable>"
msgstr "del <replaceable>clé</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:59
+#: apt-key.8.xml:60
msgid "Remove a key from the list of trusted keys."
msgstr "Supprimer une clé de la liste des clés fiables."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:66
+#: apt-key.8.xml:67
msgid "export <replaceable>keyid</replaceable>"
msgstr "del <replaceable>clé</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:70
+#: apt-key.8.xml:71
msgid "Output the key <replaceable>keyid</replaceable> to standard output."
msgstr "Afficher la clé <replaceable>clé</replaceable> sur la sortie standard."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:77
+#: apt-key.8.xml:78
msgid "exportall"
msgstr "exportall"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:81
+#: apt-key.8.xml:82
msgid "Output all trusted keys to standard output."
msgstr "Affichier toutes les clés fiables sur la sortie standard."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:88
+#: apt-key.8.xml:89
msgid "list"
msgstr "list"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:92
+#: apt-key.8.xml:93
msgid "List trusted keys."
msgstr "Afficher la liste des clés fiables."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:99
+#: apt-key.8.xml:100
msgid "finger"
msgstr "finger"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:103
+#: apt-key.8.xml:104
msgid "List fingerprints of trusted keys."
msgstr "Afficher les empreintes des clés fiables."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:110
+#: apt-key.8.xml:111
msgid "adv"
msgstr "adv"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:114
+#: apt-key.8.xml:115
msgid ""
"Pass advanced options to gpg. With adv --recv-key you can download the "
"public key."
-msgstr "Passer des opétions avancées à gpg. Avec la commande adv --recv-key, il est possible de télécharger une clé publique."
+msgstr ""
+"Passer des opétions avancées à gpg. Avec la commande adv --recv-key, il est "
+"possible de télécharger une clé publique."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:126
+#: apt-key.8.xml:127
msgid ""
"Update the local keyring with the keyring of Debian archive keys and removes "
"from the keyring the archive keys which are no longer valid."
@@ -4700,77 +4868,92 @@ msgstr ""
"l'archive Debian et supprimer les clés qui y sont périmées."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:139
+#: apt-key.8.xml:140
msgid "<filename>/etc/apt/trusted.gpg</filename>"
msgstr "<filename>/etc/apt/trusted.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:140
+#: apt-key.8.xml:141
msgid "Keyring of local trusted keys, new keys will be added here."
-msgstr "Trousseau de clés locales fiables : les nouvelles clés y seront ajoutées."
+msgstr ""
+"Trousseau de clés locales fiables : les nouvelles clés y seront ajoutées."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:143
+#: apt-key.8.xml:144
msgid "<filename>/etc/apt/trustdb.gpg</filename>"
msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:144
+#: apt-key.8.xml:145
msgid "Local trust database of archive keys."
msgstr "Base de données locale de fiabilité des clés de l'archive."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:147
+#: apt-key.8.xml:148
msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:148
+#: apt-key.8.xml:149
msgid "Keyring of Debian archive trusted keys."
msgstr "Trousseau des clés fiables de l'archive Debian."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:151
-msgid "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
-msgstr "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+#: apt-key.8.xml:152
+msgid ""
+"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+msgstr ""
+"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:152
+#: apt-key.8.xml:153
msgid "Keyring of Debian archive removed trusted keys."
msgstr "Trousseau des clés fiables supprimées de l'archive Debian."
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:163
+#: apt-key.8.xml:164
msgid "&apt-get;, &apt-secure;"
msgstr "&apt-get;, &apt-secure;"
-#. The last update date
+#. The last update date
#. 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>2 "
-"November 2007</date>"
+"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
+"August 2009</date>"
msgstr ""
"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>2 "
"Novembre 2007</date>"
#. type: Content of: <refentry><refnamediv><refname>
-#: apt-mark.8.xml:22 apt-mark.8.xml:28
+#: apt-mark.8.xml:22 apt-mark.8.xml:29
msgid "apt-mark"
msgstr "apt-mark"
#. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-mark.8.xml:29
+#: apt-mark.8.xml:30
msgid "mark/unmark a package as being automatically-installed"
msgstr "marquer/démarquer un paquet comme ayant été installé automatiquement"
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-mark.8.xml:35
-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>"
+#: 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"
+"\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
+"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg "
+"choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
+"arg> <arg choice=\"plain\">showauto</arg> </group>"
msgstr ""
"<command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
"f=<replaceable>FICHIER</replaceable></option></arg> <group choice=\"req"
@@ -4778,126 +4961,196 @@ msgstr ""
"rep=\"repeat\"><replaceable>paquet</replaceable></arg>"
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:44
+#: apt-mark.8.xml:53
msgid ""
"<command>apt-mark</command> will change whether a package has been marked as "
"being automatically installed."
-msgstr "<command>apt-mark</command> changera l'indication selon laquelle un paquet a été automatiquement installé."
+msgstr ""
+"<command>apt-mark</command> changera l'indication selon laquelle un paquet a "
+"été automatiquement installé."
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:48
+#: 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 "
"being automatically installed. Once these automatically installed packages "
"are no longer depended on by any manually installed packages, they will be "
-"removed."
+"removed by e.g. <command>apt-get</command> or <command>aptitude</command>."
msgstr ""
-"Lorsque l'installation d'un paquet est demandée et que d'autres paquets dont il dépend sont installés, ces paquets sont marqués comme ayant été "
-"automatiquement installés. De tels paquets sont supprimés dès que plus aucun paquet, installé manuellement, qui dépend d'eux ne subsiste sur le "
-"système."
+"Lorsque l'installation d'un paquet est demandée et que d'autres paquets dont "
+"il dépend sont installés, ces paquets sont marqués comme ayant été "
+"automatiquement installés. De tels paquets sont supprimés dès que plus aucun "
+"paquet, installé manuellement, qui dépend d'eux ne subsiste sur le système."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:55
+#: apt-mark.8.xml:65
msgid "markauto"
msgstr "markauto"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:56
+#: apt-mark.8.xml:66
msgid ""
"<literal>markauto</literal> is used to mark a package as being automatically "
"installed, which will cause the package to be removed when no more manually "
"installed packages depend on this package."
msgstr ""
-"<literal>markauto</literal> permet de marquer un paquet comme ayant été installé automatiquement. Un tel paquet sera supprimé automatiquement dès "
+"<literal>markauto</literal> permet de marquer un paquet comme ayant été "
+"installé automatiquement. Un tel paquet sera supprimé automatiquement dès "
"que plus aucun paquet installé manuellement ne dépend de lui."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:63
+#: apt-mark.8.xml:73
msgid "unmarkauto"
msgstr "unmarkauto"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:64
+#: apt-mark.8.xml:74
msgid ""
"<literal>unmarkauto</literal> is used to mark a package as being manually "
"installed, which will prevent the package from being automatically removed "
"if no other packages depend on it."
msgstr ""
-"<literal>unmarkauto</literal> permet de marquer un paquet comme installé manuellement. Un tel paquet ne sera pas supprimé automatiquement, même si "
+"<literal>unmarkauto</literal> permet de marquer un paquet comme installé "
+"manuellement. Un tel paquet ne sera pas supprimé automatiquement, même si "
"aucun autre paquet n'en dépend."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:76
-msgid "<option>-f=<filename>FILENAME</filename></option>"
+#: apt-mark.8.xml:81
+msgid "showauto"
+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 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 "
+"ne sont plus nécessaires."
+
+#. 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>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:76
-msgid "<option>--file=<filename>FILENAME</filename></option>"
+#: apt-mark.8.xml:94
+#, fuzzy
+#| msgid "<option>--file=<filename>FILENAME</filename></option>"
+msgid ""
+"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
+"option>"
msgstr "<option>--file=<filename>FICHIER</filename></option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:79
+#: 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>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>."
+"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
+"filename> instead of the default location, which is "
+"<filename>extended_status</filename> in the directory defined by the "
+"Configuration Item: <literal>Dir::State</literal>."
msgstr ""
-"Lire/écrire les statistiques sur les paquets depuis <filename>FICHIER</filename> au lieu de l'emplacement par défaut (<filename>extended_status<"
-"/filename> dans le répertoire défini par l'option de configuration <literal>Dir::State</literal>."
+"Lire/écrire les statistiques sur les paquets depuis <filename>FICHIER</"
+"filename> au lieu de l'emplacement par défaut (<filename>extended_status</"
+"filename> dans le répertoire défini par l'option de configuration "
+"<literal>Dir::State</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:85
+#: apt-mark.8.xml:103
msgid "<option>-h</option>"
msgstr "<option>-h</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:86
+#: apt-mark.8.xml:104
msgid "<option>--help</option>"
msgstr "<option>--help</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:87
+#: apt-mark.8.xml:105
msgid "Show a short usage summary."
msgstr "Affiche un résumé de la méthode d'utilisation"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:93
+#: apt-mark.8.xml:111
msgid "<option>-v</option>"
msgstr "<option>-v</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:94
+#: apt-mark.8.xml:112
msgid "<option>--version</option>"
msgstr "<option>--version</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:95
+#: apt-mark.8.xml:113
msgid "Show the program version."
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>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:125
+msgid ""
+"Status list of auto-installed packages. Configuration Item: <literal>Dir::"
+"State</literal> sets the path to the <filename>extended_states</filename> "
+"file."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:109
+#: apt-mark.8.xml:134
+#, fuzzy
+#| msgid "&apt-cache; &apt-conf;"
+msgid "&apt-get;,&aptitude;,&apt-conf;"
+msgstr "&apt-cache; &apt-conf;"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-mark.8.xml:138
msgid ""
"<command>apt-mark</command> returns zero on normal operation, non-zero on "
"error."
msgstr ""
-"<command>apt-mark</command> retourne zéro après un déroulement normal, et "
-"le nombre décimal 100 en cas d'erreur."
+"<command>apt-mark</command> retourne zéro après un déroulement normal, et le "
+"nombre décimal 100 en cas d'erreur."
#. type: Content of: <refentry><refnamediv><refname>
-#: apt-secure.8.xml:14 apt-secure.8.xml:35
+#: apt-secure.8.xml:14 apt-secure.8.xml:36
msgid "apt-secure"
msgstr "apt-secure"
#. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-secure.8.xml:36
+#: apt-secure.8.xml:37
msgid "Archive authentication support for APT"
msgstr "Gestion de l'authentification d'archive avec APT"
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:41
+#: apt-secure.8.xml:42
msgid ""
"Starting with version 0.6, <command>apt</command> contains code that does "
"signature checking of the Release file for all archives. This ensures that "
@@ -4910,7 +5163,7 @@ msgstr ""
"la clé de la signature du fichier Release."
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:49
+#: apt-secure.8.xml:50
msgid ""
"If a package comes from a archive without a signature or with a signature "
"that apt does not have a key for that package is considered untrusted and "
@@ -4926,7 +5179,7 @@ msgstr ""
"vérification des sources avant tout téléchargement de paquet."
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:58
+#: apt-secure.8.xml:59
msgid ""
"The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
"authentication feature."
@@ -4935,12 +5188,12 @@ msgstr ""
"fonction de certification."
#. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:63
+#: apt-secure.8.xml:64
msgid "Trusted archives"
msgstr "Trusted archives"
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:66
+#: apt-secure.8.xml:67
msgid ""
"The chain of trust from an apt archive to the end user is made up of "
"different steps. <command>apt-secure</command> is the last step in this "
@@ -4957,7 +5210,7 @@ msgstr ""
"en sorte que l'archive soit fiable."
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:74
+#: apt-secure.8.xml:75
msgid ""
"apt-secure does not review signatures at a package level. If you require "
"tools to do this you should look at <command>debsig-verify</command> and "
@@ -4970,7 +5223,7 @@ msgstr ""
"verify et devscripts."
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:81
+#: apt-secure.8.xml:82
msgid ""
"The chain of trust in Debian starts when a maintainer uploads a new package "
"or a new version of a package to the Debian archive. This upload in order to "
@@ -4979,16 +5232,16 @@ msgid ""
"Maintainer's keys are signed by other maintainers following pre-established "
"procedures to ensure the identity of the key holder."
msgstr ""
-"La chaîne de confiance dans Debian commence quand un responsable de paquet envoie "
-"un nouveau paquet ou une nouvelle version d'un paquet dans l'archive. Cet "
-"envoi, pour être effectif, doit être signé avec la clé d'un responsable qui "
-"se trouve dans le trousseau des responsables Debian (disponible dans le "
+"La chaîne de confiance dans Debian commence quand un responsable de paquet "
+"envoie un nouveau paquet ou une nouvelle version d'un paquet dans l'archive. "
+"Cet envoi, pour être effectif, doit être signé avec la clé d'un responsable "
+"qui se trouve dans le trousseau des responsables Debian (disponible dans le "
"paquet debian-keyring). Les clés des responsables de paquet sont signées par "
"d'autres responsables, suivant des procédures préétablies pour s'assurer de "
"l'identité des propriétaires de la clé."
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:91
+#: apt-secure.8.xml:92
msgid ""
"Once the uploaded package is verified and included in the archive, the "
"maintainer signature is stripped off, an MD5 sum of the package is computed "
@@ -5005,7 +5258,7 @@ msgstr ""
"aussi dans le trousseau Debian."
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:101
+#: apt-secure.8.xml:102
msgid ""
"Any end user can check the signature of the Release file, extract the MD5 "
"sum of a package from it and compare it with the MD5 sum of the package he "
@@ -5019,7 +5272,7 @@ msgstr ""
"vérifiée. Maintenant on peut vérifier aussi la signature du fichier Release."
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:108
+#: apt-secure.8.xml:109
msgid ""
"Notice that this is distinct from checking signatures on a per package "
"basis. It is designed to prevent two possible attacks:"
@@ -5028,7 +5281,7 @@ msgstr ""
"paquet. Elle vise à empêcher deux types d'attaque possibles :"
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:113
+#: apt-secure.8.xml:114
msgid ""
"<literal>Network \"man in the middle\" attacks</literal>. Without signature "
"checking, a malicious agent can introduce himself in the package download "
@@ -5036,27 +5289,27 @@ msgid ""
"element (router, switch, etc.) or by redirecting traffic to a rogue server "
"(through arp or DNS spoofing attacks)."
msgstr ""
-"<literal>Attaque réseau de type <quote>homme au milieu</quote></literal>. Sans vérification de "
-"signature, quelqu'un de malveillant peut s'introduire au milieu du processus "
-"de téléchargement et insérer du code soit en contrôlant un élément du "
-"réseau, routeur, commutateur, etc. soit en détournant le trafic vers un "
-"serveur fourbe (par usurpation d'adresses)."
+"<literal>Attaque réseau de type <quote>homme au milieu</quote></literal>. "
+"Sans vérification de signature, quelqu'un de malveillant peut s'introduire "
+"au milieu du processus de téléchargement et insérer du code soit en "
+"contrôlant un élément du réseau, routeur, commutateur, etc. soit en "
+"détournant le trafic vers un serveur fourbe (par usurpation d'adresses)."
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:121
+#: apt-secure.8.xml:122
msgid ""
"<literal>Mirror network compromise</literal>. Without signature checking, a "
"malicious agent can compromise a mirror host and modify the files in it to "
"propagate malicious software to all users downloading packages from that "
"host."
msgstr ""
-"<literal>Attaque par compromission d'un miroir sur le réseau</literal>. Sans vérification de "
-"signature, quelqu'un de malveillant peut compromettre un miroir et modifier "
-"les fichiers. Ainsi tous ceux qui téléchargent les paquets de ce miroir "
-"propagent du code malveillant."
+"<literal>Attaque par compromission d'un miroir sur le réseau</literal>. "
+"Sans vérification de signature, quelqu'un de malveillant peut compromettre "
+"un miroir et modifier les fichiers. Ainsi tous ceux qui téléchargent les "
+"paquets de ce miroir propagent du code malveillant."
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:128
+#: apt-secure.8.xml:129
msgid ""
"However, it does not defend against a compromise of the Debian master server "
"itself (which signs the packages) or against a compromise of the key used to "
@@ -5069,12 +5322,12 @@ msgstr ""
"signature des paquets."
#. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:134
+#: apt-secure.8.xml:135
msgid "User configuration"
msgstr "Configuration utilisateur"
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:136
+#: apt-secure.8.xml:137
msgid ""
"<command>apt-key</command> is the program that manages the list of keys used "
"by apt. It can be used to add or remove keys although an installation of "
@@ -5087,7 +5340,7 @@ msgstr ""
"Debian et les différents répertoires de paquets."
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:143
+#: apt-secure.8.xml:144
msgid ""
"In order to add a new key you need to first download it (you should make "
"sure you are using a trusted communication channel when retrieving it), add "
@@ -5102,12 +5355,12 @@ msgstr ""
"<filename>Release.gpg</filename> de l'archive que vous avez configurée."
#. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:152
+#: apt-secure.8.xml:153
msgid "Archive configuration"
msgstr "Configuration d'une archive"
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:154
+#: apt-secure.8.xml:155
msgid ""
"If you want to provide archive signatures in an archive under your "
"maintenance you have to:"
@@ -5116,38 +5369,38 @@ msgstr ""
"devez :"
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:159
+#: apt-secure.8.xml:160
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)."
msgstr ""
-"<literal>créer un fichier Release à la racine de l'archive</literal>, s'il n'existe pas déjà. "
-"Vous pouvez le créer avec la commande <command>apt-ftparchive release</"
-"command> (fournie dans le paquet apt-utils) ;"
+"<literal>créer un fichier Release à la racine de l'archive</literal>, s'il "
+"n'existe pas déjà. Vous pouvez le créer avec la commande <command>apt-"
+"ftparchive release</command> (fournie dans le paquet apt-utils) ;"
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:164
+#: apt-secure.8.xml:165
msgid ""
"<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> ;"
+"<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:167
+#: apt-secure.8.xml:168
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."
msgstr ""
-"<literal>publier l'empreinte de la clé</literal>. Ainsi les utilisateurs de votre archive "
-"connaîtront la clé qu'ils doivent importer pour authentifier les fichiers de "
-"l'archive."
+"<literal>publier l'empreinte de la clé</literal>. Ainsi les utilisateurs de "
+"votre archive connaîtront la clé qu'ils doivent importer pour authentifier "
+"les fichiers de l'archive."
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:174
+#: apt-secure.8.xml:175
msgid ""
"Whenever the contents of the archive changes (new packages are added or "
"removed) the archive maintainer has to follow the first two steps previously "
@@ -5157,7 +5410,7 @@ msgstr ""
"les deux premières étapes."
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:182
+#: apt-secure.8.xml:183
msgid ""
"&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
"&debsign; &debsig-verify;, &gpg;"
@@ -5166,7 +5419,7 @@ msgstr ""
"&debsign; &debsig-verify;, &gpg;"
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:186
+#: apt-secure.8.xml:187
msgid ""
"For more background information you might want to review the <ulink url="
"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html"
@@ -5183,12 +5436,12 @@ msgstr ""
"Distribution HOWTO</ulink> par V. Alex Brennen."
#. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:199
+#: apt-secure.8.xml:200
msgid "Manpage Authors"
msgstr "Auteurs des pages de manuel"
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:201
+#: apt-secure.8.xml:202
msgid ""
"This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac "
"Jones, Colin Walters, Florian Weimer and Michael Vogt."
@@ -5197,17 +5450,17 @@ msgstr ""
"Peña, Isaac Jones, Colin Walters, Florian Weimer et Michael Vogt."
#. type: Content of: <refentry><refnamediv><refname>
-#: apt-sortpkgs.1.xml:22 apt-sortpkgs.1.xml:28
+#: apt-sortpkgs.1.xml:22 apt-sortpkgs.1.xml:29
msgid "apt-sortpkgs"
msgstr "apt-sortpkgs"
#. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-sortpkgs.1.xml:29
+#: apt-sortpkgs.1.xml:30
msgid "Utility to sort package index files"
msgstr "Outil de tri des index de paquets."
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-sortpkgs.1.xml:35
+#: apt-sortpkgs.1.xml:36
msgid ""
"<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
"<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
@@ -5220,7 +5473,7 @@ msgstr ""
"choice=\"plain\" rep=\"repeat\"><replaceable>fichier</replaceable></arg>"
#. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:44
+#: apt-sortpkgs.1.xml:45
msgid ""
"<command>apt-sortpkgs</command> will take an index file (Source index or "
"Package index) and sort the records so that they are ordered by the package "
@@ -5233,19 +5486,19 @@ msgstr ""
"internes."
#. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:50
+#: apt-sortpkgs.1.xml:51
msgid "All output is sent to stdout, the input must be a seekable file."
msgstr ""
"Le résultat est envoyé sur la sortie standard ; l'entrée doit être un "
"fichier analysable."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-sortpkgs.1.xml:57
+#: apt-sortpkgs.1.xml:58
msgid "<option>--source</option>"
msgstr "<option>--source</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-sortpkgs.1.xml:59
+#: apt-sortpkgs.1.xml:60
msgid ""
"Use Source index field ordering. Configuration Item: <literal>APT::"
"SortPkgs::Source</literal>."
@@ -5254,7 +5507,7 @@ msgstr ""
"configuration : <literal>APT::SortPkgs::Source</literal>."
#. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:73
+#: apt-sortpkgs.1.xml:74
msgid ""
"<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
"100 on error."
@@ -5262,22 +5515,28 @@ msgstr ""
"<command>apt-sortpkgs</command> retourne zéro si tout se passe bien ou 100 "
"en cas d'erreur."
-#. The last update date
+#. The last update date
#. 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 "
"Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; "
-"&apt-product; <date>10 December 2008</date>"
+"&apt-product; <date>18 September 2009</date>"
msgstr ""
"&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
-"firstname> <surname>Burrows</surname> <contrib>Documentation d'origine de Debug::*.</contrib> <email>dburrows@debian.org</email> </author> "
-"&apt-email; "
+"firstname> <surname>Burrows</surname> <contrib>Documentation d'origine de "
+"Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; "
"&apt-product; <date>10 décembre 2008</date>"
#. type: Content of: <refentry><refnamediv><refname>
-#: apt.conf.5.xml:28 apt.conf.5.xml:34
+#: apt.conf.5.xml:28 apt.conf.5.xml:35
msgid "apt.conf"
msgstr "apt.conf"
@@ -5287,12 +5546,12 @@ msgid "5"
msgstr "5"
#. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.conf.5.xml:35
+#: apt.conf.5.xml:36
msgid "Configuration file for APT"
msgstr "Fichier de configuration pour APT"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:39
+#: apt.conf.5.xml:40
msgid ""
"<filename>apt.conf</filename> is the main configuration file for the APT "
"suite of tools, all tools make use of the configuration file and a common "
@@ -5305,8 +5564,8 @@ msgid ""
"loading even more config files."
msgstr ""
"Le fichier <filename>apt.conf</filename> est le principal fichier de "
-"configuration de la collection d'outils que constitue APT ; tous les "
-"outils font appel à ce fichier de configuration et utilisent un analyseur "
+"configuration de la collection d'outils que constitue APT ; tous les outils "
+"font appel à ce fichier de configuration et utilisent un analyseur "
"syntaxique en ligne de commande commun afin de fournir un environnement "
"uniforme. Quand un outil d'APT démarre, il lit la configuration désignée par "
"variable d'environnement <envar>APT_CONFIG</envar> (si elle existe), puis il "
@@ -5317,7 +5576,7 @@ msgstr ""
"d'autres fichiers de configuration."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:49
+#: 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 "
@@ -5327,13 +5586,12 @@ msgid ""
msgstr ""
"Le fichier de configuration est construit comme un arbre d'options "
"organisées en groupes fonctionnels. On se sert du double deux points "
-"(« :: ») pour indiquer une option ; par exemple, "
-"<literal>APT::Get::Assume-Yes</literal> est une option pour le groupe "
-"d'outils APT, destinée à l'outil Get. Il n'y a pas d'héritage des options "
-"des groupes parents."
+"(« :: ») pour indiquer une option ; par exemple, <literal>APT::Get::Assume-"
+"Yes</literal> est une option pour le groupe d'outils APT, destinée à l'outil "
+"Get. Il n'y a pas d'héritage des options des groupes parents."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:55
+#: apt.conf.5.xml:56
msgid ""
"Syntactically the configuration language is modeled after what the ISC tools "
"such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@ -5354,7 +5612,8 @@ msgstr ""
"comme suit :"
#. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:65, no-wrap
+#: apt.conf.5.xml:66
+#, no-wrap
msgid ""
"APT {\n"
" Get {\n"
@@ -5371,7 +5630,7 @@ msgstr ""
"};\n"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:73
+#: apt.conf.5.xml:74
msgid ""
"with newlines placed to make it more readable. Lists can be created by "
"opening a scope and including a single string enclosed in quotes followed by "
@@ -5382,12 +5641,13 @@ msgstr ""
"guillemets suivie d'un point virgule pour chaque élément de la liste."
#. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:78, no-wrap
+#: apt.conf.5.xml:79
+#, no-wrap
msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:81
+#: apt.conf.5.xml:82
msgid ""
"In general the sample configuration file in <filename>&docdir;examples/apt."
"conf</filename> &configureindex; is a good guide for how it should look."
@@ -5397,7 +5657,7 @@ msgstr ""
"configuration."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:85
+#: apt.conf.5.xml:86
msgid ""
"The names of the configuration items are not case-sensitive. So in the "
"previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
@@ -5407,13 +5667,21 @@ msgstr ""
"<literal>dpkg::pre-install-pkgs</literal>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:88
+#: apt.conf.5.xml:89
+#, 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> 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."
+"The specified element and all its descendants are erased."
msgstr ""
"Deux éléments spéciaux sont autorisés : <literal>#include</literal> et "
"<literal>#clear</literal>. <literal>#include</literal> inclut le fichier "
@@ -5423,7 +5691,7 @@ msgstr ""
"ses descendants sont supprimés."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:94
+#: apt.conf.5.xml:95
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 "
@@ -5435,16 +5703,16 @@ msgstr ""
"spécifier une configuration quelconque depuis la ligne de commande. La "
"syntaxe consiste en un nom complet d'option (par exemple <literal>APT::Get::"
"Assume-Yes</literal>) suivi par un signe égal, puis par la nouvelle valeur "
-"de l'option. On peut compléter une liste en ajoutant un « :: » au "
-"nom de la liste."
+"de l'option. On peut compléter une liste en ajoutant un « :: » au nom de la "
+"liste."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:101
+#: apt.conf.5.xml:102
msgid "The APT Group"
msgstr "Le groupe APT"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:102
+#: apt.conf.5.xml:103
msgid ""
"This group of options controls general APT behavior as well as holding the "
"options for all of the tools."
@@ -5453,12 +5721,12 @@ msgstr ""
"également des options communes à tous les outils."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:106
+#: apt.conf.5.xml:107
msgid "Architecture"
msgstr "Architecture"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:107
+#: apt.conf.5.xml:108
msgid ""
"System Architecture; sets the architecture to use when fetching files and "
"parsing package lists. The internal default is the architecture apt was "
@@ -5469,12 +5737,12 @@ msgstr ""
"valeur interne par défaut est l'architecture pour laquelle APT a été compilé."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:112
+#: apt.conf.5.xml:113
msgid "Default-Release"
msgstr "Default-Release"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:113
+#: apt.conf.5.xml:114
msgid ""
"Default release to install packages from if more than one version available. "
"Contains release name, codename or release version. Examples: 'stable', "
@@ -5483,50 +5751,50 @@ msgid ""
msgstr ""
"Indique la distribution à utiliser par défaut lors de l'installation d'un "
"paquet si plusieurs versions sont disponibles. La valeur peut être un nom de "
-"distribution ou un numéro de version. Exemples : « stable », "
-"« testing », « 4.0 », « 5.0* ». Voir aussi &apt-preferences;."
+"distribution ou un numéro de version. Exemples : « stable », « testing », "
+"« 4.0 », « 5.0* ». Voir aussi &apt-preferences;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:117
+#: apt.conf.5.xml:118
msgid "Ignore-Hold"
msgstr "Ignore-Hold"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:118
+#: apt.conf.5.xml:119
msgid ""
"Ignore Held packages; This global option causes the problem resolver to "
"ignore held packages in its decision making."
msgstr ""
-"Ignore les paquets « gelés » ; cette option globale indique au "
-"système de résolution de ne pas tenir compte des paquets « gelés » "
-"dans sa prise de décision."
+"Ignore les paquets « gelés » ; cette option globale indique au système de "
+"résolution de ne pas tenir compte des paquets « gelés » dans sa prise de "
+"décision."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:122
+#: apt.conf.5.xml:123
msgid "Clean-Installed"
msgstr "Clean-Installed"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:123
+#: apt.conf.5.xml:124
msgid ""
"Defaults to on. When turned on the autoclean feature will remove any "
"packages which can no longer be downloaded from the cache. If turned off "
"then packages that are locally installed are also excluded from cleaning - "
"but note that APT provides no direct means to reinstall them."
msgstr ""
-"Avec cette option qui est activée par défaut, la fonctionnalité « "
-"autoclean » supprime du cache tout paquet qui ne peut plus être "
-"récupéré. Quand cette option est désactivée, les paquets qui sont installés "
-"localement sont aussi exclus du nettoyage - mais notez que APT ne fournit "
-"aucun moyen direct pour les réinstaller."
+"Avec cette option qui est activée par défaut, la fonctionnalité « autoclean » "
+"supprime du cache tout paquet qui ne peut plus être récupéré. Quand cette "
+"option est désactivée, les paquets qui sont installés localement sont aussi "
+"exclus du nettoyage - mais notez que APT ne fournit aucun moyen direct pour "
+"les réinstaller."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:129
+#: apt.conf.5.xml:130
msgid "Immediate-Configure"
msgstr "Immediate-Configure"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:130
+#: apt.conf.5.xml:131
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 "
@@ -5534,20 +5802,20 @@ msgid ""
"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."
+"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:137
+#: apt.conf.5.xml:138
msgid "Force-LoopBreak"
msgstr "Force-LoopBreak"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:138
+#: apt.conf.5.xml:139
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/"
@@ -5560,17 +5828,17 @@ msgstr ""
"que vous faites. Elle autorise APT à supprimer temporairement un paquet "
"essentiel pour mettre fin à une boucle Conflicts / Conflicts ou Conflicts / "
"Pre-Depends entre deux paquets essentiels. UNE TELLE BOUCLE NE DOIT JAMAIS "
-"SE PRODUIRE : C'EST UN BOGUE SÉRIEUX. Cette option fonctionne si les "
-"paquets essentiels ne sont pas tar, gzip, libc, dpkg, bash ou tous les "
-"paquets dont ces paquets dépendent."
+"SE PRODUIRE : C'EST UN BOGUE SÉRIEUX. Cette option fonctionne si les paquets "
+"essentiels ne sont pas tar, gzip, libc, dpkg, bash ou tous les paquets dont "
+"ces paquets dépendent."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:146
+#: apt.conf.5.xml:147
msgid "Cache-Limit"
msgstr "Cache-Limit"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:147
+#: apt.conf.5.xml:148
msgid ""
"APT uses a fixed size memory mapped cache file to store the 'available' "
"information. This sets the size of that cache (in bytes)."
@@ -5580,24 +5848,24 @@ msgstr ""
"mémoire allouée pour le chargement de ce cache."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:151
+#: apt.conf.5.xml:152
msgid "Build-Essential"
msgstr "Build-Essential"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:152
+#: apt.conf.5.xml:153
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:155
+#: apt.conf.5.xml:156
msgid "Get"
msgstr "Get"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:156
+#: apt.conf.5.xml:157
msgid ""
"The Get subsection controls the &apt-get; tool, please see its documentation "
"for more information about the options here."
@@ -5607,12 +5875,12 @@ msgstr ""
"question."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:160
+#: apt.conf.5.xml:161
msgid "Cache"
msgstr "Cache"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:161
+#: apt.conf.5.xml:162
msgid ""
"The Cache subsection controls the &apt-cache; tool, please see its "
"documentation for more information about the options here."
@@ -5622,12 +5890,12 @@ msgstr ""
"options en question."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:165
+#: apt.conf.5.xml:166
msgid "CDROM"
msgstr "CDROM"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:166
+#: apt.conf.5.xml:167
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool, please see its "
"documentation for more information about the options here."
@@ -5637,17 +5905,17 @@ msgstr ""
"options en question."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:172
+#: apt.conf.5.xml:173
msgid "The Acquire Group"
msgstr "Le groupe Acquire"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:177
+#: apt.conf.5.xml:178
msgid "PDiffs"
msgstr "PDiffs"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:178
+#: apt.conf.5.xml:179
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for Packages or "
"Sources files instead of downloading whole ones. True by default."
@@ -5657,12 +5925,12 @@ msgstr ""
"télécharger entièrement. Par défaut à « true »."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:183
+#: apt.conf.5.xml:184
msgid "Queue-Mode"
msgstr "Queue-Mode"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:184
+#: apt.conf.5.xml:185
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
"literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -5670,20 +5938,20 @@ msgid ""
"target host will be opened, <literal>access</literal> means that one "
"connection per URI type will be opened."
msgstr ""
-"Mode de file d'attente ; <literal>Queue-Mode</literal> peut prendre "
-"les valeurs <literal>host</literal> ou <literal>access</literal> et cela "
+"Mode de file d'attente ; <literal>Queue-Mode</literal> peut prendre les "
+"valeurs <literal>host</literal> ou <literal>access</literal> et cela "
"détermine comment APT parallélise les connexions sortantes. <literal>Host</"
"literal> signifie qu'une connexion par cible sera initiée, tandis que "
"<literal>access</literal> signifie qu'une connexion par type d'URI sera "
"initiée."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:191
+#: apt.conf.5.xml:192
msgid "Retries"
msgstr "Retries"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:192
+#: apt.conf.5.xml:193
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
@@ -5693,47 +5961,54 @@ msgstr ""
"échoué."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:196
+#: apt.conf.5.xml:197
msgid "Source-Symlinks"
msgstr "Source-Symlinks"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:197
+#: apt.conf.5.xml:198
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 ""
"Utilise des liens symboliques pour les archives de sources. Positionnée à "
-"« true », cette option crée si possible des liens symboliques vers "
-"les archives de sources au lieu de les copier. Par défaut à « "
-"true »."
+"« true », cette option crée si possible des liens symboliques vers les "
+"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:201 sources.list.5.xml:138
+#: apt.conf.5.xml:202 sources.list.5.xml:139
msgid "http"
msgstr "http"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:202
+#: apt.conf.5.xml:203
+#, 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 "
"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."
+"meaning to use no proxies. If no one of the above settings is specified, "
+"<envar>http_proxy</envar> environment variable will be used."
msgstr ""
"URI HTTP ; http::Proxy est le mandataire (proxy) HTTP à utiliser par "
-"défaut. Il se présente sous la forme standard : <literal>http://[[user]"
-"[:pass]@]host[:port]/</literal>. On peut spécifier un mandataire particulier "
-"par hôte distant en utilisant la syntaxe : <literal>http::Proxy::&lt;"
-"hôte&gt;</literal>. Le mot-clé spécial <literal>DIRECT</literal> indique "
-"alors de n'utiliser aucun mandataire pour l'hôte. Lorsqu'elle est définie, "
-"la variable d'environnement <envar>http_proxy</envar> annule et remplace "
-"toutes les options de mandataire HTTP."
+"défaut. Il se présente sous la forme standard : <literal>http://[[user][:"
+"pass]@]host[:port]/</literal>. On peut spécifier un mandataire particulier "
+"par hôte distant en utilisant la syntaxe : <literal>http::Proxy::&lt;hôte&gt;"
+"</literal>. Le mot-clé spécial <literal>DIRECT</literal> indique alors de "
+"n'utiliser aucun mandataire pour l'hôte. Lorsqu'elle est définie, la "
+"variable d'environnement <envar>http_proxy</envar> annule et remplace toutes "
+"les options de mandataire HTTP."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:209
+#: apt.conf.5.xml:211
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 "
@@ -5748,28 +6023,27 @@ msgstr ""
"Trois options de configuration sont fournies pour le contrôle des caches "
"compatibles avec HTTP/1.1. <literal>No-Cache</literal> signifie que le "
"mandataire ne doit jamais utiliser les réponses qu'il a stockées ; "
-"<literal>Max-Age</literal> sert uniquement pour les fichiers d'index : "
-"cela demande au cache de les mettre à jour quand leur ancienneté est "
-"supérieure au nombre de secondes donné. Debian met à jour ses fichiers "
-"d'index de manière quotidienne ; la valeur par défaut est donc de 1 "
-"jour. <literal>No-Store</literal> sert uniquement pour les fichiers "
-"d'archive  et demande au cache de ne jamais garder la requête. Cela "
-"peut éviter de polluer un cache mandataire avec des fichiers .deb très "
-"grands. Note : Squid 2.0.2 ne prend en compte aucune de ces options."
+"<literal>Max-Age</literal> sert uniquement pour les fichiers d'index : cela "
+"demande au cache de les mettre à jour quand leur ancienneté est supérieure "
+"au nombre de secondes donné. Debian met à jour ses fichiers d'index de "
+"manière quotidienne ; la valeur par défaut est donc de 1 jour. <literal>No-"
+"Store</literal> sert uniquement pour les fichiers d'archive  et demande au "
+"cache de ne jamais garder la requête. Cela peut éviter de polluer un cache "
+"mandataire avec des fichiers .deb très grands. Note : Squid 2.0.2 ne prend "
+"en compte aucune de ces options."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:219 apt.conf.5.xml:267
+#: apt.conf.5.xml:221 apt.conf.5.xml:273
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method, this applies to all things including connection timeout and data "
"timeout."
msgstr ""
"L'option <literal>timeout</literal> positionne le compteur de temps mort "
-"(timeout) utilisé par la méthode. Cela vaut pour tout, connexion et "
-"données."
+"(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:222
+#: apt.conf.5.xml:224
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) "
@@ -5782,19 +6056,19 @@ msgstr ""
"Une option de configuration est fournie pour contrôler la profondeur du tube "
"pour le cas où un serveur distant n'est pas conforme à la RFC ou est bogué "
"(comme Squid 2.0.2). <literal>Acquire::http::Pipeline-Depth </literal> a une "
-"valeur comprise entre 0 et 5 : elle indique le nombre de requêtes en "
-"attente qui peuvent être émises. Quand la machine distante ne conserve pas "
+"valeur comprise entre 0 et 5 : elle indique le nombre de requêtes en attente "
+"qui peuvent être émises. Quand la machine distante ne conserve pas "
"correctement les connexions TCP, on DOIT donner une valeur égale à 0 -- "
"sinon des données seront corrompues. Les machines qui ont besoin de cette "
"option ne respectent pas la RFC 2068."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:231
+#: apt.conf.5.xml:233
msgid "https"
msgstr "https"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:232
+#: apt.conf.5.xml:234
msgid ""
"HTTPS URIs. Cache-control and proxy options are the same as for "
"<literal>http</literal> method. <literal>Pipeline-Depth</literal> option is "
@@ -5805,7 +6079,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:236
+#: apt.conf.5.xml:238
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -5837,18 +6111,34 @@ msgstr ""
"ou 'SSLv3'."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:254 sources.list.5.xml:149
+#: apt.conf.5.xml:256 sources.list.5.xml:150
msgid "ftp"
msgstr "ftp"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:255
-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 "
+#: apt.conf.5.xml:257
+#, 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 "
+"proxies can also be specified by using the form <literal>ftp::Proxy::&lt;"
+"host&gt;</literal> with the special keyword <literal>DIRECT</literal> "
+"meaning to use no proxies. If no one of the above settings is specified, "
+"<envar>ftp_proxy</envar> environment variable will be used. To use a ftp "
+"proxy you will have to set the <literal>ftp::ProxyLogin</literal> script in "
+"the configuration file. This entry specifies the commands to send to tell "
"the proxy server what to connect to. Please see &configureindex; for an "
"example of how to do this. The substitution variables available are <literal>"
"$(PROXY_USER)</literal> <literal>$(PROXY_PASS)</literal> <literal>"
@@ -5856,25 +6146,25 @@ msgid ""
"literal> and <literal>$(SITE_PORT)</literal> Each is taken from it's "
"respective URI component."
msgstr ""
-"URI FTP ; ftp::Proxy est le mandataire (proxy) FTP à utiliser par "
-"défaut. Il se présente sous la forme standard : <literal>ftp://[[user]"
-"[:pass]@]host[:port]/</literal>. On peut spécifier un mandataire particulier "
-"par hôte distant en utilisant la syntaxe : <literal>ftp::Proxy::&lt;"
-"hôte&gt;</literal>. Le mot-clé spécial <literal>DIRECT</literal> indique "
-"alors de n'utiliser aucun mandataire pour l'hôte. Lorsqu'elle est définie, "
-"la variable d'environnement <envar>ftp_proxy</envar> annule et replace "
-"toutes les options de mandataire FTP. Pour utiliser un mandataire FTP, vous "
-"devrez renseigner l'entrée <literal>ftp::ProxyLogin</literal> dans le "
-"fichier de configuration. Cette entrée spécifie les commandes à envoyer au "
-"mandataire pour lui préciser à quoi il doit se connecter. Voyez "
-"&configureindex; pour savoir comment faire. Les variables de substitution "
-"disponibles sont : <literal>$(PROXY_USER)</literal>, <literal>"
-"$(PROXY_PASS)</literal>, <literal>$(SITE_USER)</literal>, <literal>"
-"$(SITE_PASS)</literal>, <literal>$(SITE)</literal> et <literal>$(SITE_PORT)</"
-"literal>. Chacune correspond à l'élément respectif de l'URI."
+"URI FTP ; ftp::Proxy est le mandataire (proxy) FTP à utiliser par défaut. "
+"Il se présente sous la forme standard : <literal>ftp://[[user][:pass]@]host[:"
+"port]/</literal>. On peut spécifier un mandataire particulier par hôte "
+"distant en utilisant la syntaxe : <literal>ftp::Proxy::&lt;hôte&gt;</"
+"literal>. Le mot-clé spécial <literal>DIRECT</literal> indique alors de "
+"n'utiliser aucun mandataire pour l'hôte. Lorsqu'elle est définie, la "
+"variable d'environnement <envar>ftp_proxy</envar> annule et replace toutes "
+"les options de mandataire FTP. Pour utiliser un mandataire FTP, vous devrez "
+"renseigner l'entrée <literal>ftp::ProxyLogin</literal> dans le fichier de "
+"configuration. Cette entrée spécifie les commandes à envoyer au mandataire "
+"pour lui préciser à quoi il doit se connecter. Voyez &configureindex; pour "
+"savoir comment faire. Les variables de substitution disponibles sont : "
+"<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, <literal>"
+"$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</"
+"literal> et <literal>$(SITE_PORT)</literal>. Chacune correspond à l'élément "
+"respectif de l'URI."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:270
+#: apt.conf.5.xml:276
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 "
@@ -5885,13 +6175,13 @@ msgstr ""
"Plusieurs options de configuration sont fournies pour contrôler le mode "
"passif. Il est généralement plus sûr d'activer le mode passif et cela marche "
"dans presque tous les environnements. Cependant, certaines situations "
-"nécessitent que le mode passif soit désactivé et que le mode « "
-"port » de ftp soit utilisé à la place. On peut le faire globalement, "
-"pour des connexions qui passent par un mandataire ou pour une machine "
-"spécifique (examinez le modèle de fichier de configuration)."
+"nécessitent que le mode passif soit désactivé et que le mode « port » de ftp "
+"soit utilisé à la place. On peut le faire globalement, pour des connexions "
+"qui passent par un mandataire ou pour une machine spécifique (examinez le "
+"modèle de fichier de configuration)."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:277
+#: apt.conf.5.xml:283
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 "
@@ -5906,7 +6196,7 @@ msgstr ""
"de cette méthode."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:282
+#: apt.conf.5.xml:288
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -5916,23 +6206,24 @@ msgid ""
msgstr ""
"L'option <literal>ForceExtended</literal> contrôle l'utilisation des "
"commandes liées à la RFC 2428, <literal>EPSV</literal> et <literal>EPRT</"
-"literal>. Par défaut, elle vaut « false » ce qui signifie que ces "
-"commandes ne sont utilisées que pour une connexion de type IPv6. Quand elle "
-"vaut « true », on les utilise même si la connexion est de type "
-"IPv4. La plupart des serveurs FTP ne suivent pas la RFC 2428."
+"literal>. Par défaut, elle vaut « false » ce qui signifie que ces commandes "
+"ne sont utilisées que pour une connexion de type IPv6. Quand elle vaut "
+"« true », on les utilise même si la connexion est de type IPv4. La plupart "
+"des serveurs FTP ne suivent pas la RFC 2428."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:289 sources.list.5.xml:131
+#: apt.conf.5.xml:295 sources.list.5.xml:132
msgid "cdrom"
msgstr "cdrom"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:295, no-wrap
+#: apt.conf.5.xml:301
+#, no-wrap
msgid "\"/cdrom/\"::Mount \"foo\";"
msgstr "\"/cdrom/\"::Mount \"foo\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:290
+#: apt.conf.5.xml:296
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 "
@@ -5943,34 +6234,117 @@ msgid ""
"cdrom block. It is important to have the trailing slash. Unmount commands "
"can be specified using UMount."
msgstr ""
-"URI CD ; la seule option de configuration pour les URI de CD "
-"est le point de montage : <literal>cdrom::Mount</literal> ; il "
-"doit représenter le point de montage du lecteur de CD-ROM indiqué dans "
-"<filename>/etc/fstab</filename>. On peut fournir d'autres commandes de "
-"montage et de démontage quand le point de montage ne peut être listé dans le "
-"fichier <filename>/etc/fstab</filename> (par exemple, un montage SMB). "
-"Syntaxiquement, il faut placer <placeholder type=\"literallayout\" id=\"0\"/"
-"> dans le bloc cdrom. La barre oblique finale est importante. Les commandes "
-"de démontage peuvent être spécifiées en utilisant <literal>UMount</literal>."
+"URI CD ; la seule option de configuration pour les URI de CD est le point de "
+"montage : <literal>cdrom::Mount</literal> ; il doit représenter le point de "
+"montage du lecteur de CD-ROM indiqué dans <filename>/etc/fstab</filename>. "
+"On peut fournir d'autres commandes de montage et de démontage quand le point "
+"de montage ne peut être listé dans le fichier <filename>/etc/fstab</"
+"filename> (par exemple, un montage SMB). Syntaxiquement, il faut placer "
+"<placeholder type=\"literallayout\" id=\"0\"/> dans le bloc cdrom. La barre "
+"oblique finale est importante. Les commandes de démontage peuvent être "
+"spécifiées en utilisant <literal>UMount</literal>."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:300
+#: apt.conf.5.xml:306
msgid "gpgv"
msgstr "gpgv"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:301
+#: apt.conf.5.xml:307
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
"passed to gpgv."
msgstr ""
-"URI GPGV ; la seule option pour les URI GPGV est celle qui permet de "
-"passer des paramètres à gpgv. <literal>gpgv::Options</literal> : "
-"options supplémentaires passées à gpgv."
+"URI GPGV ; la seule option pour les URI GPGV est celle qui permet de passer "
+"des paramètres à gpgv. <literal>gpgv::Options</literal> : options "
+"supplémentaires passées à gpgv."
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: apt.conf.5.xml:312
+msgid "CompressionTypes"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
+#: apt.conf.5.xml:318
+#, 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:313
+msgid ""
+"List of compression types which are understood by the acquire methods. "
+"Files like <filename>Packages</filename> can be available in various "
+"compression formats. Per default the acquire methods can decompress "
+"<command>bzip2</command>, <command>lzma</command> and <command>gzip</"
+"command> compressed files, with this setting more formats can be added on "
+"the fly or the used method can be changed. The syntax for this is: "
+"<placeholder type=\"synopsis\" id=\"0\"/>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
+#: apt.conf.5.xml:323
+#, no-wrap
+msgid "Acquire::CompressionTypes::Order:: \"gz\";"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
+#: apt.conf.5.xml:326
+#, no-wrap
+msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:319
+msgid ""
+"Also the <literal>Order</literal> subgroup can be used to define in which "
+"order the acquire system will try to download the compressed files. The "
+"acquire system will try the first and proceed with the next compression type "
+"in this list on error, so to prefer one over the other type simple add the "
+"preferred type at first - not already added default types will be added at "
+"run time to the end of the list, so e.g. <placeholder type=\"synopsis\" id="
+"\"0\"/> can be used to prefer <command>gzip</command> compressed files over "
+"<command>bzip2</command> and <command>lzma</command>. If <command>lzma</"
+"command> should be preferred over <command>gzip</command> and "
+"<command>bzip2</command> the configure setting should look like this "
+"<placeholder type=\"synopsis\" id=\"1\"/> It is not needed to add "
+"<literal>bz2</literal> explicit to the list as it will be added automatic."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
+#: apt.conf.5.xml:330
+#, no-wrap
+msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:328
+msgid ""
+"Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
+"replaceable></literal> will be checked: If this setting exists the method "
+"will only be used if this file exists, e.g. for the bzip2 method (the "
+"inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note also "
+"that list entries specified on the commandline will be added at the end of "
+"the list specified in the configuration files, but before the default "
+"entries. To prefer a type in this case over the ones specified in in the "
+"configuration files you can set the option direct - not in list style. This "
+"will not override the defined list, it will only prefix the list with this "
+"type."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:335
+msgid ""
+"While it is possible to add an empty compression type to the order list, but "
+"APT in its current version doesn't understand it correctly and will display "
+"many warnings about not downloaded files - these warnings are most of the "
+"time false negatives. Future versions will maybe include a way to really "
+"prefer uncompressed files to support the usage of local mirrors."
+msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:173
+#: apt.conf.5.xml:174
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>"
@@ -5980,12 +6354,12 @@ msgstr ""
"id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:310
+#: apt.conf.5.xml:344
msgid "Directories"
msgstr "Les répertoires"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:312
+#: apt.conf.5.xml:346
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -5998,14 +6372,14 @@ msgstr ""
"Les répertoires de la section <literal>Dir::State</literal> concernent le "
"système local. <literal>lists</literal> est le répertoire où placer les "
"listes de paquets téléchargés et <literal>status</literal> est le nom du "
-"fichier d'état de &dpkg;. <literal>preferences</literal> concerne "
-"APT : c'est le nom du fichier des préférences. <literal>Dir::State</"
-"literal> contient le répertoire par défaut préfixé à tous les sous-éléments, "
-"quand ceux-ci ne commencent pas par <filename>/</filename> ou <filename>./</"
+"fichier d'état de &dpkg;. <literal>preferences</literal> concerne APT : "
+"c'est le nom du fichier des préférences. <literal>Dir::State</literal> "
+"contient le répertoire par défaut préfixé à tous les sous-éléments, quand "
+"ceux-ci ne commencent pas par <filename>/</filename> ou <filename>./</"
"filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:319
+#: apt.conf.5.xml:353
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -6028,7 +6402,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:328
+#: apt.conf.5.xml:362
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -6043,7 +6417,7 @@ msgstr ""
"fichier de configuration indiqué par la variable <envar>APT_CONFIG</envar>)."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:334
+#: apt.conf.5.xml:368
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 "
@@ -6054,23 +6428,32 @@ msgstr ""
"configuration est chargé."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:338
+#: apt.conf.5.xml:372
+#, 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 "
-"<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."
+"<literal>gzip</literal>, <literal>bzip2</literal>, <literal>lzma</literal>, "
+"<literal>dpkg</literal>, <literal>apt-get</literal> <literal>dpkg-source</"
+"literal> <literal>dpkg-buildpackage</literal> and <literal>apt-cache</"
+"literal> specify the location of the respective programs."
msgstr ""
"Les programmes binaires sont pointés par <literal>Dir::Bin</literal>. "
"L'emplacement des gestionnaires de méthodes est indiqué par <literal>Dir::"
-"Bin::Methods</literal> ; <literal>gzip</literal>, <literal>dpkg</"
-"literal>, <literal>apt-get</literal>, <literal>dpkg-source</literal>, "
-"<literal>dpkg-buildpackage</literal> et <literal>apt-cache</literal> "
-"indiquent l'emplacement des programmes correspondants."
+"Bin::Methods</literal> ; <literal>gzip</literal>, <literal>dpkg</literal>, "
+"<literal>apt-get</literal>, <literal>dpkg-source</literal>, <literal>dpkg-"
+"buildpackage</literal> et <literal>apt-cache</literal> indiquent "
+"l'emplacement des programmes correspondants."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:345
+#: apt.conf.5.xml:380
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -6092,12 +6475,12 @@ msgstr ""
"staging/var/lib/dpkg/status</filename>."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:358
+#: apt.conf.5.xml:393
msgid "APT in DSelect"
msgstr "APT et DSelect"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:360
+#: apt.conf.5.xml:395
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -6108,12 +6491,12 @@ msgstr ""
"<literal>DSelect</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:364
+#: apt.conf.5.xml:399
msgid "Clean"
msgstr "Clean"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:365
+#: apt.conf.5.xml:400
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 "
@@ -6122,18 +6505,16 @@ msgid ""
"for instance). pre-auto performs this action before downloading new "
"packages."
msgstr ""
-"Mode de nettoyage du cache ; cette variable peut prendre l'une des "
-"valeurs suivantes : « always », « prompt », « "
-"auto », « pre-auto » et « never ». « "
-"always » et « prompt » suppriment tous les paquets du cache "
-"après la mise à niveau ; « prompt » (valeur par défaut) les "
-"supprime après une demande et « auto » ne supprime que les archives "
-"qui ne peuvent plus être téléchargées (remplacées, par exemple, par une "
-"nouvelle version). « pre-auto » les supprime avant de récupérer de "
-"nouveaux paquets."
+"Mode de nettoyage du cache ; cette variable peut prendre l'une des valeurs "
+"suivantes : « always », « prompt », « auto », « pre-auto » et « never ». "
+"« always » et « prompt » suppriment tous les paquets du cache après la mise à "
+"niveau ; « prompt » (valeur par défaut) les supprime après une demande et "
+"« auto » ne supprime que les archives qui ne peuvent plus être téléchargées "
+"(remplacées, par exemple, par une nouvelle version). « pre-auto » les "
+"supprime avant de récupérer de nouveaux paquets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:374
+#: apt.conf.5.xml:409
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the install phase."
@@ -6142,12 +6523,12 @@ msgstr ""
"&apt-get; lors de la phase d'installation."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:378
+#: apt.conf.5.xml:413
msgid "Updateoptions"
msgstr "UpdateOptions"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:379
+#: apt.conf.5.xml:414
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the update phase."
@@ -6156,27 +6537,27 @@ msgstr ""
"&apt-get; lors de la phase de mise à jour."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:383
+#: apt.conf.5.xml:418
msgid "PromptAfterUpdate"
msgstr "PromptAfterUpdate"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:384
+#: apt.conf.5.xml:419
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
msgstr ""
-"Si cette option est « true », l'opération [U]pdate de &dselect; "
-"interroge toujours l'utilisateur avant de continuer. Par défaut, ce n'est "
-"qu'en cas d'erreur que l'on propose à l'utilisateur d'intervenir."
+"Si cette option est « true », l'opération [U]pdate de &dselect; interroge "
+"toujours l'utilisateur avant de continuer. Par défaut, ce n'est qu'en cas "
+"d'erreur que l'on propose à l'utilisateur d'intervenir."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:425
msgid "How APT calls dpkg"
msgstr "Méthode d'appel de &dpkg; par APT"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:391
+#: apt.conf.5.xml:426
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
@@ -6185,7 +6566,7 @@ msgstr ""
"&dpkg; : elles figurent dans la section <literal>DPkg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:396
+#: apt.conf.5.xml:431
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 "
@@ -6196,17 +6577,17 @@ msgstr ""
"est passé comme un seul paramètre à &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:401
+#: apt.conf.5.xml:436
msgid "Pre-Invoke"
msgstr "Pre-Invoke"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:401
+#: apt.conf.5.xml:436
msgid "Post-Invoke"
msgstr "Post-Invoke"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:402
+#: apt.conf.5.xml:437
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 "
@@ -6216,16 +6597,15 @@ msgstr ""
"Il s'agit d'une liste de commandes shell à exécuter avant ou après l'appel "
"de &dpkg;. Tout comme pour <literal>Options</literal>, on doit utiliser la "
"notation de liste. Les commandes sont appelées dans l'ordre, en utilisant "
-"<filename>/bin/sh</filename> : APT s'arrête dès que l'une d'elles "
-"échoue."
+"<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:408
+#: apt.conf.5.xml:443
msgid "Pre-Install-Pkgs"
msgstr "Pre-Install-Pkgs"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:409
+#: apt.conf.5.xml:444
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 "
@@ -6236,12 +6616,12 @@ msgstr ""
"Il s'agit d'une liste de commandes shell à exécuter avant d'appeler &dpkg;. "
"Tout comme pour <literal>Options</literal>, on doit utiliser la notation de "
"liste. Les commandes sont appelées dans l'ordre, en utilisant <filename>/"
-"bin/sh</filename> : APT s'arrête dès que l'une d'elles échoue. Sur "
-"l'entrée standard, APT transmet aux commandes les noms de tous les fichiers ."
-"deb qu'il va installer, à raison d'un par ligne."
+"bin/sh</filename> : APT s'arrête dès que l'une d'elles échoue. Sur l'entrée "
+"standard, APT transmet aux commandes les noms de tous les fichiers .deb "
+"qu'il va installer, à raison d'un par ligne."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:415
+#: apt.conf.5.xml:450
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -6257,41 +6637,204 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:422
+#: apt.conf.5.xml:457
msgid "Run-Directory"
msgstr "Run-Directory"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:423
+#: apt.conf.5.xml:458
msgid ""
"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
"</filename>."
msgstr ""
-"APT se place dans ce répertoire avant d'appeler &dpkg; ; par défaut, "
-"c'est le répertoire <filename>/</filename>."
+"APT se place dans ce répertoire avant d'appeler &dpkg; ; par défaut, c'est "
+"le répertoire <filename>/</filename>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:427
+#: apt.conf.5.xml:462
msgid "Build-options"
msgstr "Build-options"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:428
+#: apt.conf.5.xml:463
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages, the "
"default is to disable signing and produce all binaries."
msgstr ""
"Ces options sont passées à &dpkg-buildpackage; lors de la compilation des "
-"paquets ; par défaut la signature est désactivée et tous les binaires "
-"sont créés."
+"paquets ; par défaut la signature est désactivée et tous les binaires sont "
+"créés."
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt.conf.5.xml:468
+msgid "dpkg trigger usage (and related options)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt.conf.5.xml:469
+msgid ""
+"APT can call dpkg in a way so it can make aggressive use of triggers over "
+"multiply calls of dpkg. Without further options dpkg will use triggers only "
+"in between his own run. Activating these options can therefore decrease the "
+"time needed to perform the install / upgrade. Note that it is intended to "
+"activate these options per default in the future, but as it changes the way "
+"APT calling dpkg drastical it needs a lot more testing. <emphasis>These "
+"options are therefore currently experimental and should not be used in "
+"productive environments.</emphasis> Also it breaks the progress reporting so "
+"all frontends will currently stay around half (or more) of the time in the "
+"100% state while it actually configures all packages."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
+#: apt.conf.5.xml:484
+#, no-wrap
+msgid ""
+"DPkg::NoTriggers \"true\";\n"
+"PackageManager::Configure \"smart\";\n"
+"DPkg::ConfigurePending \"true\";\n"
+"DPkg::TriggersPending \"true\";"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt.conf.5.xml:478
+msgid ""
+"Note that it is not garanteed that APT will support these options or that "
+"these options will not cause (big) trouble in the future. If you have "
+"understand the current risks and problems with these options, but are brave "
+"enough to help testing them create a new configuration file and test a "
+"combination of options. Please report any bugs, problems and improvements "
+"you encounter and make sure to note which options you have used in your "
+"reports. Asking dpkg for help could also be useful for debugging proposes, "
+"see e.g. <command>dpkg --audit</command>. A defensive option combination "
+"would be <placeholder type=\"literallayout\" id=\"0\"/>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt.conf.5.xml:490
+msgid "DPkg::NoTriggers"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:491
+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."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt.conf.5.xml:498
+#, fuzzy
+#| msgid "Packages::Compress"
+msgid "PackageManager::Configure"
+msgstr "Packages::Compress"
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:499
+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!"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt.conf.5.xml:509
+msgid "DPkg::ConfigurePending"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:510
+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."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt.conf.5.xml:516
+msgid "DPkg::TriggersPending"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:517
+msgid ""
+"Useful for <literal>smart</literal> configuration as a package which has "
+"pending triggers is not considered as <literal>installed</literal> and dpkg "
+"treats them as <literal>unpacked</literal> currently which is a dealbreaker "
+"for Pre-Dependencies (see debbugs #526774). Note that this will process all "
+"triggers, not only the triggers needed to configure this package."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt.conf.5.xml:522
+msgid "PackageManager::UnpackAll"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:523
+msgid ""
+"As the configuration can be deferred to be done at the end by dpkg it can be "
+"tried to order the unpack series only by critical needs, e.g. by Pre-"
+"Depends. Default is true and therefore the \"old\" method of ordering in "
+"verious steps by everything. While both method were present in earlier APT "
+"versions the <literal>OrderCritical</literal> method was unused, so this "
+"method is very experimental and needs further improvements before becoming "
+"really useful."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt.conf.5.xml:530
+msgid "OrderList::Score::Immediate"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
+#: apt.conf.5.xml:538
+#, no-wrap
+msgid ""
+"OrderList::Score {\n"
+"\tDelete 500;\n"
+"\tEssential 200;\n"
+"\tImmediate 10;\n"
+"\tPreDepends 50;\n"
+"};"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:531
+msgid ""
+"Essential packages (and there dependencies) should be configured immediately "
+"after unpacking. It will be a good idea to do this quite early in the "
+"upgrade process as these these configure calls require currently also "
+"<literal>DPkg::TriggersPending</literal> which will run quite a few triggers "
+"(which maybe not needed). Essentials get per default a high score but the "
+"immediate flag is relativly low (a package which has a Pre-Depends is higher "
+"rated). These option and the others in the same group can be used to change "
+"the scoring. The following example shows the settings with there default "
+"values. <placeholder type=\"literallayout\" id=\"0\"/>"
+msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:435
+#: apt.conf.5.xml:551
msgid "Periodic and Archives options"
msgstr "Options « Periodic » et « Archive »"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:436
+#: apt.conf.5.xml:552
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -6303,12 +6846,12 @@ msgstr ""
"script <literal>/etc/cron.daily/apt</literal>, lancé quotidiennement."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:444
+#: apt.conf.5.xml:560
msgid "Debug options"
msgstr "Les options de débogage"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:446
+#: apt.conf.5.xml:562
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -6326,7 +6869,7 @@ msgstr ""
"peuvent tout de même être utiles :"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:457
+#: apt.conf.5.xml:573
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -6337,7 +6880,7 @@ msgstr ""
"upgrade, upgrade, install, remove et purge</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:465
+#: apt.conf.5.xml:581
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -6345,10 +6888,11 @@ msgid ""
msgstr ""
"<literal>Debug::NoLocking</literal> désactive le verrouillage de fichier de "
"manière à ce qu'APT puisse effectuer quelques opérations (telles que "
-"<literal>apt-get -s install</literal>) sans avoir les privilèges du superutilisateur."
+"<literal>apt-get -s install</literal>) sans avoir les privilèges du "
+"superutilisateur."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:474
+#: apt.conf.5.xml:590
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -6358,9 +6902,9 @@ msgstr ""
#. TODO: provide a
#. motivating example, except I haven't a clue why you'd want
-#. to do this.
+#. to do this.
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:482
+#: apt.conf.5.xml:598
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CDROM IDs."
@@ -6369,57 +6913,62 @@ msgstr ""
"type statfs dans les identifiants de CD."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:492
+#: apt.conf.5.xml:608
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:497
+#: apt.conf.5.xml:613
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:501
-msgid "Print information related to accessing <literal>cdrom://</literal> sources."
-msgstr "Affiche les informations concernant les sources de type <literal>cdrom://</literal>"
+#: apt.conf.5.xml:617
+msgid ""
+"Print information related to accessing <literal>cdrom://</literal> sources."
+msgstr ""
+"Affiche les informations concernant les sources de type <literal>cdrom://</"
+"literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:508
+#: apt.conf.5.xml:624
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:512
+#: apt.conf.5.xml:628
msgid "Print information related to downloading packages using FTP."
-msgstr "Affiche les informations concernant le téléchargement de paquets par 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:519
+#: apt.conf.5.xml:635
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:523
+#: apt.conf.5.xml:639
msgid "Print information related to downloading packages using HTTP."
-msgstr "Affiche les informations concernant le téléchargement de paquets par 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:530
+#: apt.conf.5.xml:646
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:534
+#: apt.conf.5.xml:650
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:541
+#: apt.conf.5.xml:657
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:545
+#: apt.conf.5.xml:661
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
@@ -6428,12 +6977,12 @@ msgstr ""
"cryptographiques avec <literal>gpg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:552
+#: apt.conf.5.xml:668
msgid "<literal>Debug::aptcdrom</literal>"
msgstr "<literal>Debug::aptcdrom</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:556
+#: apt.conf.5.xml:672
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
@@ -6442,24 +6991,24 @@ msgstr ""
"stockées sur CD."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:563
+#: apt.conf.5.xml:679
msgid "<literal>Debug::BuildDeps</literal>"
msgstr "<literal>Debug::BuildDeps</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:682
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:573
+#: apt.conf.5.xml:689
msgid "<literal>Debug::Hashes</literal>"
msgstr "<literal>Debug::Hashes</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:576
+#: apt.conf.5.xml:692
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
@@ -6468,54 +7017,55 @@ msgstr ""
"librairies d'<literal>apt</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:583
+#: apt.conf.5.xml:699
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr "<literal>Debug::IdentCDROM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:586
+#: apt.conf.5.xml:702
msgid ""
"Do not include information from <literal>statfs</literal>, namely the number "
"of used and free blocks on the CD-ROM filesystem, when generating an ID for "
"a CD-ROM."
msgstr ""
"Désactive l'inclusion des données de type <literal>statfs</literal> pour la "
-"génération des identifiants de CD, c'est-à-dire le nombre de blocs libres et utilisés "
-"sur le système de fichier du CD."
+"génération des identifiants de CD, c'est-à-dire le nombre de blocs libres et "
+"utilisés sur le système de fichier du CD."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:594
+#: apt.conf.5.xml:710
msgid "<literal>Debug::NoLocking</literal>"
msgstr "<literal>Debug::NoLocking</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:597
+#: apt.conf.5.xml:713
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 ""
"Désactive le verrouillage de fichiers. Cela permet par exemple de lancer "
-"deux instances de <quote><literal>apt-get update</literal></quote> en même temps."
+"deux instances de <quote><literal>apt-get update</literal></quote> en même "
+"temps."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:605
+#: apt.conf.5.xml:721
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr "<literal>Debug::pkgAcquire</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:609
+#: apt.conf.5.xml:725
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:616
+#: apt.conf.5.xml:732
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:619
+#: apt.conf.5.xml:735
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
@@ -6525,12 +7075,12 @@ msgstr ""
"éventuelles."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:742
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:629
+#: apt.conf.5.xml:745
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
@@ -6540,38 +7090,40 @@ msgstr ""
"éventuelles."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:637
+#: apt.conf.5.xml:753
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:641
+#: apt.conf.5.xml:757
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
msgstr ""
-"Affiche les détails de l'application des fichiers de différences aux listes de paquets d'APT quand ces fichiers de différences sont téléchargés à "
-"la place des fichiers complets."
+"Affiche les détails de l'application des fichiers de différences aux listes "
+"de paquets d'APT quand ces fichiers de différences sont téléchargés à la "
+"place des fichiers complets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:648
+#: apt.conf.5.xml:764
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:652
-msgid "Log all interactions with the sub-processes that actually perform downloads."
+#: apt.conf.5.xml:768
+msgid ""
+"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
"Affiche toutes les interactions avec les processus enfants qui se chargent "
"effectivement des téléchargements."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:659
+#: apt.conf.5.xml:775
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr "<literal>Debug::pkgAutoRemove</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:663
+#: apt.conf.5.xml:779
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
@@ -6580,12 +7132,12 @@ msgstr ""
"automatiquement, et la suppression des paquets inutiles."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:670
+#: apt.conf.5.xml:786
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:673
+#: apt.conf.5.xml:789
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -6597,16 +7149,15 @@ msgstr ""
"automatiquement pour satisfaire les dépendances. Cela concerne la passe "
"initiale d'installation automatique effectuée par exemple par <literal>apt-"
"get install</literal> et pas le système de résolution de dépendances complet "
-"de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce "
-"dernier."
+"de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:800
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:687
+#: apt.conf.5.xml:803
msgid ""
"Generate debug messages describing which package is marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -6621,40 +7172,44 @@ msgid ""
"there is none or if it is the same version as the installed. "
"<literal>section</literal> is the name of the section the package appears in."
msgstr ""
-"Crée les informations de débogage décrivant quels paquets sont gardés/installés/supprimés pendant le travail de l'outil de résolution de problèmes. "
-"Chaque ajout ou suppression peut impliquer des actions supplémentaires ; elles sont alors indiquées avec une indentation de deux espaces de plus "
-"que l'action qui les a déclenchées. Le format de chaque ligne est "
-"literal>MarkKeep</literal>, <literal>MarkDelete</literal> ou <literal>MarkInstall</literal> suivi de <literal>nom-paquet &lt;a.b.c -&gt; d.e.f | x."
-"y.z&gt; (section)"
-"</literal> où <literal>a.b.c</literal> est la version actuelle du paquet, <literal>d.e.f</literal> la version devant être installée et "
-" <literal>x.y.z</literal> une version plus récente qui n'est pas prévue pour être installée (à cause d'un score plus faible). Ces deux derniers "
-"éléments peuvent ne pas être mentionnés s'ils ne sont pas pertinents où lorsque ils sont identiques à la version installée. <literal>section<"
-"/literal> est le nom de la section où figure le paquet."
+"Crée les informations de débogage décrivant quels paquets sont gardés/"
+"installés/supprimés pendant le travail de l'outil de résolution de "
+"problèmes. Chaque ajout ou suppression peut impliquer des actions "
+"supplémentaires ; elles sont alors indiquées avec une indentation de deux "
+"espaces de plus que l'action qui les a déclenchées. Le format de chaque "
+"ligne est <literal>MarkKeep</literal>, <literal>MarkDelete</literal> ou "
+"<literal>MarkInstall</literal> suivi de <literal>nom-paquet &lt;a.b.c -&gt; "
+"d.e.f | x.y.z&gt; (section)</literal> où <literal>a.b.c</literal> est la "
+"version actuelle du paquet, <literal>d.e.f</literal> la version devant être "
+"installée et <literal>x.y.z</literal> une version plus récente qui n'est "
+"pas prévue pour être installée (à cause d'un score plus faible). Ces deux "
+"derniers éléments peuvent ne pas être mentionnés s'ils ne sont pas "
+"pertinents où lorsque ils sont identiques à la version installée. "
+"<literal>section</literal> est le nom de la section où figure le paquet."
"automatiquement pour satisfaire les dépendances. Cela concerne la passe "
"initiale d'installation automatique effectuée par exemple par <literal>apt-"
"get install</literal> et pas le système de résolution de dépendances complet "
-"de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce "
-"dernier."
+"de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:706
+#: apt.conf.5.xml:822
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr "<literal>Debug::pkgInitConfig</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:709
+#: apt.conf.5.xml:825
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:716
+#: apt.conf.5.xml:832
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr "<literal>Debug::pkgDPkgPM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:719
+#: apt.conf.5.xml:835
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
@@ -6663,12 +7218,12 @@ msgstr ""
"paramètres sont séparés par des espaces."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:727
+#: apt.conf.5.xml:843
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:730
+#: apt.conf.5.xml:846
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
@@ -6678,12 +7233,12 @@ msgstr ""
"fichier."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:853
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr "<literal>Debug::pkgOrderList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:857
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
@@ -6692,32 +7247,33 @@ msgstr ""
"<literal>apt</literal> passe les paquets à &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:749
+#: apt.conf.5.xml:865
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr "<literal>Debug::pkgPackageManager</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:753
-msgid "Output status messages tracing the steps performed when invoking &dpkg;."
+#: apt.conf.5.xml:869
+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:760
+#: apt.conf.5.xml:876
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr "<literal>Debug::pkgPolicy</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:764
+#: apt.conf.5.xml:880
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:770
+#: apt.conf.5.xml:886
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr "<literal>Debug::pkgProblemResolver</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:774
+#: apt.conf.5.xml:890
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
@@ -6726,27 +7282,28 @@ 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:782
+#: apt.conf.5.xml:898
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:785
+#: apt.conf.5.xml:901
msgid ""
"Display a list of all installed packages with their calculated score used by "
"the pkgProblemResolver. The description of the package is the same as "
"described in <literal>Debug::pkgDepCache::Marker</literal>"
msgstr ""
-"Affiche la liste de tous les paquets installés avec leur score calculé par l'outil de résolution de problèmes. La description du paquet est celle "
-"qui est décrite dans <literal>Debug::pkgDepCache::Marker</literal>."
+"Affiche la liste de tous les paquets installés avec leur score calculé par "
+"l'outil de résolution de problèmes. La description du paquet est celle qui "
+"est décrite dans <literal>Debug::pkgDepCache::Marker</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:793
+#: apt.conf.5.xml:909
msgid "<literal>Debug::sourceList</literal>"
msgstr "<literal>Debug::sourceList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:913
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
@@ -6755,7 +7312,7 @@ msgstr ""
"list</filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:819
+#: apt.conf.5.xml:935
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -6763,39 +7320,53 @@ msgstr ""
"Le fichier &configureindex; contient un modèle de fichier montrant des "
"exemples pour toutes les options existantes."
-#. ? reading apt.conf
+#. type: Content of: <refentry><refsect1><variablelist>
+#: apt.conf.5.xml:942
+#, fuzzy
+#| msgid "&apt-conf;"
+msgid "&file-aptconf;"
+msgstr "&apt-conf;"
+
+#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:829
+#: apt.conf.5.xml:947
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
-#. The last update date
+#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt_preferences.5.xml:13
msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>"
msgstr "&apt-author.team; &apt-email; &apt-product; <date>04 mai 2009</date>"
#. type: Content of: <refentry><refnamediv><refname>
-#: apt_preferences.5.xml:21 apt_preferences.5.xml:27
+#: apt_preferences.5.xml:21 apt_preferences.5.xml:28
msgid "apt_preferences"
msgstr "apt_preferences"
#. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt_preferences.5.xml:28
+#: apt_preferences.5.xml:29
msgid "Preference control file for APT"
msgstr "Fichier de contrôle des préférences pour APT"
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:33
+#: 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> can be "
-"used to control which versions of packages will be selected for installation."
+"The APT preferences file <filename>/etc/apt/preferences</filename> and the "
+"fragment files in the <filename>/etc/apt/preferences.d/</filename> folder "
+"can be used to control which versions of packages will be selected for "
+"installation."
msgstr ""
"Le fichier d'APT, <filename>/etc/apt/preferences</filename>, peut être "
"utilisé pour choisir la version des paquets que l'on veut installer."
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:37
+#: apt_preferences.5.xml:39
msgid ""
"Several versions of a package may be available for installation when the "
"&sources-list; file contains references to more than one distribution (for "
@@ -6812,11 +7383,11 @@ msgstr ""
"affecte une priorité à chaque version disponible. La commande <command>apt-"
"get</command>, tenant compte des contraintes de dépendance, installe la "
"version qui possède la priorité la plus haute. Le fichier des préférences "
-"annule les priorités assignées par défaut aux versions des paquets : "
-"ainsi l'utilisateur peut choisir la version qu'il veut installer."
+"annule les priorités assignées par défaut aux versions des paquets : ainsi "
+"l'utilisateur peut choisir la version qu'il veut installer."
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:47
+#: apt_preferences.5.xml:49
msgid ""
"Several instances of the same version of a package may be available when the "
"&sources-list; file contains references to more than one source. In this "
@@ -6832,22 +7403,24 @@ msgstr ""
"exemplaires, seulement sur le choix de la version."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:54
+#: apt_preferences.5.xml:56
msgid "APT's Default Priority Assignments"
msgstr "Priorités affectées par défaut"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:69, no-wrap
+#: apt_preferences.5.xml:71
+#, no-wrap
msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
msgstr "<command>apt-get install -t testing <replaceable>paquet</replaceable></command>\n"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:72, no-wrap
+#: apt_preferences.5.xml:74
+#, no-wrap
msgid "APT::Default-Release \"stable\";\n"
msgstr "APT::Default-Release \"stable\";\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:56
+#: apt_preferences.5.xml:58
msgid ""
"If there is no preferences file or if there is no entry in the file that "
"applies to a particular version then the priority assigned to that version "
@@ -6865,30 +7438,29 @@ msgstr ""
"fichier ne s'applique à une version précise, la priorité affectée à cette "
"version est la priorité de la distribution à laquelle elle appartient. On "
"peut distinguer une distribution et lui donner une priorité plus haute que "
-"celle des autres distributions : on l'appelle la distribution par "
-"défaut ou « target release » et elle peut être définie sur la ligne "
-"de commande de <command>apt-get</command> ou dans le fichier de "
-"configuration d'APT, <filename>/etc/apt/apt.conf</filename>. Par "
-"exemple : <placeholder type=\"programlisting\" id=\"0\"/> <placeholder "
-"type=\"programlisting\" id=\"1\"/>"
+"celle des autres distributions : on l'appelle la distribution par défaut ou "
+"« target release » et elle peut être définie sur la ligne de commande de "
+"<command>apt-get</command> ou dans le fichier de configuration d'APT, "
+"<filename>/etc/apt/apt.conf</filename>. Par exemple : <placeholder type="
+"\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:81
+#: apt_preferences.5.xml:83
msgid "priority 100"
msgstr "une priorité égale à 100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:82
+#: apt_preferences.5.xml:84
msgid "to the version that is already installed (if any)."
msgstr "est affectée à la version déjà installée (si elle existe)."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:86
+#: apt_preferences.5.xml:88
msgid "priority 500"
msgstr "une priorité égale à 500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:87
+#: apt_preferences.5.xml:89
msgid ""
"to the versions that are not installed and do not belong to the target "
"release."
@@ -6897,30 +7469,31 @@ msgstr ""
"pas à la distribution par défaut."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:91
+#: apt_preferences.5.xml:93
msgid "priority 990"
msgstr "une priorité égale à 990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:92
-msgid "to the versions that are not installed and belong to the target release."
+#: apt_preferences.5.xml:94
+msgid ""
+"to the versions that are not installed and belong to the target release."
msgstr ""
"est affectée aux versions qui ne sont pas installées et qui appartiennent à "
"la distribution par défaut."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:76
+#: apt_preferences.5.xml:78
msgid ""
"If the target release has been specified then APT uses the following "
"algorithm to set the priorities of the versions of a package. Assign: "
"<placeholder type=\"variablelist\" id=\"0\"/>"
msgstr ""
"Quand une distribution par défaut a été indiquée, APT utilise l'algorithme "
-"suivant pour déterminer la priorité des versions d'un paquet : "
-"<placeholder type=\"variablelist\" id=\"0\"/>"
+"suivant pour déterminer la priorité des versions d'un paquet : <placeholder "
+"type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:97
+#: apt_preferences.5.xml:99
msgid ""
"If the target release has not been specified then APT simply assigns "
"priority 100 to all installed package versions and priority 500 to all "
@@ -6931,7 +7504,7 @@ msgstr ""
"une priorité égale à 500 à tout version non installée."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:101
+#: apt_preferences.5.xml:103
msgid ""
"APT then applies the following rules, listed in order of precedence, to "
"determine which version of a package to install."
@@ -6940,7 +7513,7 @@ msgstr ""
"qu'il faut installer (par ordre de priorité) :"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:104
+#: apt_preferences.5.xml:106
msgid ""
"Never downgrade unless the priority of an available version exceeds 1000. "
"(\"Downgrading\" is installing a less recent version of a package in place "
@@ -6949,19 +7522,19 @@ msgid ""
"Note also that downgrading a package can be risky.)"
msgstr ""
"Ne jamais revenir en arrière, sauf si la priorité d'une version disponible "
-"dépasse 1000. « Revenir en arrière » signifie installer une version "
-"moins récente que la version installée. Il faut noter qu'aucune des "
-"priorités par défaut n'excède 1000 ; de telles valeurs ne peuvent être "
-"définies que dans le fichier des préférences. Notez aussi qu'il est risqué "
-"de revenir en arrière."
+"dépasse 1000. « Revenir en arrière » signifie installer une version moins "
+"récente que la version installée. Il faut noter qu'aucune des priorités par "
+"défaut n'excède 1000 ; de telles valeurs ne peuvent être définies que dans "
+"le fichier des préférences. Notez aussi qu'il est risqué de revenir en "
+"arrière."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:110
+#: apt_preferences.5.xml:112
msgid "Install the highest priority version."
msgstr "Installer la version qui possède la priorité la plus haute."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:111
+#: apt_preferences.5.xml:113
msgid ""
"If two or more versions have the same priority, install the most recent one "
"(that is, the one with the higher version number)."
@@ -6970,7 +7543,7 @@ msgstr ""
"plus récente (c.-à-d. celle dont le numéro de version est le plus grand)."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:114
+#: apt_preferences.5.xml:116
msgid ""
"If two or more versions have the same priority and version number but either "
"the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -6982,7 +7555,7 @@ msgstr ""
"qui n'est pas installée."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:120
+#: apt_preferences.5.xml:122
msgid ""
"In a typical situation, the installed version of a package (priority 100) "
"is not as recent as one of the versions available from the sources listed in "
@@ -6997,7 +7570,7 @@ msgstr ""
"replaceable></command> ou <command>apt-get dist-upgrade</command>."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:127
+#: apt_preferences.5.xml:129
msgid ""
"More rarely, the installed version of a package is <emphasis>more</emphasis> "
"recent than any of the other available versions. The package will not be "
@@ -7010,7 +7583,7 @@ msgstr ""
"<command>apt-get upgrade</command> ne provoquent pas de retour en arrière."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:132
+#: apt_preferences.5.xml:134
msgid ""
"Sometimes the installed version of a package is more recent than the version "
"belonging to the target release, but not as recent as a version belonging to "
@@ -7029,12 +7602,12 @@ msgstr ""
"priorité que celle de la version installée."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:141
+#: apt_preferences.5.xml:143
msgid "The Effect of APT Preferences"
msgstr "Conséquences des préférences"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:143
+#: apt_preferences.5.xml:145
msgid ""
"The APT preferences file allows the system administrator to control the "
"assignment of priorities. The file consists of one or more multi-line "
@@ -7047,7 +7620,7 @@ msgstr ""
"formes, une forme particulière et une forme générale."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:149
+#: apt_preferences.5.xml:151
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
"specified packages and specified version or version range. For example, the "
@@ -7062,7 +7635,8 @@ msgstr ""
"dont le numéro de version commence par <literal>5.8</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:156, no-wrap
+#: apt_preferences.5.xml:158
+#, no-wrap
msgid ""
"Package: perl\n"
"Pin: version 5.8*\n"
@@ -7073,7 +7647,7 @@ msgstr ""
"Pin-Priority: 1001\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:162
+#: apt_preferences.5.xml:164
msgid ""
"The general form assigns a priority to all of the package versions in a "
"given distribution (that is, to all the versions of packages that are listed "
@@ -7088,7 +7662,7 @@ msgstr ""
"un nom complètement qualifié."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:168
+#: apt_preferences.5.xml:170
msgid ""
"This general-form entry in the APT preferences file applies only to groups "
"of packages. For example, the following record assigns a high priority to "
@@ -7099,7 +7673,8 @@ msgstr ""
"priorité haute à toutes les versions disponibles dans le site local."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:173, no-wrap
+#: apt_preferences.5.xml:175
+#, no-wrap
msgid ""
"Package: *\n"
"Pin: origin \"\"\n"
@@ -7110,7 +7685,7 @@ msgstr ""
"Pin-Priority: 999\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:178
+#: apt_preferences.5.xml:180
msgid ""
"A note of caution: the keyword used here is \"<literal>origin</literal>\". "
"This should not be confused with the Origin of a distribution as specified "
@@ -7118,25 +7693,26 @@ msgid ""
"a <filename>Release</filename> file is not an Internet address but an author "
"or vendor name, such as \"Debian\" or \"Ximian\"."
msgstr ""
-"Veuillez noter que le mot-clé utilisé ici, <literal>origin</literal>, ne doit pas "
-"être confondu avec l'Origine d'une distribution indiquée dans un fichier "
-"<filename>Release</filename>. Ce qui suit l'étiquette « Origin: » "
+"Veuillez noter que le mot-clé utilisé ici, <literal>origin</literal>, ne "
+"doit pas être confondu avec l'Origine d'une distribution indiquée dans un "
+"fichier <filename>Release</filename>. Ce qui suit l'étiquette « Origin: » "
"dans un fichier <filename>Release</filename> n'est pas une adresse Internet "
"mais le nom d'un auteur ou d'un distributeur, comme « Debian » ou « Ximian »."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:184
+#: apt_preferences.5.xml:186
msgid ""
"The following record assigns a low priority to all package versions "
"belonging to any distribution whose Archive name is \"<literal>unstable</"
"literal>\"."
msgstr ""
"L'entrée suivante affecte une priorité basse à toutes les versions d'un "
-"paquet appartenant à toute distribution dont le nom d'« Archive » "
-"est <literal>unstable</literal>."
+"paquet appartenant à toute distribution dont le nom d'« Archive » est "
+"<literal>unstable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:188, no-wrap
+#: apt_preferences.5.xml:190
+#, no-wrap
msgid ""
"Package: *\n"
"Pin: release a=unstable\n"
@@ -7147,18 +7723,19 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:193
+#: apt_preferences.5.xml:195
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is \"<literal>squeeze</literal>"
"\"."
msgstr ""
"L'entrée suivante affecte une priorité basse à toutes les versions d'un "
-"paquet appartenant à toute distribution dont le nom d'« Archive » "
-"est <literal>squeeze</literal>."
+"paquet appartenant à toute distribution dont le nom d'« Archive » est "
+"<literal>squeeze</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:197, no-wrap
+#: apt_preferences.5.xml:199
+#, no-wrap
msgid ""
"Package: *\n"
"Pin: release n=squeeze\n"
@@ -7169,19 +7746,20 @@ msgstr ""
"Pin-Priority: 900\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:204
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
"and whose release Version number is \"<literal>3.0</literal>\"."
msgstr ""
"L'entrée suivante affecte une priorité haute à toutes les versions d'un "
-"paquet appartenant à toute distribution dont le nom d'« Archive » "
-"est <literal>stable</literal> et dont le numéro de « Version » est "
-"<literal>3.0</literal>."
+"paquet appartenant à toute distribution dont le nom d'« Archive » est "
+"<literal>stable</literal> et dont le numéro de « Version » est <literal>3.0</"
+"literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:207, no-wrap
+#: apt_preferences.5.xml:209
+#, no-wrap
msgid ""
"Package: *\n"
"Pin: release a=stable, v=3.0\n"
@@ -7192,17 +7770,17 @@ msgstr ""
"Pin-Priority: 500\n"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:218
+#: apt_preferences.5.xml:220
msgid "How APT Interprets Priorities"
msgstr "Méthode d'interprétation des priorités par APT"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:226
+#: apt_preferences.5.xml:228
msgid "P &gt; 1000"
msgstr "P &gt; 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:227
+#: apt_preferences.5.xml:229
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
@@ -7211,27 +7789,27 @@ msgstr ""
"retour en arrière."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:231
+#: apt_preferences.5.xml:233
msgid "990 &lt; P &lt;=1000"
msgstr "990 &lt; P &lt;=1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:232
+#: apt_preferences.5.xml:234
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
msgstr ""
"la version sera installée, même si elle n'appartient pas à la distribution "
-"par défaut ; mais elle ne sera pas installée si la version installée "
-"est plus récente."
+"par défaut ; mais elle ne sera pas installée si la version installée est "
+"plus récente."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:237
+#: apt_preferences.5.xml:239
msgid "500 &lt; P &lt;=990"
msgstr "500 &lt; P &lt;=990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:238
+#: apt_preferences.5.xml:240
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to the target release or the installed version is more recent"
@@ -7240,12 +7818,12 @@ msgstr ""
"distribution par défaut ou si la version installée est plus récente."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:243
+#: apt_preferences.5.xml:245
msgid "100 &lt; P &lt;=500"
msgstr "100 &lt; P &lt;=500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:244
+#: apt_preferences.5.xml:246
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to some other distribution or the installed version is more recent"
@@ -7254,40 +7832,40 @@ msgstr ""
"autre distribution ou si la version installée est plus récente."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:249
+#: apt_preferences.5.xml:251
msgid "0 &lt; P &lt;=100"
msgstr "0 &lt; P &lt;=100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:250
+#: apt_preferences.5.xml:252
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
msgstr "la version sera installée si aucune version du paquet n'est installée."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:254
+#: apt_preferences.5.xml:256
msgid "P &lt; 0"
msgstr "P &lt; 0"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:255
+#: apt_preferences.5.xml:257
msgid "prevents the version from being installed"
msgstr "cette priorité empêche l'installation de la version."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:221
+#: apt_preferences.5.xml:223
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
"<placeholder type=\"variablelist\" id=\"0\"/>"
msgstr ""
"Les priorités (P) indiquées dans le fichier des préférences doivent être des "
-"entiers positifs ou négatifs. Ils sont interprétés à peu près comme "
-"suit : <placeholder type=\"variablelist\" id=\"0\"/>"
+"entiers positifs ou négatifs. Ils sont interprétés à peu près comme suit : "
+"<placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:260
+#: apt_preferences.5.xml:262
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -7301,7 +7879,7 @@ msgstr ""
"trouvée détermine la priorité."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:266
+#: apt_preferences.5.xml:268
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
@@ -7310,7 +7888,8 @@ msgstr ""
"entrées décrites ci-dessous :"
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:270, no-wrap
+#: apt_preferences.5.xml:272
+#, no-wrap
msgid ""
"Package: perl\n"
"Pin: version 5.8*\n"
@@ -7337,12 +7916,12 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:283
+#: apt_preferences.5.xml:285
msgid "Then:"
msgstr "Alors :"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:285
+#: apt_preferences.5.xml:287
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -7356,7 +7935,7 @@ msgstr ""
"installée est une version 5.9*, il y aura un retour en arrière."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:290
+#: apt_preferences.5.xml:292
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -7367,7 +7946,7 @@ msgstr ""
"appartenant à la distribution par défaut."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:294
+#: apt_preferences.5.xml:296
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -7380,12 +7959,13 @@ msgstr ""
"paquet n'est déjà installée."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:304
+#: apt_preferences.5.xml:306
msgid "Determination of Package Version and Distribution Properties"
-msgstr "Détermination de la version des paquets et des propriétés des distributions"
+msgstr ""
+"Détermination de la version des paquets et des propriétés des distributions"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:308
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -7396,27 +7976,27 @@ msgstr ""
"décrivent les paquets disponibles à cet endroit."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:318
+#: apt_preferences.5.xml:320
msgid "the <literal>Package:</literal> line"
msgstr "la ligne <literal>Package:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:319
+#: apt_preferences.5.xml:321
msgid "gives the package name"
msgstr "donne le nom du paquet"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:322 apt_preferences.5.xml:372
+#: apt_preferences.5.xml:324 apt_preferences.5.xml:374
msgid "the <literal>Version:</literal> line"
msgstr "la ligne <literal>Version:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml:325
msgid "gives the version number for the named package"
msgstr "donne le numéro de version du paquet"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:310
+#: apt_preferences.5.xml:312
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -7433,16 +8013,16 @@ msgstr ""
"filename>, par exemple, <filename>.../dists/stable/main/binary-i386/"
"Packages</filename>. Il consiste en entrées composées de lignes, une pour "
"chaque paquet disponible dans le répertoire. Seules deux lignes des entrées "
-"sont pertinentes pour la détermination des priorités : <placeholder "
-"type=\"variablelist\" id=\"0\"/>"
+"sont pertinentes pour la détermination des priorités : <placeholder type="
+"\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:339
+#: apt_preferences.5.xml:341
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr "La ligne <literal>Archive:</literal> ou <literal>Suite:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:340
+#: apt_preferences.5.xml:342
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -7459,17 +8039,18 @@ msgstr ""
"préférences demanderait cette ligne :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:350, no-wrap
+#: apt_preferences.5.xml:352
+#, no-wrap
msgid "Pin: release a=stable\n"
msgstr "Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:356
+#: apt_preferences.5.xml:358
msgid "the <literal>Codename:</literal> line"
msgstr "la ligne <literal>Codename:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:357
+#: apt_preferences.5.xml:359
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: squeeze\" specifies that all of the "
@@ -7485,12 +8066,13 @@ msgstr ""
"préférences demanderait cette ligne :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:366, no-wrap
+#: apt_preferences.5.xml:368
+#, no-wrap
msgid "Pin: release n=squeeze\n"
msgstr "Pin: release n=squeeze\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:373
+#: apt_preferences.5.xml:375
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
@@ -7506,7 +8088,8 @@ msgstr ""
"préférences demanderait ces lignes :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:382, no-wrap
+#: apt_preferences.5.xml:384
+#, no-wrap
msgid ""
"Pin: release v=3.0\n"
"Pin: release a=stable, v=3.0\n"
@@ -7517,12 +8100,12 @@ msgstr ""
"Pin: release 3.0\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:391
+#: apt_preferences.5.xml:393
msgid "the <literal>Component:</literal> line"
msgstr "La ligne <literal>Component:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:392
+#: apt_preferences.5.xml:394
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -7540,17 +8123,18 @@ msgstr ""
"fichier des préférences demanderait cette ligne :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:401, no-wrap
+#: apt_preferences.5.xml:403
+#, no-wrap
msgid "Pin: release c=main\n"
msgstr "Pin: release c=main\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:407
+#: apt_preferences.5.xml:409
msgid "the <literal>Origin:</literal> line"
msgstr "La ligne <literal>Origin:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:408
+#: apt_preferences.5.xml:410
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -7563,35 +8147,37 @@ msgstr ""
"ligne :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:414, no-wrap
+#: apt_preferences.5.xml:416
+#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr "Pin: release o=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:420
+#: apt_preferences.5.xml:422
msgid "the <literal>Label:</literal> line"
msgstr "La ligne <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:421
+#: apt_preferences.5.xml:423
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
"literal>. Specifying this label in the APT preferences file would require "
"the line:"
msgstr ""
-"indique une étiquette pour les paquets qui se trouvent dans les répertoires sous "
-"le fichier <filename>Release</filename>. En général, c'est <literal>Debian</"
-"literal>. Indiquer cette origine dans le fichier des préférences demanderait "
-"cette ligne :"
+"indique une étiquette pour les paquets qui se trouvent dans les répertoires "
+"sous le fichier <filename>Release</filename>. En général, c'est "
+"<literal>Debian</literal>. Indiquer cette origine dans le fichier des "
+"préférences demanderait cette ligne :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:427, no-wrap
+#: apt_preferences.5.xml:429
+#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr "Pin: release l=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:330
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -7613,7 +8199,7 @@ msgstr ""
"déterminer les priorités : <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:434
+#: apt_preferences.5.xml:436
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -7627,23 +8213,23 @@ msgid ""
"<literal>unstable</literal> distribution."
msgstr ""
"Tous les fichiers <filename>Packages</filename> et <filename>Release</"
-"filename> récupérés dans des sources indiquées dans le fichier &sources-list; "
-"sont conservés dans le répertoire <filename>/var/lib/apt/lists</filename> ou "
-"dans le fichier spécifié par la variable <literal>Dir::State::Lists</"
-"literal> dans le fichier <filename>apt.conf</filename>. Par exemple, le "
-"fichier <filename>debian.lcs.mit.edu_debian_dists_unstable_contrib_binary-"
+"filename> récupérés dans des sources indiquées dans le fichier &sources-"
+"list; sont conservés dans le répertoire <filename>/var/lib/apt/lists</"
+"filename> ou dans le fichier spécifié par la variable <literal>Dir::State::"
+"Lists</literal> dans le fichier <filename>apt.conf</filename>. Par exemple, "
+"le fichier <filename>debian.lcs.mit.edu_debian_dists_unstable_contrib_binary-"
"i386_Release</filename> contient le fichier <filename>Release</filename> du "
"site <literal>debian.lcs.mit.edu</literal>, architecture <literal>binary-"
"i386</literal> et composant <literal>contrib</literal> de la distribution "
"<literal>unstable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml:449
msgid "Optional Lines in an APT Preferences Record"
msgstr "Lignes facultatives dans le fichier des préférences"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:449
+#: apt_preferences.5.xml:451
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -7654,7 +8240,7 @@ msgstr ""
"commentaires."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:453
+#: apt_preferences.5.xml:455
msgid ""
"The <literal>Pin-Priority:</literal> line in each APT preferences record is "
"optional. If omitted, APT assigns a priority of 1 less than the last value "
@@ -7667,12 +8253,13 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:462
+#: apt_preferences.5.xml:464
msgid "Tracking Stable"
msgstr "Méthode pour suivre Stable"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:470, no-wrap
+#: apt_preferences.5.xml:472
+#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
"Explanation: package versions other than those in the stable distro\n"
@@ -7695,7 +8282,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:466
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -7710,8 +8297,9 @@ msgstr ""
"literal>. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:487 apt_preferences.5.xml:533
-#: apt_preferences.5.xml:591, no-wrap
+#: apt_preferences.5.xml:489 apt_preferences.5.xml:535
+#: apt_preferences.5.xml:593
+#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
"apt-get upgrade\n"
@@ -7722,7 +8310,7 @@ msgstr ""
"apt-get dist-upgrade\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:482
+#: apt_preferences.5.xml:484
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -7731,16 +8319,17 @@ msgid ""
msgstr ""
"Avec le fichier des préférences ci-dessus et un fichier &sources-list; "
"adéquat, les commandes suivantes utiliseront les versions les plus récentes "
-"de <literal>stable</literal> pour faire la mise à niveau : <placeholder "
-"type=\"programlisting\" id=\"0\"/>"
+"de <literal>stable</literal> pour faire la mise à niveau : <placeholder type="
+"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:499, no-wrap
+#: apt_preferences.5.xml:501
+#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr "apt-get install <replaceable>paquet</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:493
+#: apt_preferences.5.xml:495
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -7753,12 +8342,13 @@ msgstr ""
"de relancer la commande. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:507
msgid "Tracking Testing or Unstable"
msgstr "Méthode pour suivre Testing ou Unstable"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:514, no-wrap
+#: apt_preferences.5.xml:516
+#, no-wrap
msgid ""
"Package: *\n"
"Pin: release a=testing\n"
@@ -7785,7 +8375,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:507
+#: apt_preferences.5.xml:509
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -7802,7 +8392,7 @@ msgstr ""
"<placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:528
+#: apt_preferences.5.xml:530
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -7811,16 +8401,17 @@ msgid ""
msgstr ""
"Avec un fichier &sources-list; approprié et le fichier des préférences ci-"
"dessus, les commandes suivantes utiliseront les versions les plus récentes "
-"de <literal>testing</literal> pour faire la mise à niveau : "
-"<placeholder type=\"programlisting\" id=\"0\"/>"
+"de <literal>testing</literal> pour faire la mise à niveau : <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:548, no-wrap
+#: apt_preferences.5.xml:550
+#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr "apt-get install <replaceable>paquet</replaceable>/unstable\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:539
+#: apt_preferences.5.xml:541
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -7831,20 +8422,21 @@ msgid ""
"<placeholder type=\"programlisting\" id=\"0\"/>"
msgstr ""
"La commande suivante utilisera la version la plus récente de la distribution "
-"<literal>unstable</literal> pour mettre à niveau le paquet spécifié ; "
-"Par la suite, <command>apt-get upgrade</command> mettra le paquet à jour "
-"avec la plus récente version dans <literal>testing</literal> si elle est "
-"plus récente que la version installée ou avec la plus récente version dans "
+"<literal>unstable</literal> pour mettre à niveau le paquet spécifié ; Par la "
+"suite, <command>apt-get upgrade</command> mettra le paquet à jour avec la "
+"plus récente version dans <literal>testing</literal> si elle est plus "
+"récente que la version installée ou avec la plus récente version dans "
"<literal>unstable</literal> si elle est plus récente que la version "
"installée. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:555
+#: apt_preferences.5.xml:557
msgid "Tracking the evolution of a codename release"
msgstr "Suivre l'évolution d'une version par son nom de code"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:569, no-wrap
+#: apt_preferences.5.xml:571
+#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
"Explanation: other than those in the distribution codenamed with squeeze or sid\n"
@@ -7877,7 +8469,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:559
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -7891,14 +8483,17 @@ msgid ""
"configurations above. <placeholder type=\"programlisting\" id=\"0\"/>"
msgstr ""
"Le fichier des préférences suivant affecte une priorité plus haute que la "
-"priorité par défaut (500) à tous les exemplaires appartenant à la version portant le nom de code indiqué et une priorité prohibitivement basse "
-"à tous les exemplaires appartenant à d'autres distributions <literal>Debian</"
-"literal>. Veuillez noter qu'avec ce fichier de préférences, APT suivra la transformation d'une version <literal>testing</literal> en <literal>"
-"stable</literal> puis <literal>oldstable</literal>. Si, au contraire, vous souhaitez suivre la version <literal>testing</literal>, vous devriez "
-"utiliser un des exemples précédents. <placeholder type=\"programlisting\" id=\"0\"/>"
+"priorité par défaut (500) à tous les exemplaires appartenant à la version "
+"portant le nom de code indiqué et une priorité prohibitivement basse à tous "
+"les exemplaires appartenant à d'autres distributions <literal>Debian</"
+"literal>. Veuillez noter qu'avec ce fichier de préférences, APT suivra la "
+"transformation d'une version <literal>testing</literal> en <literal>stable</"
+"literal> puis <literal>oldstable</literal>. Si, au contraire, vous souhaitez "
+"suivre la version <literal>testing</literal>, vous devriez utiliser un des "
+"exemples précédents. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:586
+#: apt_preferences.5.xml:588
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest version(s) in "
@@ -7911,12 +8506,13 @@ msgstr ""
"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:606, no-wrap
+#: apt_preferences.5.xml:608
+#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr "apt-get install <replaceable>paquet</replaceable>/sid\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:597
+#: apt_preferences.5.xml:599
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -7927,30 +8523,37 @@ msgid ""
"type=\"programlisting\" id=\"0\"/>"
msgstr ""
"La commande suivante utilisera la version la plus récente de la distribution "
-"<literal>sid</literal> pour mettre à niveau le paquet spécifié ; "
-"Par la suite, <command>apt-get upgrade</command> mettra le paquet à jour "
-"avec la plus récente version dans <literal>squeez</literal> si elle est "
-"plus récente que la version installée ou avec la plus récente version dans "
-"<literal>sid</literal> si elle est plus récente que la version "
-"installée. <placeholder type=\"programlisting\" id=\"0\"/>"
+"<literal>sid</literal> pour mettre à niveau le paquet spécifié ; Par la "
+"suite, <command>apt-get upgrade</command> mettra le paquet à jour avec la "
+"plus récente version dans <literal>squeez</literal> si elle est plus récente "
+"que la version installée ou avec la plus récente version dans <literal>sid</"
+"literal> si elle est plus récente que la version installée. <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
+
+#. type: Content of: <refentry><refsect1><variablelist>
+#: apt_preferences.5.xml:617
+#, fuzzy
+#| msgid "apt_preferences"
+msgid "&file-preferences;"
+msgstr "apt_preferences"
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:614
+#: apt_preferences.5.xml:623
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
#. type: Content of: <refentry><refnamediv><refname>
-#: sources.list.5.xml:22 sources.list.5.xml:28
+#: sources.list.5.xml:22 sources.list.5.xml:29
msgid "sources.list"
msgstr "sources.list"
#. type: Content of: <refentry><refnamediv><refpurpose>
-#: sources.list.5.xml:29
+#: sources.list.5.xml:30
msgid "Package resource list for APT"
msgstr "Liste des sources de paquets"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:33
+#: sources.list.5.xml:34
msgid ""
"The package resource list is used to locate archives of the package "
"distribution system in use on the system. At this time, this manual page "
@@ -7963,7 +8566,7 @@ msgstr ""
"Linux. Ce fichier de contrôle est <filename>/etc/apt/sources.list</filename>."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:38
+#: sources.list.5.xml:39
msgid ""
"The source list is designed to support any number of active sources and a "
"variety of source media. The file lists one source per line, with the most "
@@ -7977,20 +8580,20 @@ msgstr ""
"La liste des sources est conçue pour prendre en compte un nombre quelconque "
"de sources actives et différents média. Le fichier présente une source par "
"ligne et la source préférée apparaît en premier. Le format de chaque ligne "
-"est : <literal>type uri args</literal>. Le premier élément, "
-"<literal>type</literal>, détermine le format des <literal>args</literal>. "
-"<literal>uri</literal> est un identificateur universel de ressources (URI), "
-"qui est un sur-ensemble du plus spécifique et bien connu repère universel de "
-"ressources, ou URL. La fin de la ligne peut être un commentaire commençant "
-"par un caractère #."
+"est : <literal>type uri args</literal>. Le premier élément, <literal>type</"
+"literal>, détermine le format des <literal>args</literal>. <literal>uri</"
+"literal> est un identificateur universel de ressources (URI), qui est un sur-"
+"ensemble du plus spécifique et bien connu repère universel de ressources, ou "
+"URL. La fin de la ligne peut être un commentaire commençant par un caractère "
+"#."
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:49
+#: sources.list.5.xml:50
msgid "sources.list.d"
msgstr "sources.list.d"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:50
+#: sources.list.5.xml:51
msgid ""
"The <filename>/etc/apt/sources.list.d</filename> directory provides a way to "
"add sources.list entries in separate files. The format is the same as for "
@@ -7999,19 +8602,21 @@ msgid ""
"digits (0-9), underscore (_), hyphen (-) and period (.) characters. "
"Otherwise they will be silently ignored."
msgstr ""
-"Le répertoire <filename>/etc/apt/sources.list.d</filename> permet de spécifier "
-"des sources de paquets dans des fichiers distincts qui se terminent par "
-"<literal>.list</literal>. Leur format est le même que celui du fichier "
-"<filename>sources.list</filename>. Les noms de fichiers doivent se terminer par <filename>.list</filename> et ne peuvent contenir que des lettres "
-"(a-z et A-Z), des chiffres (0-9), des caractères de soulignement (_), des tirets et des points. Dans le cas contraire, ils seront ignorés."
+"Le répertoire <filename>/etc/apt/sources.list.d</filename> permet de "
+"spécifier des sources de paquets dans des fichiers distincts qui se "
+"terminent par <literal>.list</literal>. Leur format est le même que celui du "
+"fichier <filename>sources.list</filename>. Les noms de fichiers doivent se "
+"terminer par <filename>.list</filename> et ne peuvent contenir que des "
+"lettres (a-z et A-Z), des chiffres (0-9), des caractères de soulignement "
+"(_), des tirets et des points. Dans le cas contraire, ils seront ignorés."
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:59
+#: sources.list.5.xml:60
msgid "The deb and deb-src types"
msgstr "Les types deb et deb-src."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:60
+#: sources.list.5.xml:61
msgid ""
"The <literal>deb</literal> type describes a typical two-level Debian "
"archive, <filename>distribution/component</filename>. Typically, "
@@ -8035,22 +8640,22 @@ msgstr ""
"sources."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:72
+#: 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 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 :"
+"types <literal>deb</literal> et <literal>deb-src</literal> est de la forme :"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:75, no-wrap
+#: sources.list.5.xml:76
+#, no-wrap
msgid "deb uri distribution [component1] [component2] [...]"
msgstr "deb uri distribution [composant1] [composant2] [...]"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:77
+#: sources.list.5.xml:78
msgid ""
"The URI for the <literal>deb</literal> type must specify the base of the "
"Debian distribution, from which APT will find the information it needs. "
@@ -8063,16 +8668,15 @@ msgid ""
msgstr ""
"L'URI de type <literal>deb</literal> doit indiquer la base de la "
"distribution Debian dans laquelle APT trouvera les informations dont il a "
-"besoin. <literal>distribution</literal> peut spécifier le chemin "
-"exact : dans ce cas, on doit omettre les composants et "
-"<literal>distribution</literal> doit se terminer par une barre oblique (/). "
-"C'est utile quand seule une sous-section particulière de l'archive décrite "
-"par cet URI est intéressante. Quand <literal>distribution</literal> "
-"n'indique pas un chemin exact, un <literal>composant</literal> au moins doit "
-"être présent."
+"besoin. <literal>distribution</literal> peut spécifier le chemin exact : "
+"dans ce cas, on doit omettre les composants et <literal>distribution</"
+"literal> doit se terminer par une barre oblique (/). C'est utile quand seule "
+"une sous-section particulière de l'archive décrite par cet URI est "
+"intéressante. Quand <literal>distribution</literal> n'indique pas un chemin "
+"exact, un <literal>composant</literal> au moins doit être présent."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:86
+#: sources.list.5.xml:87
msgid ""
"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)"
"</literal> which expands to the Debian architecture (i386, m68k, "
@@ -8086,11 +8690,11 @@ msgstr ""
"powerpc, ...) sur laquelle s'exécute le système. On peut ainsi utiliser un "
"fichier <filename>sources.list</filename> qui ne dépend pas d'une "
"architecture. En général, ce n'est intéressant que si l'on indique un chemin "
-"exact ; sinon <literal>APT</literal> crée automatiquement un URI en "
-"fonction de l'architecture effective."
+"exact ; sinon <literal>APT</literal> crée automatiquement un URI en fonction "
+"de l'architecture effective."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:94
+#: sources.list.5.xml:95
msgid ""
"Since only one distribution can be specified per line it may be necessary to "
"have multiple lines for the same URI, if a subset of all available "
@@ -8107,8 +8711,8 @@ msgstr ""
"nécessaire de disposer le même URI sur plusieurs lignes quand on veut "
"accéder à un sous-ensemble des distributions ou composants disponibles à "
"cette adresse. APT trie les URI après avoir crée pour lui-même la liste "
-"complète ; il regroupe les références multiples au même hôte Internet "
-"en vue d'une connexion unique et il évite ainsi, par exemple, d'établir une "
+"complète ; il regroupe les références multiples au même hôte Internet en vue "
+"d'une connexion unique et il évite ainsi, par exemple, d'établir une "
"connexion FTP, de la fermer, faire autre chose, puis d'établir encore cette "
"connexion. Cette fonctionnalité permet l'accès à des sites FTP surchargés "
"qui limitent le nombre de connexions simultanées pour les utilisateurs "
@@ -8116,7 +8720,7 @@ msgstr ""
"tirer plus efficacement parti des sites à faible bande passante."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:106
+#: sources.list.5.xml:107
msgid ""
"It is important to list sources in order of preference, with the most "
"preferred source listed first. Typically this will result in sorting by "
@@ -8125,16 +8729,17 @@ msgid ""
msgstr ""
"Il est important d'indiquer les sources par ordre de préférence, la source "
"principale apparaissant en premier. Un tri est fait, de la plus rapide à la "
-"plus lente ; par exemple, un CD suivi par les hôtes d'un réseau "
-"local, puis les hôtes distants."
+"plus lente ; par exemple, un CD suivi par les hôtes d'un réseau local, puis "
+"les hôtes distants."
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:111
+#: sources.list.5.xml:112
msgid "Some examples:"
msgstr "Exemples :"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:113, no-wrap
+#: sources.list.5.xml:114
+#, no-wrap
msgid ""
"deb http://http.us.debian.org/debian stable main contrib non-free\n"
"deb http://http.us.debian.org/debian dists/stable-updates/\n"
@@ -8145,17 +8750,17 @@ msgstr ""
" "
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:119
+#: sources.list.5.xml:120
msgid "URI specification"
msgstr "Spécification des URI"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:124
+#: sources.list.5.xml:125
msgid "file"
msgstr "file"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:126
+#: sources.list.5.xml:127
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -8166,17 +8771,17 @@ msgstr ""
"avec les montages NFS, les miroirs et les archives locaux."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:133
+#: sources.list.5.xml:134
msgid ""
"The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
msgstr ""
-"Le procédé <literal>cdrom</literal> permet l'utilisation d'un lecteur de "
-"CD avec la possibilité de changer de media. Utilisez le programme &apt-"
-"cdrom; pour créer des entrées dans la liste des sources."
+"Le procédé <literal>cdrom</literal> permet l'utilisation d'un lecteur de CD "
+"avec la possibilité de changer de media. Utilisez le programme &apt-cdrom; "
+"pour créer des entrées dans la liste des sources."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:140
+#: sources.list.5.xml:141
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -8193,7 +8798,7 @@ msgstr ""
"Notez qu'il s'agit d'une méthode d'authentification peu sûre."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:151
+#: sources.list.5.xml:152
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -8204,8 +8809,8 @@ msgid ""
"ignored."
msgstr ""
"Le procédé <literal>ftp</literal> indique un serveur FTP comme archive. Le "
-"fonctionnement en mode ftp est largement configurable ; référez-vous à "
-"la page de manuel de &apt-cdrom; pour d'autres informations. On remarquera "
+"fonctionnement en mode ftp est largement configurable ; référez-vous à la "
+"page de manuel de &apt-cdrom; pour d'autres informations. On remarquera "
"qu'on peut indiquer un mandataire ftp avec la variable d'environnement "
"<envar>ftp_proxy</envar>. On peut aussi spécifier un mandataire http (les "
"serveurs mandataires http comprennent souvent les URL ftp) en utilisant "
@@ -8213,12 +8818,12 @@ msgstr ""
"et qui sont spécifiés dans le fichier de configuration seront ignorés."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:160
+#: sources.list.5.xml:161
msgid "copy"
msgstr "copy"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:162
+#: sources.list.5.xml:163
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -8230,17 +8835,17 @@ msgstr ""
"gens qui utilisent un disque zip pour recopier des fichiers avec APT."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:167
+#: sources.list.5.xml:168
msgid "rsh"
msgstr "rsh"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:167
+#: sources.list.5.xml:168
msgid "ssh"
msgstr "ssh"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:169
+#: sources.list.5.xml:170
msgid ""
"The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
"user and access the files. It is a good idea to do prior arrangements with "
@@ -8249,23 +8854,22 @@ msgid ""
"file transfers from the remote."
msgstr ""
"Le procédé rsh/ssh utilise rsh/ssh pour se connecter à une machine distante "
-"en tant qu'un certain utilisateur et pour accéder aux fichiers. "
-"Il est préférable au préalable de s'arranger "
-"avec des clés RSA ou bien rhosts. Pour l'accès aux "
-"fichiers de la machine distante et le transfert, on utilise les commandes "
-"standard <command>find</command> et <command>dd</command>."
+"en tant qu'un certain utilisateur et pour accéder aux fichiers. Il est "
+"préférable au préalable de s'arranger avec des clés RSA ou bien rhosts. Pour "
+"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>
-#: sources.list.5.xml:121
+#: sources.list.5.xml:122
msgid ""
"The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
"rsh. <placeholder type=\"variablelist\" id=\"0\"/>"
msgstr ""
-"Les types d'URI actuellement reconnus sont : cdrom, file, http, ftp, copy, ssh et rsh. "
-"<placeholder type=\"variablelist\" id=\"0\"/>"
+"Les types d'URI actuellement reconnus sont : cdrom, file, http, ftp, copy, "
+"ssh et rsh. <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:181
+#: 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."
@@ -8274,37 +8878,37 @@ msgstr ""
"debian pour stable/main, stable/contrib et stable/non-free."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:183
+#: 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:185
+#: 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)."
+"Comme ci-dessus, excepté que cette ligne utilise la distribution "
+"« unstable » (développement)."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:186
+#: 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:188
+#: 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:189
+#: 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:191
+#: sources.list.5.xml:192
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -8313,13 +8917,13 @@ msgstr ""
"n'utiliser que la section hamm/main."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:193
+#: 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:195
+#: 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."
@@ -8328,13 +8932,13 @@ msgstr ""
"répertoire debian, et n'utiliser que la section stable/contrib."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:197
+#: 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:199
+#: 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 "
@@ -8347,13 +8951,13 @@ msgstr ""
"apparaissent, une seule session FTP sera utilisée pour les deux lignes."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:203
+#: 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:205
+#: sources.list.5.xml:206
msgid ""
"Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US "
"directory."
@@ -8362,19 +8966,19 @@ msgstr ""
"répertoire debian-non-US."
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:207
+#: 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:216
+#: 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:209
+#: 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</"
@@ -8393,32 +8997,55 @@ msgstr ""
"\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:221
+#: sources.list.5.xml:222
msgid "&apt-cache; &apt-conf;"
msgstr "&apt-cache; &apt-conf;"
-#, fuzzy
+#~ msgid "<filename>/etc/apt/sources.list</filename>"
+#~ msgstr "<filename>/etc/apt/sources.list</filename>"
+
#~ msgid ""
-#~ "Source packages are tracked separately from binary packages via "
-#~ "<literal>deb-src</literal> type lines in the &sources-list; file. This "
-#~ "means that you will need to add such a line for each repository you want "
-#~ "to get sources from. If you don't do this you will properly get another "
-#~ "(newer, older or none) source version than the one you have installed or "
-#~ "could install."
+#~ "Locations to fetch packages from. Configuration Item: <literal>Dir::Etc::"
+#~ "SourceList</literal>."
#~ msgstr ""
-#~ "Les paquets source sont gérés indépendamment des paquets binaires, via "
-#~ "les lignes de type <literal>deb-src</literal> dans le fichier &sources-"
-#~ "list;. On n'obtiendra probablement pas les mêmes sources que celles du "
-#~ "paquet installé ou celles du paquet qu'on pourrait installer."
+#~ "Emplacements où aller chercher les paquets. Élément de configuration : "
+#~ "<literal>Dir::Etc::SourceList</literal>."
+
+#~ msgid "<filename>&statedir;/lists/</filename>"
+#~ msgstr "<filename>&statedir;/lists/</filename>"
+
+#~ msgid "<filename>&statedir;/lists/partial/</filename>"
+#~ msgstr "<filename>&statedir;/lists/partial/</filename>"
+
+#~ msgid "<filename>/etc/apt/apt.conf</filename>"
+#~ msgstr "<filename>/etc/apt/apt.conf</filename>"
-#, 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."
+#~ "APT configuration file. Configuration Item: <literal>Dir::Etc::Main</"
+#~ "literal>."
#~ msgstr ""
-#~ "Si l'option <option>--compile</option> est spécifiée, le paquet est "
-#~ "compilé en un binaire .deb avec <command>dpkg-buildpackage</command>. Si "
-#~ "<option>--download-only</option> est spécifié, le source n'est pas "
-#~ "décompacté."
+#~ "Fichier de configuration d'APT. Élément de configuration : <literal>Dir::"
+#~ "Etc::Main</literal>."
+
+#~ msgid "<filename>/etc/apt/apt.conf.d/</filename>"
+#~ msgstr "<filename>/etc/apt/apt.conf.d/</filename>"
+
+#~ msgid ""
+#~ "APT configuration file fragments. Configuration Item: <literal>Dir::Etc::"
+#~ "Parts</literal>."
+#~ msgstr ""
+#~ "Éléments du fichier de configuration d'APT. Élément de configuration : "
+#~ "<literal>Dir::Etc::Parts</literal>."
+
+#~ msgid "<filename>&cachedir;/archives/</filename>"
+#~ msgstr "<filename>&cachedir;/archives/</filename>"
+
+#~ msgid ""
+#~ "Storage area for retrieved package files. Configuration Item: "
+#~ "<literal>Dir::Cache::Archives</literal>."
+#~ msgstr ""
+#~ "Zone de stockage pour les paquets récupérés. Élément de configuration : "
+#~ "<literal>Dir::Cache::Archives</literal>."
+
+#~ msgid "<filename>&cachedir;/archives/partial/</filename>"
+#~ msgstr "<filename>&cachedir;/archives/partial/</filename>"
diff --git a/doc/po/ja.po b/doc/po/ja.po
index f6ab7a3e5..e7d67ddaa 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-07-30 22:55+0900\n"
+"POT-Creation-Date: 2009-09-18 17:09+0300\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"
@@ -578,14 +578,26 @@ msgstr ""
">\n"
#. type: Plain text
-#: apt.ent:165
-#, no-wrap
+#: 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"
" <refentryinfo>\n"
" <address><email>apt@packages.debian.org</email></address>\n"
-" <author><firstname>Jason</firstname> <surname>Gunthorpe</surname></author>\n"
+" <author>\n"
+" <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
+" <contrib></contrib>\n"
+" </author>\n"
" <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>\n"
" <date>28 October 2008</date>\n"
" <productname>Linux</productname>\n"
@@ -600,7 +612,7 @@ msgstr ""
" <productname>Linux</productname>\n"
#. type: Plain text
-#: apt.ent:168
+#: apt.ent:171
#, no-wrap
msgid ""
" </refentryinfo>\n"
@@ -610,7 +622,7 @@ msgstr ""
"\"> \n"
#. type: Plain text
-#: apt.ent:174 apt.ent:204
+#: apt.ent:177
#, no-wrap
msgid ""
"<!ENTITY apt-email \"\n"
@@ -626,13 +638,21 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:181 apt.ent:211
-#, no-wrap
+#: 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"
" <firstname>Jason</firstname>\n"
" <surname>Gunthorpe</surname>\n"
+" <contrib></contrib>\n"
" </author>\n"
"\">\n"
msgstr ""
@@ -644,13 +664,21 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:188
-#, no-wrap
+#: 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"
" <firstname>Mike</firstname>\n"
" <surname>O'Connor</surname>\n"
+" <contrib></contrib>\n"
" </author>\n"
"\">\n"
msgstr ""
@@ -662,12 +690,19 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:194 apt.ent:217
-#, no-wrap
+#: 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"
" <othername>APT team</othername>\n"
+" <contrib></contrib>\n"
" </author>\n"
"\">\n"
msgstr ""
@@ -678,7 +713,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:198 apt.ent:228
+#: apt.ent:204 apt.ent:215
#, no-wrap
msgid ""
"<!ENTITY apt-product \"\n"
@@ -690,7 +725,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:224
+#: apt.ent:211
#, no-wrap
msgid ""
"<!ENTITY apt-copyright \"\n"
@@ -708,7 +743,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:234
+#: apt.ent:221
#, no-wrap
msgid ""
"<!ENTITY apt-qapage \"\n"
@@ -724,7 +759,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:245
+#: apt.ent:232
#, no-wrap
msgid ""
"<!-- Boiler plate Bug reporting section -->\n"
@@ -750,7 +785,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:253
+#: apt.ent:240
#, no-wrap
msgid ""
"<!-- Boiler plate Author section -->\n"
@@ -770,7 +805,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:263
+#: apt.ent:250
#, no-wrap
msgid ""
"<!-- Should be used within the option section of the text to\n"
@@ -794,7 +829,7 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:271
+#: apt.ent:258
#, no-wrap
msgid ""
" <varlistentry>\n"
@@ -814,7 +849,7 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:281
+#: apt.ent:268
#, no-wrap
msgid ""
" <varlistentry>\n"
@@ -838,7 +873,7 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:293
+#: apt.ent:280
#, no-wrap
msgid ""
" <varlistentry>\n"
@@ -865,7 +900,7 @@ msgstr ""
"\">\n"
#. type: Plain text
-#: apt.ent:304
+#: apt.ent:291
#, no-wrap
msgid ""
"<!-- Should be used within the option section of the text to\n"
@@ -890,6 +925,129 @@ msgstr ""
" </para>\n"
"\">\n"
+#. type: Plain text
+#: apt.ent:297
+#, no-wrap
+msgid ""
+"<!ENTITY file-aptconf \"\n"
+" <varlistentry><term><filename>/etc/apt/apt.conf</filename></term>\n"
+" <listitem><para>APT configuration file.\n"
+" Configuration Item: <literal>Dir::Etc::Main</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:303
+#, no-wrap
+msgid ""
+" <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
+" <listitem><para>APT configuration file fragments.\n"
+" Configuration Item: <literal>Dir::Etc::Parts</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+"\">\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:309
+#, no-wrap
+msgid ""
+"<!ENTITY file-cachearchives \"\n"
+" <varlistentry><term><filename>&cachedir;/archives/</filename></term>\n"
+" <listitem><para>Storage area for retrieved package files.\n"
+" Configuration Item: <literal>Dir::Cache::Archives</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. 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"
+" Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>\n"
+" </varlistentry>\n"
+"\">\n"
+msgstr "取得中パッケージファイル格納エリア。設定項目 - <literal>Dir::Cache::Archives</literal> (必然的に不完全)"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. 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"
+" <listitem><para>Version preferences file.\n"
+" This is where you would specify &quot;pinning&quot;,\n"
+" i.e. a preference to get certain packages\n"
+" from a separate source\n"
+" or from a different version of a distribution.\n"
+" Configuration Item: <literal>Dir::Etc::Preferences</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+msgstr "バージョン優先ファイル。ここに \"pin\" の設定を行います。つまり、別々の取得元や異なるディストリビューションのバージョンの、どこからパッケージを取得するかを設定します。設定項目 - <literal>Dir::Etc::Preferences</literal>"
+
+#. type: Plain text
+#: apt.ent:331
+#, no-wrap
+msgid ""
+" <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
+" <listitem><para>File fragments for the version preferences.\n"
+" Configuration Item: <literal>Dir::Etc::PreferencesParts</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+"\">\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:337
+#, no-wrap
+msgid ""
+"<!ENTITY file-sourceslist \"\n"
+" <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n"
+" <listitem><para>Locations to fetch packages from.\n"
+" Configuration Item: <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:343
+#, no-wrap
+msgid ""
+" <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
+" <listitem><para>File fragments for locations to fetch packages from.\n"
+" Configuration Item: <literal>Dir::Etc::SourceParts</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+"\">\n"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. 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"
+" <listitem><para>Storage area for state information for each package resource specified in\n"
+" &sources-list;\n"
+" Configuration Item: <literal>Dir::State::Lists</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+msgstr "&sources-list; に指定した、パッケージリソースごとの状態情報格納エリア。設定項目 - <literal>Dir::State::Lists</literal>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. 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"
+" Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>\n"
+" </varlistentry>\n"
+"\">\n"
+msgstr "取得中状態情報格納エリア。設定項目 - <literal>Dir::State::Lists</literal> (必然的に不完全)"
+
#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13
@@ -903,7 +1061,7 @@ msgstr ""
# type: Content of: <refentry><refnamediv><refname>
#. type: Content of: <refentry><refnamediv><refname>
-#: apt-cache.8.xml:22 apt-cache.8.xml:28
+#: apt-cache.8.xml:22 apt-cache.8.xml:29
msgid "apt-cache"
msgstr "apt-cache"
@@ -913,15 +1071,24 @@ msgstr "apt-cache"
msgid "8"
msgstr "8"
+#. type: Content of: <refentry><refmeta><refmiscinfo>
+#: apt-cache.8.xml:24 apt-cdrom.8.xml:23 apt-config.8.xml:24
+#: apt-extracttemplates.1.xml:24 apt-ftparchive.1.xml:24 apt-get.8.xml:24
+#: apt-key.8.xml:16 apt-mark.8.xml:24 apt-secure.8.xml:16
+#: apt-sortpkgs.1.xml:24 apt.conf.5.xml:30 apt_preferences.5.xml:23
+#: sources.list.5.xml:24
+msgid "APT"
+msgstr ""
+
# type: Content of: <refentry><refnamediv><refpurpose>
#. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cache.8.xml:29
+#: apt-cache.8.xml:30
msgid "APT package handling utility -- cache manipulator"
msgstr "APT パッケージ操作ユーティリティ -- キャッシュ操作ツール"
# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-cache.8.xml:35
+#: apt-cache.8.xml:36
msgid ""
"<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-"
"o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
@@ -967,17 +1134,17 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:61 apt-cdrom.8.xml:46 apt-config.8.xml:46
-#: apt-extracttemplates.1.xml:42 apt-ftparchive.1.xml:54 apt-get.8.xml:114
-#: apt-key.8.xml:33 apt-mark.8.xml:43 apt-secure.8.xml:39
-#: apt-sortpkgs.1.xml:43 apt.conf.5.xml:38 apt_preferences.5.xml:32
-#: sources.list.5.xml:32
+#: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47
+#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125
+#: apt-key.8.xml:34 apt-mark.8.xml:52 apt-secure.8.xml:40
+#: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33
+#: sources.list.5.xml:33
msgid "Description"
msgstr "説明"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:62
+#: apt-cache.8.xml:63
msgid ""
"<command>apt-cache</command> performs a variety of operations on APT's "
"package cache. <command>apt-cache</command> does not manipulate the state of "
@@ -991,7 +1158,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:67 apt-get.8.xml:120
+#: apt-cache.8.xml:68 apt-get.8.xml:131
msgid ""
"Unless the <option>-h</option>, or <option>--help</option> option is given, "
"one of the commands below must be present."
@@ -1001,13 +1168,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:71
+#: apt-cache.8.xml:72
msgid "add <replaceable>file(s)</replaceable>"
msgstr "add <replaceable>file(s)</replaceable>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:72
+#: apt-cache.8.xml:73
msgid ""
"<literal>add</literal> adds the named package index files to the package "
"cache. This is for debugging only."
@@ -1016,13 +1183,13 @@ msgstr ""
"スファイルを追加します。デバッグ専用です。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:76
+#: apt-cache.8.xml:77
msgid "gencaches"
msgstr "gencaches"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:77
+#: apt-cache.8.xml:78
msgid ""
"<literal>gencaches</literal> performs the same operation as <command>apt-get "
"check</command>. It builds the source and package caches from the sources in "
@@ -1034,13 +1201,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:83
+#: apt-cache.8.xml:84
msgid "showpkg <replaceable>pkg(s)</replaceable>"
msgstr "showpkg <replaceable>pkg(s)</replaceable>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:84
+#: apt-cache.8.xml:85
msgid ""
"<literal>showpkg</literal> displays information about the packages listed on "
"the command line. Remaining arguments are package names. The available "
@@ -1063,7 +1230,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-cache.8.xml:96
+#: apt-cache.8.xml:97
#, no-wrap
msgid ""
"Package: libreadline2\n"
@@ -1090,7 +1257,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:108
+#: apt-cache.8.xml:109
msgid ""
"Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and "
"ncurses3.0 which must be installed for libreadline2 to work. In turn, "
@@ -1109,13 +1276,13 @@ msgstr ""
"apt のソースコードを調べるのが最良でしょう。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:117
+#: apt-cache.8.xml:118
msgid "stats"
msgstr "stats"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:117
+#: apt-cache.8.xml:118
msgid ""
"<literal>stats</literal> displays some statistics about the cache. No "
"further arguments are expected. Statistics reported are:"
@@ -1125,7 +1292,7 @@ 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:120
+#: apt-cache.8.xml:121
msgid ""
"<literal>Total package names</literal> is the number of package names found "
"in the cache."
@@ -1135,7 +1302,7 @@ 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:124
+#: apt-cache.8.xml:125
msgid ""
"<literal>Normal packages</literal> is the number of regular, ordinary "
"package names; these are packages that bear a one-to-one correspondence "
@@ -1148,7 +1315,7 @@ 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:130
+#: apt-cache.8.xml:131
msgid ""
"<literal>Pure virtual packages</literal> is the number of packages that "
"exist only as a virtual package name; that is, packages only \"provide\" the "
@@ -1166,7 +1333,7 @@ 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:138
+#: apt-cache.8.xml:139
msgid ""
"<literal>Single virtual packages</literal> is the number of packages with "
"only one package providing a particular virtual package. For example, in the "
@@ -1180,7 +1347,7 @@ 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:144
+#: apt-cache.8.xml:145
msgid ""
"<literal>Mixed virtual packages</literal> is the number of packages that "
"either provide a particular virtual package or have the virtual package name "
@@ -1194,7 +1361,7 @@ 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:151
+#: apt-cache.8.xml:152
msgid ""
"<literal>Missing</literal> is the number of package names that were "
"referenced in a dependency but were not provided by any package. Missing "
@@ -1210,7 +1377,7 @@ 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:158
+#: apt-cache.8.xml:159
msgid ""
"<literal>Total distinct</literal> versions is the number of package versions "
"found in the cache; this value is therefore at least equal to the number of "
@@ -1225,7 +1392,7 @@ 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:165
+#: apt-cache.8.xml:166
msgid ""
"<literal>Total dependencies</literal> is the number of dependency "
"relationships claimed by all of the packages in the cache."
@@ -1235,13 +1402,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:172
+#: apt-cache.8.xml:173
msgid "showsrc <replaceable>pkg(s)</replaceable>"
msgstr "showsrc <replaceable>pkg(s)</replaceable>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:173
+#: apt-cache.8.xml:174
msgid ""
"<literal>showsrc</literal> displays all the source package records that "
"match the given package names. All versions are shown, as well as all "
@@ -1252,13 +1419,13 @@ msgstr ""
"べてのバージョンについて表示します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:178 apt-config.8.xml:83
+#: apt-cache.8.xml:179 apt-config.8.xml:84
msgid "dump"
msgstr "dump"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:179
+#: apt-cache.8.xml:180
msgid ""
"<literal>dump</literal> shows a short listing of every package in the cache. "
"It is primarily for debugging."
@@ -1267,13 +1434,13 @@ msgstr ""
"覧を表示します。主にデバッグ用です。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:183
+#: apt-cache.8.xml:184
msgid "dumpavail"
msgstr "dumpavail"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:184
+#: apt-cache.8.xml:185
msgid ""
"<literal>dumpavail</literal> prints out an available list to stdout. This is "
"suitable for use with &dpkg; and is used by the &dselect; method."
@@ -1282,13 +1449,13 @@ msgstr ""
"す。 &dpkg; と共に使用すると便利ですし、&dselect; でも使用されます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:188
+#: apt-cache.8.xml:189
msgid "unmet"
msgstr "unmet"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:189
+#: apt-cache.8.xml:190
msgid ""
"<literal>unmet</literal> displays a summary of all unmet dependencies in the "
"package cache."
@@ -1298,13 +1465,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:193
+#: apt-cache.8.xml:194
msgid "show <replaceable>pkg(s)</replaceable>"
msgstr "show <replaceable>pkg(s)</replaceable>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:194
+#: apt-cache.8.xml:195
msgid ""
"<literal>show</literal> performs a function similar to <command>dpkg --print-"
"avail</command>; it displays the package records for the named packages."
@@ -1313,13 +1480,13 @@ msgstr ""
"能を実行します。これは、指定したパッケージのパッケージレコードの表示です。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:199
+#: apt-cache.8.xml:200
msgid "search <replaceable>regex [ regex ... ]</replaceable>"
msgstr "search <replaceable>regex [ regex ... ]</replaceable>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:200
+#: apt-cache.8.xml:201
msgid ""
"<literal>search</literal> performs a full text search on all available "
"package lists for the POSIX regex pattern given, see "
@@ -1344,7 +1511,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:213
+#: apt-cache.8.xml:214
msgid ""
"Separate arguments can be used to specify multiple search patterns that are "
"and'ed together."
@@ -1352,13 +1519,13 @@ msgstr "空白で区切った引数で、複数の検索パターンの and を
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:217
+#: apt-cache.8.xml:218
msgid "depends <replaceable>pkg(s)</replaceable>"
msgstr "depends <replaceable>pkg(s)</replaceable>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:218
+#: apt-cache.8.xml:219
msgid ""
"<literal>depends</literal> shows a listing of each dependency a package has "
"and all the possible other packages that can fulfill that dependency."
@@ -1368,13 +1535,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:222
+#: apt-cache.8.xml:223
msgid "rdepends <replaceable>pkg(s)</replaceable>"
msgstr "rdepends <replaceable>pkg(s)</replaceable>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:223
+#: apt-cache.8.xml:224
msgid ""
"<literal>rdepends</literal> shows a listing of each reverse dependency a "
"package has."
@@ -1383,13 +1550,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:227
+#: apt-cache.8.xml:228
msgid "pkgnames <replaceable>[ prefix ]</replaceable>"
msgstr "pkgnames <replaceable>[ prefix ]</replaceable>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:228
+#: apt-cache.8.xml:229
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 "
@@ -1404,13 +1571,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:235
+#: apt-cache.8.xml:236
msgid "dotty <replaceable>pkg(s)</replaceable>"
msgstr "dotty <replaceable>pkg(s)</replaceable>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:236
+#: apt-cache.8.xml:237
msgid ""
"<literal>dotty</literal> takes a list of packages on the command line and "
"generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -1430,7 +1597,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:245
+#: apt-cache.8.xml:246
msgid ""
"The resulting nodes will have several shapes; normal packages are boxes, "
"pure provides are triangles, mixed provides are diamonds, missing packages "
@@ -1444,18 +1611,18 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:250
+#: apt-cache.8.xml:251
msgid "Caution, dotty cannot graph larger sets of packages."
msgstr "注意) dotty は、パッケージのより大きなセットのグラフは描けません。"
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:253
+#: apt-cache.8.xml:254
msgid "xvcg <replaceable>pkg(s)</replaceable>"
msgstr "xvcg <replaceable>pkg(s)</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:254
+#: apt-cache.8.xml:255
msgid ""
"The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
"\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
@@ -1465,13 +1632,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:258
+#: apt-cache.8.xml:259
msgid "policy <replaceable>[ pkg(s) ]</replaceable>"
msgstr "policy <replaceable>[ pkg(s) ]</replaceable>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:259
+#: apt-cache.8.xml:260
msgid ""
"<literal>policy</literal> is meant to help debug issues relating to the "
"preferences file. With no arguments it will print out the priorities of each "
@@ -1484,13 +1651,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:265
+#: apt-cache.8.xml:266
msgid "madison <replaceable>/[ pkg(s) ]</replaceable>"
msgstr "madison <replaceable>/[ pkg(s) ]</replaceable>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:266
+#: apt-cache.8.xml:267
msgid ""
"<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
"to mimic the output format and a subset of the functionality of the Debian "
@@ -1509,25 +1676,25 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:277 apt-config.8.xml:92 apt-extracttemplates.1.xml:55
-#: apt-ftparchive.1.xml:491 apt-get.8.xml:299 apt-mark.8.xml:73
-#: apt-sortpkgs.1.xml:53 apt.conf.5.xml:373 apt.conf.5.xml:395
+#: apt-cache.8.xml:278 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:408 apt.conf.5.xml:430
msgid "options"
msgstr "オプション"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:281
+#: apt-cache.8.xml:282
msgid "<option>-p</option>"
msgstr "<option>-p</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:281
+#: apt-cache.8.xml:282
msgid "<option>--pkg-cache</option>"
msgstr "<option>--pkg-cache</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:282
+#: apt-cache.8.xml:283
msgid ""
"Select the file to store the package cache. The package cache is the primary "
"cache used by all operations. Configuration Item: <literal>Dir::Cache::"
@@ -1538,19 +1705,19 @@ msgstr ""
"pkgcache</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:287 apt-ftparchive.1.xml:534 apt-get.8.xml:356
-#: apt-sortpkgs.1.xml:57
+#: apt-cache.8.xml:288 apt-ftparchive.1.xml:535 apt-get.8.xml:376
+#: apt-sortpkgs.1.xml:58
msgid "<option>-s</option>"
msgstr "<option>-s</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:287
+#: apt-cache.8.xml:288
msgid "<option>--src-cache</option>"
msgstr "<option>--src-cache</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:288
+#: apt-cache.8.xml:289
msgid ""
"Select the file to store the source cache. The source is used only by "
"<literal>gencaches</literal> and it stores a parsed version of the package "
@@ -1565,18 +1732,18 @@ msgstr ""
"<literal>Dir::Cache::srcpkgcache</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:295 apt-ftparchive.1.xml:508 apt-get.8.xml:346
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:509 apt-get.8.xml:366
msgid "<option>-q</option>"
msgstr "<option>-q</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:295 apt-ftparchive.1.xml:508 apt-get.8.xml:346
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:509 apt-get.8.xml:366
msgid "<option>--quiet</option>"
msgstr "<option>--quiet</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:296
+#: apt-cache.8.xml:297
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quietness up to a maximum of 2. You can also use "
@@ -1589,18 +1756,18 @@ msgstr ""
"<literal>quiet</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:302
+#: apt-cache.8.xml:303
msgid "<option>-i</option>"
msgstr "<option>-i</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:302
+#: apt-cache.8.xml:303
msgid "<option>--important</option>"
msgstr "<option>--important</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:303
+#: apt-cache.8.xml:304
msgid ""
"Print only important dependencies; for use with unmet and depends. Causes "
"only Depends and Pre-Depends relations to be printed. Configuration Item: "
@@ -1611,18 +1778,18 @@ msgstr ""
"Cache::Important</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:308 apt-cdrom.8.xml:120 apt-get.8.xml:313
+#: apt-cache.8.xml:309 apt-cdrom.8.xml:121 apt-get.8.xml:333
msgid "<option>-f</option>"
msgstr "<option>-f</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:308
+#: apt-cache.8.xml:309
msgid "<option>--full</option>"
msgstr "<option>--full</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:309
+#: apt-cache.8.xml:310
msgid ""
"Print full package records when searching. Configuration Item: "
"<literal>APT::Cache::ShowFull</literal>."
@@ -1631,18 +1798,18 @@ msgstr ""
"ShowFull</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:313 apt-cdrom.8.xml:130
+#: apt-cache.8.xml:314 apt-cdrom.8.xml:131
msgid "<option>-a</option>"
msgstr "<option>-a</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:313
+#: apt-cache.8.xml:314
msgid "<option>--all-versions</option>"
msgstr "<option>--all-versions</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:314
+#: apt-cache.8.xml:315
msgid ""
"Print full records for all available versions. This is the default; to turn "
"it off, use <option>--no-all-versions</option>. If <option>--no-all-"
@@ -1658,18 +1825,18 @@ msgstr ""
"用できます。設定項目 - <literal>APT::Cache::AllVersions</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:322
+#: apt-cache.8.xml:323
msgid "<option>-g</option>"
msgstr "<option>-g</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:322
+#: apt-cache.8.xml:323
msgid "<option>--generate</option>"
msgstr "<option>--generate</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:323
+#: apt-cache.8.xml:324
msgid ""
"Perform automatic package cache regeneration, rather than use the cache as "
"it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -1681,18 +1848,18 @@ msgstr ""
"literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328
+#: apt-cache.8.xml:329
msgid "<option>--names-only</option>"
msgstr "<option>--names-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328 apt-cdrom.8.xml:138
+#: apt-cache.8.xml:329 apt-cdrom.8.xml:139
msgid "<option>-n</option>"
msgstr "<option>-n</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:329
+#: apt-cache.8.xml:330
msgid ""
"Only search on the package names, not the long descriptions. Configuration "
"Item: <literal>APT::Cache::NamesOnly</literal>."
@@ -1701,13 +1868,13 @@ msgstr ""
"Cache::NamesOnly</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:333
+#: apt-cache.8.xml:334
msgid "<option>--all-names</option>"
msgstr "<option>--all-names</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:334
+#: apt-cache.8.xml:335
msgid ""
"Make <literal>pkgnames</literal> print all names, including virtual packages "
"and missing dependencies. Configuration Item: <literal>APT::Cache::"
@@ -1717,13 +1884,13 @@ msgstr ""
"表示します。設定項目 - <literal>APT::Cache::AllNames</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:339
+#: apt-cache.8.xml:340
msgid "<option>--recurse</option>"
msgstr "<option>--recurse</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:340
+#: apt-cache.8.xml:341
msgid ""
"Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
"that all packages mentioned are printed once. Configuration Item: "
@@ -1734,13 +1901,13 @@ msgstr ""
"RecurseDepends</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:345
+#: apt-cache.8.xml:346
msgid "<option>--installed</option>"
msgstr "<option>--installed</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:347
+#: apt-cache.8.xml:348
msgid ""
"Limit the output of <literal>depends</literal> and <literal>rdepends</"
"literal> to packages which are currently installed. Configuration Item: "
@@ -1752,91 +1919,51 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:352 apt-cdrom.8.xml:149 apt-config.8.xml:97
-#: apt-extracttemplates.1.xml:66 apt-ftparchive.1.xml:546 apt-get.8.xml:534
-#: apt-sortpkgs.1.xml:63
+#: apt-cache.8.xml:353 apt-cdrom.8.xml:150 apt-config.8.xml:98
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:547 apt-get.8.xml:554
+#: apt-sortpkgs.1.xml:64
msgid "&apt-commonoptions;"
msgstr "&apt-commonoptions;"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:357 apt-get.8.xml:539 apt-key.8.xml:137 apt.conf.5.xml:824
+#: apt-cache.8.xml:358 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122
+#: apt.conf.5.xml:940 apt_preferences.5.xml:615
msgid "Files"
msgstr "ファイル"
-# type: Content of: <refentry><refsect1><para>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:359 apt-get.8.xml:541
-msgid "<filename>/etc/apt/sources.list</filename>"
-msgstr "<filename>/etc/apt/sources.list</filename>"
-
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:360 apt-get.8.xml:542
-msgid ""
-"Locations to fetch packages from. Configuration Item: <literal>Dir::Etc::"
-"SourceList</literal>."
-msgstr "パッケージの取得元。設定項目 - <literal>Dir::Etc::SourceList</literal>"
-
-# type: Content of: <refentry><refsect1><para>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:364 apt-get.8.xml:575
-msgid "<filename>&statedir;/lists/</filename>"
-msgstr "<filename>&statedir;/lists/</filename>"
-
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:365 apt-get.8.xml:576
-msgid ""
-"Storage area for state information for each package resource specified in "
-"&sources-list; Configuration Item: <literal>Dir::State::Lists</literal>."
-msgstr ""
-"&sources-list; に指定した、パッケージリソースごとの状態情報格納エリア。設定項"
-"目 - <literal>Dir::State::Lists</literal>"
-
-# type: Content of: <refentry><refsect1><para>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:370 apt-get.8.xml:581
-msgid "<filename>&statedir;/lists/partial/</filename>"
-msgstr "<filename>&statedir;/lists/partial/</filename>"
-
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:371 apt-get.8.xml:582
-msgid ""
-"Storage area for state information in transit. Configuration Item: "
-"<literal>Dir::State::Lists</literal> (implicit partial)."
+#. type: Content of: <refentry><refsect1><variablelist>
+#: apt-cache.8.xml:360
+msgid "&file-sourceslist; &file-statelists;"
msgstr ""
-"取得中状態情報格納エリア。設定項目 - <literal>Dir::State::Lists</literal> (必"
-"然的に不完全)"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:377 apt-cdrom.8.xml:154 apt-config.8.xml:102
-#: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:562 apt-get.8.xml:588
-#: apt-key.8.xml:161 apt-mark.8.xml:104 apt-secure.8.xml:180
-#: apt-sortpkgs.1.xml:68 apt.conf.5.xml:828 apt_preferences.5.xml:613
-#: sources.list.5.xml:220
+#: apt-cache.8.xml:365 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:946 apt_preferences.5.xml:622
+#: sources.list.5.xml:221
msgid "See Also"
msgstr "関連項目"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:378
+#: apt-cache.8.xml:366
msgid "&apt-conf;, &sources-list;, &apt-get;"
msgstr "&apt-conf;, &sources-list;, &apt-get;"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:382 apt-cdrom.8.xml:159 apt-config.8.xml:107
-#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:566 apt-get.8.xml:594
-#: apt-mark.8.xml:108 apt-sortpkgs.1.xml:72
+#: apt-cache.8.xml:370 apt-cdrom.8.xml:160 apt-config.8.xml:108
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:567 apt-get.8.xml:575
+#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
msgstr "診断メッセージ"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:383
+#: apt-cache.8.xml:371
msgid ""
"<command>apt-cache</command> returns zero on normal operation, decimal 100 "
"on error."
@@ -1855,19 +1982,19 @@ msgstr ""
# type: Content of: <refentry><refnamediv><refname>
#. type: Content of: <refentry><refnamediv><refname>
-#: apt-cdrom.8.xml:21 apt-cdrom.8.xml:27
+#: apt-cdrom.8.xml:21 apt-cdrom.8.xml:28
msgid "apt-cdrom"
msgstr "apt-cdrom"
# type: Content of: <refentry><refnamediv><refpurpose>
#. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cdrom.8.xml:28
+#: apt-cdrom.8.xml:29
msgid "APT CDROM management utility"
msgstr "APT CDROM 管理ユーティリティ"
# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-cdrom.8.xml:34
+#: apt-cdrom.8.xml:35
msgid ""
"<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
"<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></arg> "
@@ -1883,7 +2010,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:47
+#: apt-cdrom.8.xml:48
msgid ""
"<command>apt-cdrom</command> is used to add a new CDROM to APTs list of "
"available sources. <command>apt-cdrom</command> takes care of determining "
@@ -1897,7 +2024,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:54
+#: apt-cdrom.8.xml:55
msgid ""
"It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
"system, it cannot be done by hand. Furthermore each disk in a multi-cd set "
@@ -1908,13 +2035,13 @@ msgstr ""
"補正できるか評価しなければなりません。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:64
+#: apt-cdrom.8.xml:65
msgid "add"
msgstr "add"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:65
+#: apt-cdrom.8.xml:66
msgid ""
"<literal>add</literal> is used to add a new disc to the source list. It will "
"unmount the CDROM device, prompt for a disk to be inserted and then procceed "
@@ -1929,7 +2056,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:73
+#: apt-cdrom.8.xml:74
msgid ""
"APT uses a CDROM ID to track which disc is currently in the drive and "
"maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
@@ -1940,13 +2067,13 @@ msgstr ""
"ベースで管理します。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:80
+#: apt-cdrom.8.xml:81
msgid "ident"
msgstr "ident"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:81
+#: apt-cdrom.8.xml:82
msgid ""
"A debugging tool to report the identity of the current disc as well as the "
"stored file name"
@@ -1956,7 +2083,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:60
+#: apt-cdrom.8.xml:61
msgid ""
"Unless the <option>-h</option>, or <option>--help</option> option is given "
"one of the commands below must be present. <placeholder type=\"variablelist"
@@ -1967,23 +2094,23 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:90
+#: apt-cdrom.8.xml:91
msgid "Options"
msgstr "オプション"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:94 apt-ftparchive.1.xml:502 apt-get.8.xml:308
+#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:503 apt-get.8.xml:328
msgid "<option>-d</option>"
msgstr "<option>-d</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:94
+#: apt-cdrom.8.xml:95
msgid "<option>--cdrom</option>"
msgstr "<option>--cdrom</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:95
+#: apt-cdrom.8.xml:96
msgid ""
"Mount point; specify the location to mount the cdrom. This mount point must "
"be listed in <filename>/etc/fstab</filename> and properly configured. "
@@ -1994,18 +2121,18 @@ msgstr ""
"定項目 - <literal>Acquire::cdrom::mount</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:103
+#: apt-cdrom.8.xml:104
msgid "<option>-r</option>"
msgstr "<option>-r</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:103
+#: apt-cdrom.8.xml:104
msgid "<option>--rename</option>"
msgstr "<option>--rename</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:104
+#: apt-cdrom.8.xml:105
msgid ""
"Rename a disc; change the label of a disk or override the disks given label. "
"This option will cause <command>apt-cdrom</command> to prompt for a new "
@@ -2016,18 +2143,18 @@ msgstr ""
"ます。設定項目 - <literal>APT::CDROM::Rename</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:112 apt-get.8.xml:327
+#: apt-cdrom.8.xml:113 apt-get.8.xml:347
msgid "<option>-m</option>"
msgstr "<option>-m</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:112
+#: apt-cdrom.8.xml:113
msgid "<option>--no-mount</option>"
msgstr "<option>--no-mount</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:113
+#: apt-cdrom.8.xml:114
msgid ""
"No mounting; prevent <command>apt-cdrom</command> from mounting and "
"unmounting the mount point. Configuration Item: <literal>APT::CDROM::"
@@ -2038,13 +2165,13 @@ msgstr ""
"literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:120
+#: apt-cdrom.8.xml:121
msgid "<option>--fast</option>"
msgstr "<option>--fast</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:121
+#: apt-cdrom.8.xml:122
msgid ""
"Fast Copy; Assume the package files are valid and do not check every "
"package. This option should be used only if <command>apt-cdrom</command> has "
@@ -2057,13 +2184,13 @@ msgstr ""
"<literal>APT::CDROM::Fast</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:130
+#: apt-cdrom.8.xml:131
msgid "<option>--thorough</option>"
msgstr "<option>--thorough</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:131
+#: apt-cdrom.8.xml:132
msgid ""
"Thorough Package Scan; This option may be needed with some old Debian "
"1.1/1.2 discs that have Package files in strange places. It takes much "
@@ -2075,23 +2202,23 @@ msgstr ""
"できます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:139 apt-get.8.xml:358
+#: apt-cdrom.8.xml:140 apt-get.8.xml:378
msgid "<option>--just-print</option>"
msgstr "<option>--just-print</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:140 apt-get.8.xml:360
+#: apt-cdrom.8.xml:141 apt-get.8.xml:380
msgid "<option>--recon</option>"
msgstr "<option>--recon</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:141 apt-get.8.xml:361
+#: apt-cdrom.8.xml:142 apt-get.8.xml:381
msgid "<option>--no-act</option>"
msgstr "<option>--no-act</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:142
+#: apt-cdrom.8.xml:143
msgid ""
"No Changes; Do not change the &sources-list; file and do not write index "
"files. Everything is still checked however. Configuration Item: "
@@ -2103,13 +2230,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:155
+#: apt-cdrom.8.xml:156
msgid "&apt-conf;, &apt-get;, &sources-list;"
msgstr "&apt-conf;, &apt-get;, &sources-list;"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:160
+#: apt-cdrom.8.xml:161
msgid ""
"<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
"on error."
@@ -2119,19 +2246,19 @@ msgstr ""
# type: Content of: <refentry><refnamediv><refname>
#. type: Content of: <refentry><refnamediv><refname>
-#: apt-config.8.xml:22 apt-config.8.xml:28
+#: apt-config.8.xml:22 apt-config.8.xml:29
msgid "apt-config"
msgstr "apt-config"
# type: Content of: <refentry><refnamediv><refpurpose>
#. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-config.8.xml:29
+#: apt-config.8.xml:30
msgid "APT Configuration Query program"
msgstr "APT 設定取得プログラム"
# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-config.8.xml:35
+#: apt-config.8.xml:36
msgid ""
"<command>apt-config</command> <arg><option>-hv</option></arg> <arg><option>-"
"o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
@@ -2145,7 +2272,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:47
+#: apt-config.8.xml:48
msgid ""
"<command>apt-config</command> is an internal program used by various "
"portions of the APT suite to provide consistent configurability. It accesses "
@@ -2159,7 +2286,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:52 apt-ftparchive.1.xml:70
+#: apt-config.8.xml:53 apt-ftparchive.1.xml:71
msgid ""
"Unless the <option>-h</option>, or <option>--help</option> option is given "
"one of the commands below must be present."
@@ -2168,13 +2295,13 @@ msgstr ""
"下に挙げるコマンドが必要です。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-config.8.xml:57
+#: apt-config.8.xml:58
msgid "shell"
msgstr "shell"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:59
+#: apt-config.8.xml:60
msgid ""
"shell is used to access the configuration information from a shell script. "
"It is given pairs of arguments, the first being a shell variable and the "
@@ -2189,7 +2316,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-config.8.xml:67
+#: apt-config.8.xml:68
#, no-wrap
msgid ""
"OPTS=\"-f\"\n"
@@ -2202,7 +2329,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:72
+#: apt-config.8.xml:73
msgid ""
"This will set the shell environment variable $OPTS to the value of MyApp::"
"options with a default of <option>-f</option>."
@@ -2212,7 +2339,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:76
+#: apt-config.8.xml:77
msgid ""
"The configuration item may be postfixed with a /[fdbi]. f returns file "
"names, d returns directories, b returns true or false and i returns an "
@@ -2224,20 +2351,20 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:85
+#: apt-config.8.xml:86
msgid "Just show the contents of the configuration space."
msgstr "設定箇所の内容を表示するだけです。"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563
-#: apt-mark.8.xml:105 apt-sortpkgs.1.xml:69
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:564
+#: apt-sortpkgs.1.xml:70
msgid "&apt-conf;"
msgstr "&apt-conf;"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:108
+#: apt-config.8.xml:109
msgid ""
"<command>apt-config</command> returns zero on normal operation, decimal 100 "
"on error."
@@ -2247,7 +2374,7 @@ msgstr ""
# type: Content of: <refentry><refnamediv><refname>
#. type: Content of: <refentry><refnamediv><refname>
-#: apt-extracttemplates.1.xml:22 apt-extracttemplates.1.xml:28
+#: apt-extracttemplates.1.xml:22 apt-extracttemplates.1.xml:29
msgid "apt-extracttemplates"
msgstr "apt-extracttemplates"
@@ -2258,7 +2385,7 @@ msgstr "1"
# type: Content of: <refentry><refnamediv><refpurpose>
#. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-extracttemplates.1.xml:29
+#: apt-extracttemplates.1.xml:30
msgid "Utility to extract DebConf config and templates from Debian packages"
msgstr ""
"Debian パッケージから DebConf 設定と DebConf テンプレートを抽出するユーティリ"
@@ -2266,7 +2393,7 @@ msgstr ""
# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-extracttemplates.1.xml:35
+#: apt-extracttemplates.1.xml:36
msgid ""
"<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
"<arg><option>-t=<replaceable>temporary directory</replaceable></option></"
@@ -2280,7 +2407,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:43
+#: apt-extracttemplates.1.xml:44
msgid ""
"<command>apt-extracttemplates</command> will take one or more Debian package "
"files as input and write out (to a temporary directory) all associated "
@@ -2295,13 +2422,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:48
+#: apt-extracttemplates.1.xml:49
msgid "package version template-file config-script"
msgstr "package version template-file config-script"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:49
+#: apt-extracttemplates.1.xml:50
msgid ""
"template-file and config-script are written to the temporary directory "
"specified by the -t or --tempdir (<literal>APT::ExtractTemplates::TempDir</"
@@ -2314,18 +2441,18 @@ msgstr ""
"<filename>package.config.XXXX</filename> と言った形になります。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:59 apt-get.8.xml:468
+#: apt-extracttemplates.1.xml:60 apt-get.8.xml:488
msgid "<option>-t</option>"
msgstr "<option>-t</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:59
+#: apt-extracttemplates.1.xml:60
msgid "<option>--tempdir</option>"
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:61
+#: apt-extracttemplates.1.xml:62
msgid ""
"Temporary directory in which to write extracted debconf template files and "
"config scripts Configuration Item: <literal>APT::ExtractTemplates::TempDir</"
@@ -2336,7 +2463,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:78
+#: apt-extracttemplates.1.xml:79
msgid ""
"<command>apt-extracttemplates</command> returns zero on normal operation, "
"decimal 100 on error."
@@ -2346,19 +2473,19 @@ msgstr ""
# type: Content of: <refentry><refnamediv><refname>
#. type: Content of: <refentry><refnamediv><refname>
-#: apt-ftparchive.1.xml:22 apt-ftparchive.1.xml:28
+#: apt-ftparchive.1.xml:22 apt-ftparchive.1.xml:29
msgid "apt-ftparchive"
msgstr "apt-ftparchive"
# type: Content of: <refentry><refnamediv><refpurpose>
#. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-ftparchive.1.xml:29
+#: apt-ftparchive.1.xml:30
msgid "Utility to generate index files"
msgstr "インデックスファイル生成ユーティリティ"
# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-ftparchive.1.xml:35
+#: apt-ftparchive.1.xml:36
msgid ""
"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
@@ -2398,7 +2525,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:55
+#: apt-ftparchive.1.xml:56
msgid ""
"<command>apt-ftparchive</command> is the command line tool that generates "
"the index files that APT uses to access a distribution source. The index "
@@ -2411,7 +2538,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:59
+#: apt-ftparchive.1.xml:60
msgid ""
"<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
"program, incorporating its entire functionality via the <literal>packages</"
@@ -2426,7 +2553,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:65
+#: apt-ftparchive.1.xml:66
msgid ""
"Internally <command>apt-ftparchive</command> can make use of binary "
"databases to cache the contents of a .deb file and it does not rely on any "
@@ -2441,13 +2568,13 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:74
+#: apt-ftparchive.1.xml:75
msgid "packages"
msgstr "packages"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:76
+#: apt-ftparchive.1.xml:77
msgid ""
"The packages command generates a package file from a directory tree. It "
"takes the given directory and recursively searches it for .deb files, "
@@ -2461,20 +2588,20 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:81 apt-ftparchive.1.xml:105
+#: apt-ftparchive.1.xml:82 apt-ftparchive.1.xml:106
msgid ""
"The option <option>--db</option> can be used to specify a binary caching DB."
msgstr "<option>--db</option> オプションで、キャッシュ DB を指定できます。"
# type: Content of: <refentry><refnamediv><refname>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:84
+#: apt-ftparchive.1.xml:85
msgid "sources"
msgstr "sources"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:86
+#: apt-ftparchive.1.xml:87
msgid ""
"The <literal>sources</literal> command generates a source index file from a "
"directory tree. It takes the given directory and recursively searches it "
@@ -2488,7 +2615,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:91
+#: apt-ftparchive.1.xml:92
msgid ""
"If an override file is specified then a source override file will be looked "
"for with an extension of .src. The --source-override option can be used to "
@@ -2499,13 +2626,13 @@ msgstr ""
"override オプションを使用します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:96
+#: apt-ftparchive.1.xml:97
msgid "contents"
msgstr "contents"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:98
+#: apt-ftparchive.1.xml:99
msgid ""
"The <literal>contents</literal> command generates a contents file from a "
"directory tree. It takes the given directory and recursively searches it "
@@ -2522,13 +2649,13 @@ msgstr ""
"で出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:108
+#: apt-ftparchive.1.xml:109
msgid "release"
msgstr "release"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:110
+#: apt-ftparchive.1.xml:111
msgid ""
"The <literal>release</literal> command generates a Release file from a "
"directory tree. It recursively searches the given directory for Packages, "
@@ -2544,7 +2671,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:117
+#: apt-ftparchive.1.xml:118
msgid ""
"Values for the additional metadata fields in the Release file are taken from "
"the corresponding variables under <literal>APT::FTPArchive::Release</"
@@ -2563,13 +2690,13 @@ msgstr ""
"<literal>Description</literal> です。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:127
+#: apt-ftparchive.1.xml:128
msgid "generate"
msgstr "generate"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:129
+#: apt-ftparchive.1.xml:130
msgid ""
"The <literal>generate</literal> command is designed to be runnable from a "
"cron script and builds indexes according to the given config file. The "
@@ -2583,13 +2710,13 @@ msgstr ""
"のディレクトリから作成するかを指定する、柔軟な方法を提供します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:136 apt-get.8.xml:272
+#: apt-ftparchive.1.xml:137 apt-get.8.xml:292
msgid "clean"
msgstr "clean"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:138
+#: apt-ftparchive.1.xml:139
msgid ""
"The <literal>clean</literal> command tidies the databases used by the given "
"configuration file by removing any records that are no longer necessary."
@@ -2599,13 +2726,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:144
+#: apt-ftparchive.1.xml:145
msgid "The Generate Configuration"
msgstr "Generate 設定"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:146
+#: apt-ftparchive.1.xml:147
msgid ""
"The <literal>generate</literal> command uses a configuration file to "
"describe the archives that are going to be generated. It follows the typical "
@@ -2623,7 +2750,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:154
+#: apt-ftparchive.1.xml:155
msgid ""
"The generate configuration has 4 separate sections, each described below."
msgstr ""
@@ -2632,13 +2759,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:156
+#: apt-ftparchive.1.xml:157
msgid "Dir Section"
msgstr "Dir セクション"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:158
+#: apt-ftparchive.1.xml:159
msgid ""
"The <literal>Dir</literal> section defines the standard directories needed "
"to locate the files required during the generation process. These "
@@ -2651,13 +2778,13 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:163
+#: apt-ftparchive.1.xml:164
msgid "ArchiveDir"
msgstr "ArchiveDir"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:165
+#: apt-ftparchive.1.xml:166
msgid ""
"Specifies the root of the FTP archive, in a standard Debian configuration "
"this is the directory that contains the <filename>ls-LR</filename> and dist "
@@ -2667,36 +2794,36 @@ msgstr ""
"リには <filename>ls-LR</filename> と dist ノードがあります。"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:170
+#: apt-ftparchive.1.xml:171
msgid "OverrideDir"
msgstr "OverrideDir"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:172
+#: apt-ftparchive.1.xml:173
msgid "Specifies the location of the override files."
msgstr "オーバーライドファイルの場所を指定します。"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:175
+#: apt-ftparchive.1.xml:176
msgid "CacheDir"
msgstr "CacheDir"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:177
+#: apt-ftparchive.1.xml:178
msgid "Specifies the location of the cache files"
msgstr "キャッシュファイルの場所を指定します。"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:180
+#: apt-ftparchive.1.xml:181
msgid "FileListDir"
msgstr "FileListDir"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:182
+#: apt-ftparchive.1.xml:183
msgid ""
"Specifies the location of the file list files, if the <literal>FileList</"
"literal> setting is used below."
@@ -2706,13 +2833,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:188
+#: apt-ftparchive.1.xml:189
msgid "Default Section"
msgstr "Default セクション"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:190
+#: apt-ftparchive.1.xml:191
msgid ""
"The <literal>Default</literal> section specifies default values, and "
"settings that control the operation of the generator. Other sections may "
@@ -2724,13 +2851,13 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:194
+#: apt-ftparchive.1.xml:195
msgid "Packages::Compress"
msgstr "Packages::Compress"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:196
+#: apt-ftparchive.1.xml:197
msgid ""
"Sets the default compression schemes to use for the Package index files. It "
"is a string that contains a space separated list of at least one of: '.' (no "
@@ -2742,13 +2869,13 @@ msgstr ""
"法のデフォルトはすべて '. gzip' です。"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:202
+#: apt-ftparchive.1.xml:203
msgid "Packages::Extensions"
msgstr "Packages::Extensions"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:204
+#: apt-ftparchive.1.xml:205
msgid ""
"Sets the default list of file extensions that are package files. This "
"defaults to '.deb'."
@@ -2757,13 +2884,13 @@ msgstr ""
"deb' です。"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:208
+#: apt-ftparchive.1.xml:209
msgid "Sources::Compress"
msgstr "Sources::Compress"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:210
+#: apt-ftparchive.1.xml:211
msgid ""
"This is similar to <literal>Packages::Compress</literal> except that it "
"controls the compression for the Sources files."
@@ -2772,13 +2899,13 @@ msgstr ""
"指定します。"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:214
+#: apt-ftparchive.1.xml:215
msgid "Sources::Extensions"
msgstr "Sources::Extensions"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:216
+#: apt-ftparchive.1.xml:217
msgid ""
"Sets the default list of file extensions that are source files. This "
"defaults to '.dsc'."
@@ -2787,13 +2914,13 @@ msgstr ""
"す。"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:220
+#: apt-ftparchive.1.xml:221
msgid "Contents::Compress"
msgstr "Contents::Compress"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:222
+#: apt-ftparchive.1.xml:223
msgid ""
"This is similar to <literal>Packages::Compress</literal> except that it "
"controls the compression for the Contents files."
@@ -2802,13 +2929,13 @@ msgstr ""
"指定します。"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:226
+#: apt-ftparchive.1.xml:227
msgid "DeLinkLimit"
msgstr "DeLinkLimit"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:228
+#: apt-ftparchive.1.xml:229
msgid ""
"Specifies the number of kilobytes to delink (and replace with hard links) "
"per run. This is used in conjunction with the per-section <literal>External-"
@@ -2820,13 +2947,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:233
+#: apt-ftparchive.1.xml:234
msgid "FileMode"
msgstr "FileMode"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:235
+#: apt-ftparchive.1.xml:236
msgid ""
"Specifies the mode of all created index files. It defaults to 0644. All "
"index files are set to this mode with no regard to the umask."
@@ -2836,13 +2963,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:242
+#: apt-ftparchive.1.xml:243
msgid "TreeDefault Section"
msgstr "TreeDefault セクション"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:244
+#: apt-ftparchive.1.xml:245
msgid ""
"Sets defaults specific to <literal>Tree</literal> sections. All of these "
"variables are substitution variables and have the strings $(DIST), "
@@ -2853,13 +2980,13 @@ msgstr ""
"に展開します。"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:249
+#: apt-ftparchive.1.xml:250
msgid "MaxContentsChange"
msgstr "MaxContentsChange"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:251
+#: apt-ftparchive.1.xml:252
msgid ""
"Sets the number of kilobytes of contents files that are generated each day. "
"The contents files are round-robined so that over several days they will all "
@@ -2870,13 +2997,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:256
+#: apt-ftparchive.1.xml:257
msgid "ContentsAge"
msgstr "ContentsAge"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:258
+#: apt-ftparchive.1.xml:259
msgid ""
"Controls the number of days a contents file is allowed to be checked without "
"changing. If this limit is passed the mtime of the contents file is updated. "
@@ -2893,13 +3020,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:267
+#: apt-ftparchive.1.xml:268
msgid "Directory"
msgstr "Directory"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:269
+#: apt-ftparchive.1.xml:270
msgid ""
"Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
"$(SECTION)/binary-$(ARCH)/</filename>"
@@ -2909,13 +3036,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:273
+#: apt-ftparchive.1.xml:274
msgid "SrcDirectory"
msgstr "SrcDirectory"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:275
+#: apt-ftparchive.1.xml:276
msgid ""
"Sets the top of the source package directory tree. Defaults to <filename>"
"$(DIST)/$(SECTION)/source/</filename>"
@@ -2925,13 +3052,13 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:279 apt-ftparchive.1.xml:405
+#: apt-ftparchive.1.xml:280 apt-ftparchive.1.xml:406
msgid "Packages"
msgstr "Packages"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:281
+#: apt-ftparchive.1.xml:282
msgid ""
"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
"binary-$(ARCH)/Packages</filename>"
@@ -2941,13 +3068,13 @@ msgstr ""
# type: Content of: <refentry><refnamediv><refname>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:285 apt-ftparchive.1.xml:410
+#: apt-ftparchive.1.xml:286 apt-ftparchive.1.xml:411
msgid "Sources"
msgstr "Sources"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:287
+#: apt-ftparchive.1.xml:288
msgid ""
"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
"source/Sources</filename>"
@@ -2956,13 +3083,13 @@ msgstr ""
"$(SECTION)/source/Sources</filename> です。"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:291
+#: apt-ftparchive.1.xml:292
msgid "InternalPrefix"
msgstr "InternalPrefix"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:293
+#: apt-ftparchive.1.xml:294
msgid ""
"Sets the path prefix that causes a symlink to be considered an internal link "
"instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
@@ -2973,13 +3100,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:298 apt-ftparchive.1.xml:416
+#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:417
msgid "Contents"
msgstr "Contents"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:300
+#: apt-ftparchive.1.xml:301
msgid ""
"Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
"</filename>. If this setting causes multiple Packages files to map onto a "
@@ -2992,24 +3119,24 @@ msgstr ""
"ftparchive</command> は自動でパッケージファイルをまとめます。"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:307
+#: apt-ftparchive.1.xml:308
msgid "Contents::Header"
msgstr "Contents::Header"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:309
+#: apt-ftparchive.1.xml:310
msgid "Sets header file to prepend to the contents output."
msgstr "contents の出力に付けるヘッダファイルを設定します。"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:312 apt-ftparchive.1.xml:441
+#: apt-ftparchive.1.xml:313 apt-ftparchive.1.xml:442
msgid "BinCacheDB"
msgstr "BinCacheDB"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:314
+#: apt-ftparchive.1.xml:315
msgid ""
"Sets the binary cache database to use for this section. Multiple sections "
"can share the same database."
@@ -3019,13 +3146,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:318
+#: apt-ftparchive.1.xml:319
msgid "FileList"
msgstr "FileList"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:320
+#: apt-ftparchive.1.xml:321
msgid ""
"Specifies that instead of walking the directory tree, <command>apt-"
"ftparchive</command> should read the list of files from the given file. "
@@ -3037,13 +3164,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:325
+#: apt-ftparchive.1.xml:326
msgid "SourceFileList"
msgstr "SourceFileList"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:327
+#: apt-ftparchive.1.xml:328
msgid ""
"Specifies that instead of walking the directory tree, <command>apt-"
"ftparchive</command> should read the list of files from the given file. "
@@ -3056,13 +3183,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:335
+#: apt-ftparchive.1.xml:336
msgid "Tree Section"
msgstr "Tree セクション"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:337
+#: apt-ftparchive.1.xml:338
msgid ""
"The <literal>Tree</literal> section defines a standard Debian file tree "
"which consists of a base directory, then multiple sections in that base "
@@ -3077,7 +3204,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:342
+#: apt-ftparchive.1.xml:343
msgid ""
"The <literal>Tree</literal> section takes a scope tag which sets the "
"<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@ -3091,7 +3218,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:347
+#: apt-ftparchive.1.xml:348
msgid ""
"All of the settings defined in the <literal>TreeDefault</literal> section "
"can be use in a <literal>Tree</literal> section as well as three new "
@@ -3102,7 +3229,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><informalexample>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:350
+#: apt-ftparchive.1.xml:351
msgid ""
"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
"command> performs an operation similar to:"
@@ -3112,7 +3239,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting>
-#: apt-ftparchive.1.xml:353
+#: apt-ftparchive.1.xml:354
#, no-wrap
msgid ""
"for i in Sections do \n"
@@ -3125,13 +3252,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:359
+#: apt-ftparchive.1.xml:360
msgid "Sections"
msgstr "Sections"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:361
+#: apt-ftparchive.1.xml:362
msgid ""
"This is a space separated list of sections which appear under the "
"distribution, typically this is something like <literal>main contrib non-"
@@ -3142,13 +3269,13 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:366
+#: apt-ftparchive.1.xml:367
msgid "Architectures"
msgstr "Architectures"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:368
+#: apt-ftparchive.1.xml:369
msgid ""
"This is a space separated list of all the architectures that appear under "
"search section. The special architecture 'source' is used to indicate that "
@@ -3160,13 +3287,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:373 apt-ftparchive.1.xml:421
+#: apt-ftparchive.1.xml:374 apt-ftparchive.1.xml:422
msgid "BinOverride"
msgstr "BinOverride"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:375
+#: apt-ftparchive.1.xml:376
msgid ""
"Sets the binary override file. The override file contains section, priority "
"and maintainer address information."
@@ -3176,13 +3303,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:379 apt-ftparchive.1.xml:426
+#: apt-ftparchive.1.xml:380 apt-ftparchive.1.xml:427
msgid "SrcOverride"
msgstr "SrcOverride"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:381
+#: apt-ftparchive.1.xml:382
msgid ""
"Sets the source override file. The override file contains section "
"information."
@@ -3192,37 +3319,37 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:385 apt-ftparchive.1.xml:431
+#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:432
msgid "ExtraOverride"
msgstr "ExtraOverride"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:387 apt-ftparchive.1.xml:433
+#: apt-ftparchive.1.xml:388 apt-ftparchive.1.xml:434
msgid "Sets the binary extra override file."
msgstr "バイナリ特別オーバーライドファイルを設定します。"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:390 apt-ftparchive.1.xml:436
+#: apt-ftparchive.1.xml:391 apt-ftparchive.1.xml:437
msgid "SrcExtraOverride"
msgstr "SrcExtraOverride"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:438
+#: apt-ftparchive.1.xml:393 apt-ftparchive.1.xml:439
msgid "Sets the source extra override file."
msgstr "ソース特別オーバーライドファイルを設定します。"
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:397
+#: apt-ftparchive.1.xml:398
msgid "BinDirectory Section"
msgstr "BinDirectory セクション"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:399
+#: apt-ftparchive.1.xml:400
msgid ""
"The <literal>bindirectory</literal> section defines a binary directory tree "
"with no special structure. The scope tag specifies the location of the "
@@ -3237,13 +3364,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:407
+#: apt-ftparchive.1.xml:408
msgid "Sets the Packages file output."
msgstr "Packages ファイルの出力先を設定します。"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:412
+#: apt-ftparchive.1.xml:413
msgid ""
"Sets the Sources file output. At least one of <literal>Packages</literal> or "
"<literal>Sources</literal> is required."
@@ -3253,59 +3380,59 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:418
+#: apt-ftparchive.1.xml:419
msgid "Sets the Contents file output. (optional)"
msgstr "Contents ファイルの出力先を設定します。(オプション)"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:423
+#: apt-ftparchive.1.xml:424
msgid "Sets the binary override file."
msgstr "バイナリオーバーライドファイルを設定します。"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:428
+#: apt-ftparchive.1.xml:429
msgid "Sets the source override file."
msgstr "ソースオーバーライドファイルを設定します。"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:443
+#: apt-ftparchive.1.xml:444
msgid "Sets the cache DB."
msgstr "キャッシュ DB を設定します。"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:446
+#: apt-ftparchive.1.xml:447
msgid "PathPrefix"
msgstr "PathPrefix"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:448
+#: apt-ftparchive.1.xml:449
msgid "Appends a path to all the output paths."
msgstr "全出力パスに付加するパス。"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:451
+#: apt-ftparchive.1.xml:452
msgid "FileList, SourceFileList"
msgstr "FileList, SourceFileList"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:453
+#: apt-ftparchive.1.xml:454
msgid "Specifies the file list file."
msgstr "ファイル一覧ファイルを指定します。"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:460
+#: apt-ftparchive.1.xml:461
msgid "The Binary Override File"
msgstr "バイナリオーバーライドファイル"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:461
+#: apt-ftparchive.1.xml:462
msgid ""
"The binary override file is fully compatible with &dpkg-scanpackages;. It "
"contains 4 fields separated by spaces. The first field is the package name, "
@@ -3320,20 +3447,20 @@ msgstr ""
"す。"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:467
+#: apt-ftparchive.1.xml:468
#, no-wrap
msgid "old [// oldn]* => new"
msgstr "old [// oldn]* => new"
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:469
+#: apt-ftparchive.1.xml:470
#, no-wrap
msgid "new"
msgstr "new"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:466
+#: apt-ftparchive.1.xml:467
msgid ""
"The general form of the maintainer field is: <placeholder type="
"\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
@@ -3351,13 +3478,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:477
+#: apt-ftparchive.1.xml:478
msgid "The Source Override File"
msgstr "ソースオーバーライドファイル"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:479
+#: apt-ftparchive.1.xml:480
msgid ""
"The source override file is fully compatible with &dpkg-scansources;. It "
"contains 2 fields separated by spaces. The first fields is the source "
@@ -3369,13 +3496,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:484
+#: apt-ftparchive.1.xml:485
msgid "The Extra Override File"
msgstr "特別オーバーライドファイル"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:486
+#: apt-ftparchive.1.xml:487
msgid ""
"The extra override file allows any arbitrary tag to be added or replaced in "
"the output. It has 3 columns, the first is the package, the second is the "
@@ -3385,13 +3512,13 @@ msgstr ""
"す。3 列からなり、先頭はパッケージ、2番目はタグ、残りは新しい値です。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:495
+#: apt-ftparchive.1.xml:496
msgid "<option>--md5</option>"
msgstr "<option>--md5</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:497
+#: apt-ftparchive.1.xml:498
msgid ""
"Generate MD5 sums. This defaults to on, when turned off the generated index "
"files will not have MD5Sum fields where possible. Configuration Item: "
@@ -3402,13 +3529,13 @@ msgstr ""
"FTPArchive::MD5</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:502
+#: apt-ftparchive.1.xml:503
msgid "<option>--db</option>"
msgstr "<option>--db</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:504
+#: apt-ftparchive.1.xml:505
msgid ""
"Use a binary caching DB. This has no effect on the generate command. "
"Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -3418,7 +3545,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:510
+#: apt-ftparchive.1.xml:511
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3431,13 +3558,13 @@ msgstr ""
"<literal>quiet</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:516
+#: apt-ftparchive.1.xml:517
msgid "<option>--delink</option>"
msgstr "<option>--delink</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:518
+#: apt-ftparchive.1.xml:519
msgid ""
"Perform Delinking. If the <literal>External-Links</literal> setting is used "
"then this option actually enables delinking of the files. It defaults to on "
@@ -3450,13 +3577,13 @@ msgstr ""
"<literal>APT::FTPArchive::DeLinkAct</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:524
+#: apt-ftparchive.1.xml:525
msgid "<option>--contents</option>"
msgstr "<option>--contents</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:526
+#: apt-ftparchive.1.xml:527
msgid ""
"Perform contents generation. When this option is set and package indexes are "
"being generated with a cache DB then the file listing will also be extracted "
@@ -3471,13 +3598,13 @@ msgstr ""
"<literal>APT::FTPArchive::Contents</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:534
+#: apt-ftparchive.1.xml:535
msgid "<option>--source-override</option>"
msgstr "<option>--source-override</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:536
+#: apt-ftparchive.1.xml:537
msgid ""
"Select the source override file to use with the <literal>sources</literal> "
"command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -3487,13 +3614,13 @@ msgstr ""
"選択します。設定項目 - <literal>APT::FTPArchive::SourceOverride</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:540
+#: apt-ftparchive.1.xml:541
msgid "<option>--readonly</option>"
msgstr "<option>--readonly</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:542
+#: apt-ftparchive.1.xml:543
msgid ""
"Make the caching databases read only. Configuration Item: <literal>APT::"
"FTPArchive::ReadOnlyDB</literal>."
@@ -3503,21 +3630,21 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:551 apt.conf.5.xml:818 apt_preferences.5.xml:460
-#: sources.list.5.xml:180
+#: apt-ftparchive.1.xml:552 apt.conf.5.xml:934 apt_preferences.5.xml:462
+#: sources.list.5.xml:181
msgid "Examples"
msgstr "サンプル"
# type: Content of: <refentry><refsect1><para><programlisting>
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:557
+#: apt-ftparchive.1.xml:558
#, no-wrap
msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
msgstr "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:553
+#: apt-ftparchive.1.xml:554
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3527,7 +3654,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:567
+#: apt-ftparchive.1.xml:568
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -3547,18 +3674,50 @@ msgstr ""
# type: Content of: <refentry><refnamediv><refname>
#. type: Content of: <refentry><refnamediv><refname>
-#: apt-get.8.xml:22 apt-get.8.xml:28
+#: apt-get.8.xml:22 apt-get.8.xml:29
msgid "apt-get"
msgstr "apt-get"
# type: Content of: <refentry><refnamediv><refpurpose>
#. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-get.8.xml:29
+#: apt-get.8.xml:30
msgid "APT package handling utility -- command-line interface"
msgstr "APT パッケージ操作ユーティリティ -- コマンドラインインターフェース"
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-get.8.xml:35
+#: 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> "
@@ -3579,9 +3738,12 @@ msgid ""
"\"><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 "
+"\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
+"choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> <arg "
+"choice='plain'> /<replaceable>target_release_name</replaceable> </arg> <arg "
+"choice='plain'> /<replaceable>target_release_codename</replaceable> </arg> </"
+"group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=\"plain"
+"\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
"choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
"choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
"choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
@@ -3620,7 +3782,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:115
+#: apt-get.8.xml:126
msgid ""
"<command>apt-get</command> is the command-line tool for handling packages, "
"and may be considered the user's \"back-end\" to other tools using the APT "
@@ -3633,13 +3795,13 @@ msgstr ""
"&gnome-apt;, &wajig; などがあります。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:124 apt-key.8.xml:122
+#: apt-get.8.xml:135 apt-key.8.xml:123
msgid "update"
msgstr "update"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:125
+#: apt-get.8.xml:136
msgid ""
"<literal>update</literal> is used to resynchronize the package index files "
"from their sources. The indexes of available packages are fetched from the "
@@ -3662,13 +3824,13 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:136
+#: apt-get.8.xml:147
msgid "upgrade"
msgstr "upgrade"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:137
+#: apt-get.8.xml:148
msgid ""
"<literal>upgrade</literal> is used to install the newest versions of all "
"packages currently installed on the system from the sources enumerated in "
@@ -3692,13 +3854,13 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:149
+#: apt-get.8.xml:160
msgid "dselect-upgrade"
msgstr "dselect-upgrade"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:150
+#: apt-get.8.xml:161
msgid ""
"<literal>dselect-upgrade</literal> is used in conjunction with the "
"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -3716,13 +3878,13 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:159
+#: apt-get.8.xml:170
msgid "dist-upgrade"
msgstr "dist-upgrade"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:160
+#: apt-get.8.xml:171
msgid ""
"<literal>dist-upgrade</literal> in addition to performing the function of "
"<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -3746,13 +3908,13 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:172
+#: apt-get.8.xml:183
msgid "install"
msgstr "install"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:174
+#: apt-get.8.xml:185
msgid ""
"<literal>install</literal> is followed by one or more packages desired for "
"installation or upgrading. Each package is a package name, not a fully "
@@ -3779,7 +3941,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:192
+#: apt-get.8.xml:203
msgid ""
"A specific version of a package can be selected for installation by "
"following the package name with an equals and the version of the package to "
@@ -3797,7 +3959,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:199
+#: apt-get.8.xml:210
msgid ""
"Both of the version selection mechanisms can downgrade packages and must be "
"used with care."
@@ -3806,7 +3968,7 @@ msgstr ""
"ばなりません。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:202
+#: apt-get.8.xml:213
msgid ""
"This is also the target to use if you want to upgrade one or more already-"
"installed packages without upgrading every package you have on your system. "
@@ -3819,7 +3981,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:213
+#: apt-get.8.xml:224
msgid ""
"Finally, the &apt-preferences; mechanism allows you to create an alternative "
"installation policy for individual packages."
@@ -3829,7 +3991,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:217
+#: apt-get.8.xml:228
msgid ""
"If no package matches the given expression and the expression contains one "
"of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@ -3846,13 +4008,13 @@ msgstr ""
"ば、'^' や '$' を付けるか、もっと詳しい正規表現を指定してください。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:226
+#: apt-get.8.xml:237
msgid "remove"
msgstr "remove"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:227
+#: apt-get.8.xml:238
msgid ""
"<literal>remove</literal> is identical to <literal>install</literal> except "
"that packages are removed instead of installed. Note the removing a package "
@@ -3867,13 +4029,13 @@ msgstr ""
"トールします。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:234
+#: apt-get.8.xml:245
msgid "purge"
msgstr "purge"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:235
+#: apt-get.8.xml:246
msgid ""
"<literal>purge</literal> is identical to <literal>remove</literal> except "
"that packages are removed and purged (any configuration files are deleted "
@@ -3884,24 +4046,34 @@ msgstr ""
# type: Content of: <refentry><refnamediv><refname>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:239
+#: apt-get.8.xml:250
msgid "source"
msgstr "source"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:240
+#: 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 "
"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."
+"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."
msgstr ""
"<literal>source</literal> は、ソースパッケージを取得するのに <command>apt-"
"get</command> します。APT はどのソースパッケージを取得するか決定するよう、利"
@@ -3913,9 +4085,28 @@ msgstr ""
"された場合、dpkg-buildpackage を用いてバイナリ .deb ファイルへコンパイルを行"
"います。--download-only の場合はソースパッケージを展開しません。"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:259
+msgid ""
+"Source packages are tracked separately from binary packages via <literal>deb-"
+"src</literal> type lines in the &sources-list; file. This means that you "
+"will need to add such a line for each repository you want to get sources "
+"from. If you don't do this you will properly get another (newer, older or "
+"none) source version than the one you have installed or could install."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:266
+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."
+msgstr ""
+
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:251
+#: apt-get.8.xml:271
msgid ""
"A specific source version can be retrieved by postfixing the source name "
"with an equals and then the version to fetch, similar to the mechanism used "
@@ -3930,7 +4121,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:257
+#: apt-get.8.xml:277
msgid ""
"Note that source packages are not tracked like binary packages, they exist "
"only in the current directory and are similar to downloading source tar "
@@ -3940,13 +4131,13 @@ msgstr ""
"展開されることに注意してください。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:262
+#: apt-get.8.xml:282
msgid "build-dep"
msgstr "build-dep"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:263
+#: apt-get.8.xml:283
msgid ""
"<literal>build-dep</literal> causes apt-get to install/remove packages in an "
"attempt to satisfy the build dependencies for a source package."
@@ -3955,13 +4146,13 @@ msgstr ""
"に、パッケージのインストール・削除を行います。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:267
+#: apt-get.8.xml:287
msgid "check"
msgstr "check"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:268
+#: apt-get.8.xml:288
msgid ""
"<literal>check</literal> is a diagnostic tool; it updates the package cache "
"and checks for broken dependencies."
@@ -3971,7 +4162,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:273
+#: apt-get.8.xml:293
msgid ""
"<literal>clean</literal> clears out the local repository of retrieved "
"package files. It removes everything but the lock file from "
@@ -3989,13 +4180,13 @@ msgstr ""
"<literal>apt-get clean</literal> を実行したくなるでしょう。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:282
+#: apt-get.8.xml:302
msgid "autoclean"
msgstr "autoclean"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:283
+#: apt-get.8.xml:303
msgid ""
"Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
"local repository of retrieved package files. The difference is that it only "
@@ -4014,13 +4205,13 @@ msgstr ""
"防げます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:292
+#: apt-get.8.xml:312
msgid "autoremove"
msgstr "autoremove"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:293
+#: apt-get.8.xml:313
msgid ""
"<literal>autoremove</literal> is used to remove packages that were "
"automatically installed to satisfy dependencies for some package and that "
@@ -4030,13 +4221,13 @@ msgstr ""
"され、もう必要なくなったパッケージを削除するのに使用します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:303 apt-get.8.xml:409
+#: apt-get.8.xml:323 apt-get.8.xml:429
msgid "<option>--no-install-recommends</option>"
msgstr "<option>--no-install-recommends</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:304
+#: apt-get.8.xml:324
msgid ""
"Do not consider recommended packages as a dependency for installing. "
"Configuration Item: <literal>APT::Install-Recommends</literal>."
@@ -4045,13 +4236,13 @@ msgstr ""
"<literal>APT::Install-Recommends</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:308
+#: apt-get.8.xml:328
msgid "<option>--download-only</option>"
msgstr "<option>--download-only</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:309
+#: apt-get.8.xml:329
msgid ""
"Download only; package files are only retrieved, not unpacked or installed. "
"Configuration Item: <literal>APT::Get::Download-Only</literal>."
@@ -4060,13 +4251,13 @@ msgstr ""
"いません。設定項目 - <literal>APT::Get::Download-Only</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:313
+#: apt-get.8.xml:333
msgid "<option>--fix-broken</option>"
msgstr "<option>--fix-broken</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:314
+#: apt-get.8.xml:334
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
@@ -4092,18 +4283,18 @@ msgstr ""
"literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:327
+#: apt-get.8.xml:347
msgid "<option>--ignore-missing</option>"
msgstr "<option>--ignore-missing</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:328
+#: apt-get.8.xml:348
msgid "<option>--fix-missing</option>"
msgstr "<option>--fix-missing</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:329
+#: apt-get.8.xml:349
msgid ""
"Ignore missing packages; If packages cannot be retrieved or fail the "
"integrity check after retrieval (corrupted package files), hold back those "
@@ -4122,13 +4313,13 @@ msgstr ""
"Get::Fix-Missing</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:339
+#: apt-get.8.xml:359
msgid "<option>--no-download</option>"
msgstr "<option>--no-download</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:340
+#: apt-get.8.xml:360
msgid ""
"Disables downloading of packages. This is best used with <option>--ignore-"
"missing</option> to force APT to use only the .debs it has already "
@@ -4140,7 +4331,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:347
+#: apt-get.8.xml:367
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -4159,18 +4350,18 @@ msgstr ""
"literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:357
+#: apt-get.8.xml:377
msgid "<option>--simulate</option>"
msgstr "<option>--simulate</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:359
+#: apt-get.8.xml:379
msgid "<option>--dry-run</option>"
msgstr "<option>--dry-run</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:362
+#: apt-get.8.xml:382
msgid ""
"No action; perform a simulation of events that would occur but do not "
"actually change the system. Configuration Item: <literal>APT::Get::"
@@ -4180,19 +4371,19 @@ msgstr ""
"行いません。設定項目 - <literal>APT::Get::Simulate</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:366
+#: apt-get.8.xml:386
msgid ""
"Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
-"literal>) automatical. Also a notice will be displayed indicating that this "
+"literal>) automatic. Also a notice will be displayed indicating that this "
"is only a simulation, if the option <literal>APT::Get::Show-User-Simulation-"
-"Note</literal> is set (Default: true) Neigther NoLocking nor the notice "
+"Note</literal> is set (Default: true). Neither NoLocking nor the notice "
"will be triggered if run as root (root should know what he is doing without "
"further warnings by <literal>apt-get</literal>)."
msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:372
+#: apt-get.8.xml:392
msgid ""
"Simulate prints out a series of lines each one representing a dpkg "
"operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@ -4204,23 +4395,23 @@ msgstr ""
"空の角カッコは大した問題ではないことを表します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:379
+#: apt-get.8.xml:399
msgid "<option>-y</option>"
msgstr "<option>-y</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:379
+#: apt-get.8.xml:399
msgid "<option>--yes</option>"
msgstr "<option>--yes</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:380
+#: apt-get.8.xml:400
msgid "<option>--assume-yes</option>"
msgstr "<option>--assume-yes</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:381
+#: apt-get.8.xml:401
msgid ""
"Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
"non-interactively. If an undesirable situation, such as changing a held "
@@ -4234,18 +4425,18 @@ msgstr ""
"定項目 - <literal>APT::Get::Assume-Yes</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:388
+#: apt-get.8.xml:408
msgid "<option>-u</option>"
msgstr "<option>-u</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:388
+#: apt-get.8.xml:408
msgid "<option>--show-upgraded</option>"
msgstr "<option>--show-upgraded</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:389
+#: apt-get.8.xml:409
msgid ""
"Show upgraded packages; Print out a list of all packages that are to be "
"upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
@@ -4254,18 +4445,18 @@ msgstr ""
"<literal>APT::Get::Show-Upgraded</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:394
+#: apt-get.8.xml:414
msgid "<option>-V</option>"
msgstr "<option>-V</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:394
+#: apt-get.8.xml:414
msgid "<option>--verbose-versions</option>"
msgstr "<option>--verbose-versions</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:395
+#: apt-get.8.xml:415
msgid ""
"Show full versions for upgraded and installed packages. Configuration Item: "
"<literal>APT::Get::Show-Versions</literal>."
@@ -4274,23 +4465,23 @@ msgstr ""
"<literal>APT::Get::Show-Versions</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:399
+#: apt-get.8.xml:419
msgid "<option>-b</option>"
msgstr "<option>-b</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:399
+#: apt-get.8.xml:419
msgid "<option>--compile</option>"
msgstr "<option>--compile</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:400
+#: apt-get.8.xml:420
msgid "<option>--build</option>"
msgstr "<option>--build</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:401
+#: apt-get.8.xml:421
msgid ""
"Compile source packages after downloading them. Configuration Item: "
"<literal>APT::Get::Compile</literal>."
@@ -4299,28 +4490,28 @@ msgstr ""
"Get::Compile</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:405
+#: apt-get.8.xml:425
msgid "<option>--install-recommends</option>"
msgstr "<option>--install-recommends</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:406
+#: apt-get.8.xml:426
msgid "Also install recommended packages."
msgstr "「推奨」パッケージもインストールします。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:410
+#: apt-get.8.xml:430
msgid "Do not install recommended packages."
msgstr "「推奨」パッケージをインストールしません。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:413
+#: apt-get.8.xml:433
msgid "<option>--ignore-hold</option>"
msgstr "<option>--ignore-hold</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:414
+#: apt-get.8.xml:434
msgid ""
"Ignore package Holds; This causes <command>apt-get</command> to ignore a "
"hold placed on a package. This may be useful in conjunction with "
@@ -4333,13 +4524,13 @@ msgstr ""
"Hold</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:420
+#: apt-get.8.xml:440
msgid "<option>--no-upgrade</option>"
msgstr "<option>--no-upgrade</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:421
+#: apt-get.8.xml:441
msgid ""
"Do not upgrade packages; When used in conjunction with <literal>install</"
"literal>, <literal>no-upgrade</literal> will prevent packages on the command "
@@ -4351,13 +4542,13 @@ msgstr ""
"ある場合に更新を行いません。設定項目 - <literal>APT::Get::Upgrade</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:427
+#: apt-get.8.xml:447
msgid "<option>--force-yes</option>"
msgstr "<option>--force-yes</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:428
+#: apt-get.8.xml:448
msgid ""
"Force yes; This is a dangerous option that will cause apt to continue "
"without prompting if it is doing something potentially harmful. It should "
@@ -4371,13 +4562,13 @@ msgstr ""
"ねません! 設定項目 - <literal>APT::Get::force-yes</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:435
+#: apt-get.8.xml:455
msgid "<option>--print-uris</option>"
msgstr "<option>--print-uris</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:436
+#: apt-get.8.xml:456
msgid ""
"Instead of fetching the files to install their URIs are printed. Each URI "
"will have the path, the destination file name, the size and the expected md5 "
@@ -4398,13 +4589,13 @@ msgstr ""
"Print-URIs</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:446
+#: apt-get.8.xml:466
msgid "<option>--purge</option>"
msgstr "<option>--purge</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:447
+#: apt-get.8.xml:467
msgid ""
"Use purge instead of remove for anything that would be removed. An asterisk "
"(\"*\") will be displayed next to packages which are scheduled to be purged. "
@@ -4417,13 +4608,13 @@ msgstr ""
"<literal>APT::Get::Purge</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:454
+#: apt-get.8.xml:474
msgid "<option>--reinstall</option>"
msgstr "<option>--reinstall</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:455
+#: apt-get.8.xml:475
msgid ""
"Re-Install packages that are already installed and at the newest version. "
"Configuration Item: <literal>APT::Get::ReInstall</literal>."
@@ -4432,13 +4623,13 @@ msgstr ""
"定項目 - <literal>APT::Get::ReInstall</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:459
+#: apt-get.8.xml:479
msgid "<option>--list-cleanup</option>"
msgstr "<option>--list-cleanup</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:460
+#: apt-get.8.xml:480
msgid ""
"This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
"it off. When on <command>apt-get</command> will automatically manage the "
@@ -4454,18 +4645,18 @@ msgstr ""
"する時ぐらいでしょう。設定項目 - <literal>APT::Get::List-Cleanup</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:469
+#: apt-get.8.xml:489
msgid "<option>--target-release</option>"
msgstr "<option>--target-release</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:470
+#: apt-get.8.xml:490
msgid "<option>--default-release</option>"
msgstr "<option>--default-release</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:471
+#: apt-get.8.xml:491
msgid ""
"This option controls the default input to the policy engine, it creates a "
"default pin at priority 990 using the specified release string. This "
@@ -4487,13 +4678,13 @@ msgstr ""
"Release</literal>。&apt-preferences; のマニュアルページもご覧ください。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:484
+#: apt-get.8.xml:504
msgid "<option>--trivial-only</option>"
msgstr "<option>--trivial-only</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:486
+#: apt-get.8.xml:506
msgid ""
"Only perform operations that are 'trivial'. Logically this can be considered "
"related to <option>--assume-yes</option>, where <option>--assume-yes</"
@@ -4506,13 +4697,13 @@ msgstr ""
"目 - <literal>APT::Get::Trivial-Only</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:492
+#: apt-get.8.xml:512
msgid "<option>--no-remove</option>"
msgstr "<option>--no-remove</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:493
+#: apt-get.8.xml:513
msgid ""
"If any packages are to be removed apt-get immediately aborts without "
"prompting. Configuration Item: <literal>APT::Get::Remove</literal>."
@@ -4521,13 +4712,13 @@ msgstr ""
"項目 - <literal>APT::Get::Remove</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:498
+#: apt-get.8.xml:518
msgid "<option>--auto-remove</option>"
msgstr "<option>--auto-remove</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:499
+#: apt-get.8.xml:519
msgid ""
"If the command is either <literal>install</literal> or <literal>remove</"
"literal>, then this option acts like running <literal>autoremove</literal> "
@@ -4540,13 +4731,13 @@ msgstr ""
"literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:505
+#: apt-get.8.xml:525
msgid "<option>--only-source</option>"
msgstr "<option>--only-source</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:506
+#: apt-get.8.xml:526
msgid ""
"Only has meaning for the <literal>source</literal> and <literal>build-dep</"
"literal> commands. Indicates that the given source names are not to be "
@@ -4564,23 +4755,23 @@ msgstr ""
"literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:516
+#: apt-get.8.xml:536
msgid "<option>--diff-only</option>"
msgstr "<option>--diff-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:516
+#: apt-get.8.xml:536
msgid "<option>--dsc-only</option>"
msgstr "<option>--dsc-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:516
+#: apt-get.8.xml:536
msgid "<option>--tar-only</option>"
msgstr "<option>--tar-only</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:517
+#: apt-get.8.xml:537
msgid ""
"Download only the diff, dsc, or tar file of a source archive. Configuration "
"Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
@@ -4591,13 +4782,13 @@ msgstr ""
"Only</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:522
+#: apt-get.8.xml:542
msgid "<option>--arch-only</option>"
msgstr "<option>--arch-only</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:523
+#: apt-get.8.xml:543
msgid ""
"Only process architecture-dependent build-dependencies. Configuration Item: "
"<literal>APT::Get::Arch-Only</literal>."
@@ -4606,13 +4797,13 @@ msgstr ""
"<literal>APT::Get::Arch-Only</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:527
+#: apt-get.8.xml:547
msgid "<option>--allow-unauthenticated</option>"
msgstr "<option>--allow-unauthenticated</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:528
+#: apt-get.8.xml:548
#, fuzzy
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
@@ -4623,88 +4814,16 @@ msgstr ""
"うなツールで便利です。設定項目 - <literal>APT::Get::AllowUnauthenticated</"
"literal>"
-# type: Content of: <refentry><refsect1><para>
-#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:546 apt.conf.5.xml:825
-msgid "<filename>/etc/apt/apt.conf</filename>"
-msgstr "<filename>/etc/apt/apt.conf</filename>"
-
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:547
-msgid ""
-"APT configuration file. Configuration Item: <literal>Dir::Etc::Main</"
-"literal>."
-msgstr "APT 設定ファイル。設定項目 - <literal>Dir::Etc::Main</literal>"
-
-# type: Content of: <refentry><refsect1><para>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:551
-msgid "<filename>/etc/apt/apt.conf.d/</filename>"
-msgstr "<filename>/etc/apt/apt.conf.d/</filename>"
-
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:552
-msgid ""
-"APT configuration file fragments. Configuration Item: <literal>Dir::Etc::"
-"Parts</literal>."
-msgstr "APT 設定ファイルの断片。設定項目 - <literal>Dir::Etc::Parts</literal>"
-
-# type: Content of: <refentry><refsect1><para>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:556
-msgid "<filename>/etc/apt/preferences</filename>"
-msgstr "<filename>/etc/apt/preferences</filename>"
-
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:557
-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>."
-msgstr ""
-"バージョン優先ファイル。ここに \"pin\" の設定を行います。つまり、別々の取得元"
-"や異なるディストリビューションのバージョンの、どこからパッケージを取得するか"
-"を設定します。設定項目 - <literal>Dir::Etc::Preferences</literal>"
-
-# type: Content of: <refentry><refsect1><para>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:565
-msgid "<filename>&cachedir;/archives/</filename>"
-msgstr "<filename>&cachedir;/archives/</filename>"
-
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:566
-msgid ""
-"Storage area for retrieved package files. Configuration Item: <literal>Dir::"
-"Cache::Archives</literal>."
-msgstr ""
-"取得済みパッケージファイル格納エリア。設定項目 - <literal>Dir::Cache::"
-"Archives</literal>"
-
-# type: Content of: <refentry><refsect1><para>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:570
-msgid "<filename>&cachedir;/archives/partial/</filename>"
-msgstr "<filename>&cachedir;/archives/partial/</filename>"
-
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:571
+#. type: Content of: <refentry><refsect1><variablelist>
+#: apt-get.8.xml:561
msgid ""
-"Storage area for package files in transit. Configuration Item: "
-"<literal>Dir::Cache::Archives</literal> (implicit partial)."
+"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
+"&file-statelists;"
msgstr ""
-"取得中パッケージファイル格納エリア。設定項目 - <literal>Dir::Cache::"
-"Archives</literal> (必然的に不完全)"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:589
+#: apt-get.8.xml:570
msgid ""
"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
@@ -4715,7 +4834,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:595
+#: apt-get.8.xml:576
msgid ""
"<command>apt-get</command> returns zero on normal operation, decimal 100 on "
"error."
@@ -4724,40 +4843,40 @@ msgstr ""
"100 を返します。"
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:598
+#: apt-get.8.xml:579
msgid "ORIGINAL AUTHORS"
msgstr "原著者"
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:599
+#: apt-get.8.xml:580
msgid "&apt-author.jgunthorpe;"
msgstr "&apt-author.jgunthorpe;"
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:602
+#: apt-get.8.xml:583
msgid "CURRENT AUTHORS"
msgstr "現著者"
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:604
+#: apt-get.8.xml:585
msgid "&apt-author.team;"
msgstr "&apt-author.team;"
# type: Content of: <refentry><refnamediv><refname>
#. type: Content of: <refentry><refnamediv><refname>
-#: apt-key.8.xml:14 apt-key.8.xml:20
+#: apt-key.8.xml:14 apt-key.8.xml:21
msgid "apt-key"
msgstr "apt-key"
# type: Content of: <refentry><refnamediv><refpurpose>
#. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-key.8.xml:21
+#: apt-key.8.xml:22
msgid "APT key management utility"
msgstr "APT キー管理ユーティリティ"
# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-key.8.xml:27
+#: apt-key.8.xml:28
msgid ""
"<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> "
"<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></"
@@ -4769,7 +4888,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:35
+#: apt-key.8.xml:36
msgid ""
"<command>apt-key</command> is used to manage the list of keys used by apt to "
"authenticate packages. Packages which have been authenticated using these "
@@ -4781,19 +4900,19 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:41
+#: apt-key.8.xml:42
msgid "Commands"
msgstr "コマンド"
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:43
+#: apt-key.8.xml:44
msgid "add <replaceable>filename</replaceable>"
msgstr "add <replaceable>filename</replaceable>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:47
+#: apt-key.8.xml:48
msgid ""
"Add a new key to the list of trusted keys. The key is read from "
"<replaceable>filename</replaceable>, or standard input if "
@@ -4805,70 +4924,70 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:55
+#: apt-key.8.xml:56
msgid "del <replaceable>keyid</replaceable>"
msgstr "del <replaceable>keyid</replaceable>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:59
+#: apt-key.8.xml:60
msgid "Remove a key from the list of trusted keys."
msgstr "信頼キー一覧からキーを削除します。"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:66
+#: apt-key.8.xml:67
msgid "export <replaceable>keyid</replaceable>"
msgstr "export <replaceable>keyid</replaceable>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:70
+#: apt-key.8.xml:71
msgid "Output the key <replaceable>keyid</replaceable> to standard output."
msgstr "キー <replaceable>keyid</replaceable> を標準出力に出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:77
+#: apt-key.8.xml:78
msgid "exportall"
msgstr "exportall"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:81
+#: apt-key.8.xml:82
msgid "Output all trusted keys to standard output."
msgstr "信頼するキーをすべて標準出力に出力します。"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:88
+#: apt-key.8.xml:89
msgid "list"
msgstr "list"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:92
+#: apt-key.8.xml:93
msgid "List trusted keys."
msgstr "信頼キーを一覧表示します。"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:99
+#: apt-key.8.xml:100
msgid "finger"
msgstr "finger"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:103
+#: apt-key.8.xml:104
msgid "List fingerprints of trusted keys."
msgstr "信頼キーのフィンガープリントを一覧表示します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:110
+#: apt-key.8.xml:111
msgid "adv"
msgstr "adv"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:114
+#: apt-key.8.xml:115
msgid ""
"Pass advanced options to gpg. With adv --recv-key you can download the "
"public key."
@@ -4878,7 +4997,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:126
+#: apt-key.8.xml:127
msgid ""
"Update the local keyring with the keyring of Debian archive keys and removes "
"from the keyring the archive keys which are no longer valid."
@@ -4888,41 +5007,41 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:139
+#: apt-key.8.xml:140
msgid "<filename>/etc/apt/trusted.gpg</filename>"
msgstr "<filename>/etc/apt/trusted.gpg</filename>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:140
+#: apt-key.8.xml:141
msgid "Keyring of local trusted keys, new keys will be added here."
msgstr "ローカル信頼キーのキーリング。新しいキーはここに追加されます。"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:143
+#: apt-key.8.xml:144
msgid "<filename>/etc/apt/trustdb.gpg</filename>"
msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:144
+#: apt-key.8.xml:145
msgid "Local trust database of archive keys."
msgstr "アーカイブキーのローカル信頼データベースです。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:147
+#: apt-key.8.xml:148
msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:148
+#: apt-key.8.xml:149
msgid "Keyring of Debian archive trusted keys."
msgstr "Debian アーカイブ信頼キーのキーリングです。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:151
+#: apt-key.8.xml:152
msgid ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgstr ""
@@ -4930,46 +5049,58 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:152
+#: apt-key.8.xml:153
msgid "Keyring of Debian archive removed trusted keys."
msgstr "削除された Debian アーカイブ信頼キーのキーリングです。"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:163
+#: apt-key.8.xml:164
msgid "&apt-get;, &apt-secure;"
msgstr "&apt-get;, &apt-secure;"
#. The last update date
#. 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>2 "
-"November 2007</date>"
+"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
+"August 2009</date>"
msgstr ""
"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>2 "
"November 2007</date>"
# type: Content of: <refentry><refnamediv><refname>
#. type: Content of: <refentry><refnamediv><refname>
-#: apt-mark.8.xml:22 apt-mark.8.xml:28
+#: apt-mark.8.xml:22 apt-mark.8.xml:29
msgid "apt-mark"
msgstr "apt-mark"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-mark.8.xml:29
+#: apt-mark.8.xml:30
msgid "mark/unmark a package as being automatically-installed"
msgstr "パッケージが自動的にインストールされたかどうかのマークを変更します。"
# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-mark.8.xml:35
-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>"
+#: 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"
+"\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
+"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg "
+"choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
+"arg> <arg choice=\"plain\">showauto</arg> </group>"
msgstr ""
"<command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
"f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"req"
@@ -4978,7 +5109,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:44
+#: apt-mark.8.xml:53
msgid ""
"<command>apt-mark</command> will change whether a package has been marked as "
"being automatically installed."
@@ -4988,13 +5119,20 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:48
+#: 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 "
"being automatically installed. Once these automatically installed packages "
"are no longer depended on by any manually installed packages, they will be "
-"removed."
+"removed by e.g. <command>apt-get</command> or <command>aptitude</command>."
msgstr ""
"パッケージをインストールすると要求し、その結果、別のパッケージが依存関係を満"
"たすためにインストールされた場合、依存関係に自動的にインストールしたとマーク"
@@ -5002,13 +5140,13 @@ msgstr ""
"たパッケージに依存されなくなると、そのパッケージは削除されます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:55
+#: apt-mark.8.xml:65
msgid "markauto"
msgstr "markauto"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:56
+#: apt-mark.8.xml:66
msgid ""
"<literal>markauto</literal> is used to mark a package as being automatically "
"installed, which will cause the package to be removed when no more manually "
@@ -5019,13 +5157,13 @@ msgstr ""
"なくなると、このパッケージを削除します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:63
+#: apt-mark.8.xml:73
msgid "unmarkauto"
msgstr "unmarkauto"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:64
+#: apt-mark.8.xml:74
msgid ""
"<literal>unmarkauto</literal> is used to mark a package as being manually "
"installed, which will prevent the package from being automatically removed "
@@ -5036,62 +5174,120 @@ msgstr ""
"ケージを自動的に削除するのを防ぎます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:76
-msgid "<option>-f=<filename>FILENAME</filename></option>"
+#: apt-mark.8.xml:81
+msgid "showauto"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. 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 manually installed "
+"packages with each package on a new line."
+msgstr ""
+"<literal>autoremove</literal> は、依存関係を満たすために自動的にインストール"
+"され、もう必要なくなったパッケージを削除するのに使用します。"
+
+#. 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>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:76
-msgid "<option>--file=<filename>FILENAME</filename></option>"
+#: apt-mark.8.xml:94
+#, fuzzy
+#| msgid "<option>--file=<filename>FILENAME</filename></option>"
+msgid ""
+"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
+"option>"
msgstr "<option>--file=<filename>FILENAME</filename></option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:79
+#: 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>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>."
+"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
+"filename> instead of the default location, which is "
+"<filename>extended_status</filename> in the directory defined by the "
+"Configuration Item: <literal>Dir::State</literal>."
msgstr ""
"デフォルトの場所 (設定項目: <literal>Dir::State</literal> で定義したディレク"
"トリの <filename>extended_status</filename>) に代えて、<filename>FILENAME</"
"filename> からパッケージの統計を読み書きします。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:85
+#: apt-mark.8.xml:103
msgid "<option>-h</option>"
msgstr "<option>-h</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:86
+#: apt-mark.8.xml:104
msgid "<option>--help</option>"
msgstr "<option>--help</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:87
+#: apt-mark.8.xml:105
msgid "Show a short usage summary."
msgstr "短い使用方法を表示します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:93
+#: apt-mark.8.xml:111
msgid "<option>-v</option>"
msgstr "<option>-v</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:94
+#: apt-mark.8.xml:112
msgid "<option>--version</option>"
msgstr "<option>--version</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:95
+#: apt-mark.8.xml:113
msgid "Show the program version."
msgstr "プログラムのバージョン情報を表示します"
# type: Content of: <refentry><refsect1><para>
+#. 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>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml:125
+msgid ""
+"Status list of auto-installed packages. Configuration Item: <literal>Dir::"
+"State</literal> sets the path to the <filename>extended_states</filename> "
+"file."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:109
+#: apt-mark.8.xml:134
+#, fuzzy
+#| msgid "&apt-cache; &apt-conf;"
+msgid "&apt-get;,&aptitude;,&apt-conf;"
+msgstr "&apt-cache; &apt-conf;"
+
+# type: Content of: <refentry><refsect1><para>
+#. type: Content of: <refentry><refsect1><para>
+#: apt-mark.8.xml:138
msgid ""
"<command>apt-mark</command> returns zero on normal operation, non-zero on "
"error."
@@ -5101,19 +5297,19 @@ msgstr ""
# type: Content of: <refentry><refnamediv><refname>
#. type: Content of: <refentry><refnamediv><refname>
-#: apt-secure.8.xml:14 apt-secure.8.xml:35
+#: apt-secure.8.xml:14 apt-secure.8.xml:36
msgid "apt-secure"
msgstr "apt-secure"
# type: Content of: <refentry><refnamediv><refpurpose>
#. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-secure.8.xml:36
+#: apt-secure.8.xml:37
msgid "Archive authentication support for APT"
msgstr "APT アーカイブ認証サポート"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:41
+#: apt-secure.8.xml:42
msgid ""
"Starting with version 0.6, <command>apt</command> contains code that does "
"signature checking of the Release file for all archives. This ensures that "
@@ -5126,7 +5322,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:49
+#: apt-secure.8.xml:50
msgid ""
"If a package comes from a archive without a signature or with a signature "
"that apt does not have a key for that package is considered untrusted and "
@@ -5142,7 +5338,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:58
+#: apt-secure.8.xml:59
msgid ""
"The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
"authentication feature."
@@ -5152,13 +5348,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:63
+#: apt-secure.8.xml:64
msgid "Trusted archives"
msgstr "信頼済アーカイブ"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:66
+#: apt-secure.8.xml:67
msgid ""
"The chain of trust from an apt archive to the end user is made up of "
"different steps. <command>apt-secure</command> is the last step in this "
@@ -5175,7 +5371,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:74
+#: apt-secure.8.xml:75
msgid ""
"apt-secure does not review signatures at a package level. If you require "
"tools to do this you should look at <command>debsig-verify</command> and "
@@ -5189,7 +5385,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:81
+#: apt-secure.8.xml:82
msgid ""
"The chain of trust in Debian starts when a maintainer uploads a new package "
"or a new version of a package to the Debian archive. This upload in order to "
@@ -5207,7 +5403,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:91
+#: apt-secure.8.xml:92
msgid ""
"Once the uploaded package is verified and included in the archive, the "
"maintainer signature is stripped off, an MD5 sum of the package is computed "
@@ -5225,7 +5421,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:101
+#: apt-secure.8.xml:102
msgid ""
"Any end user can check the signature of the Release file, extract the MD5 "
"sum of a package from it and compare it with the MD5 sum of the package he "
@@ -5241,7 +5437,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:108
+#: apt-secure.8.xml:109
msgid ""
"Notice that this is distinct from checking signatures on a per package "
"basis. It is designed to prevent two possible attacks:"
@@ -5251,7 +5447,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:113
+#: apt-secure.8.xml:114
msgid ""
"<literal>Network \"man in the middle\" attacks</literal>. Without signature "
"checking, a malicious agent can introduce himself in the package download "
@@ -5267,7 +5463,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:121
+#: apt-secure.8.xml:122
msgid ""
"<literal>Mirror network compromise</literal>. Without signature checking, a "
"malicious agent can compromise a mirror host and modify the files in it to "
@@ -5280,7 +5476,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:128
+#: apt-secure.8.xml:129
msgid ""
"However, it does not defend against a compromise of the Debian master server "
"itself (which signs the packages) or against a compromise of the key used to "
@@ -5293,13 +5489,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:134
+#: apt-secure.8.xml:135
msgid "User configuration"
msgstr "ユーザの設定"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:136
+#: apt-secure.8.xml:137
msgid ""
"<command>apt-key</command> is the program that manages the list of keys used "
"by apt. It can be used to add or remove keys although an installation of "
@@ -5313,7 +5509,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:143
+#: apt-secure.8.xml:144
msgid ""
"In order to add a new key you need to first download it (you should make "
"sure you are using a trusted communication channel when retrieving it), add "
@@ -5330,13 +5526,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:152
+#: apt-secure.8.xml:153
msgid "Archive configuration"
msgstr "アーカイブの設定"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:154
+#: apt-secure.8.xml:155
msgid ""
"If you want to provide archive signatures in an archive under your "
"maintenance you have to:"
@@ -5346,7 +5542,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:159
+#: apt-secure.8.xml:160
msgid ""
"<literal>Create a toplevel Release file</literal>. if it does not exist "
"already. You can do this by running <command>apt-ftparchive release</"
@@ -5358,7 +5554,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:164
+#: apt-secure.8.xml:165
msgid ""
"<literal>Sign it</literal>. You can do this by running <command>gpg -abs -o "
"Release.gpg Release</command>."
@@ -5368,7 +5564,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:167
+#: apt-secure.8.xml:168
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 "
@@ -5379,7 +5575,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:174
+#: apt-secure.8.xml:175
msgid ""
"Whenever the contents of the archive changes (new packages are added or "
"removed) the archive maintainer has to follow the first two steps previously "
@@ -5390,7 +5586,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:182
+#: apt-secure.8.xml:183
msgid ""
"&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
"&debsign; &debsig-verify;, &gpg;"
@@ -5400,7 +5596,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:186
+#: apt-secure.8.xml:187
msgid ""
"For more background information you might want to review the <ulink url="
"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html"
@@ -5417,13 +5613,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:199
+#: apt-secure.8.xml:200
msgid "Manpage Authors"
msgstr "マニュアルページ作者"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:201
+#: apt-secure.8.xml:202
msgid ""
"This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac "
"Jones, Colin Walters, Florian Weimer and Michael Vogt."
@@ -5433,19 +5629,19 @@ msgstr ""
# type: Content of: <refentry><refnamediv><refname>
#. type: Content of: <refentry><refnamediv><refname>
-#: apt-sortpkgs.1.xml:22 apt-sortpkgs.1.xml:28
+#: apt-sortpkgs.1.xml:22 apt-sortpkgs.1.xml:29
msgid "apt-sortpkgs"
msgstr "apt-sortpkgs"
# type: Content of: <refentry><refnamediv><refpurpose>
#. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-sortpkgs.1.xml:29
+#: apt-sortpkgs.1.xml:30
msgid "Utility to sort package index files"
msgstr "パッケージインデックスファイルのソートユーティリティ"
# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-sortpkgs.1.xml:35
+#: apt-sortpkgs.1.xml:36
msgid ""
"<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
"<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
@@ -5459,7 +5655,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:44
+#: apt-sortpkgs.1.xml:45
msgid ""
"<command>apt-sortpkgs</command> will take an index file (Source index or "
"Package index) and sort the records so that they are ordered by the package "
@@ -5472,19 +5668,19 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:50
+#: apt-sortpkgs.1.xml:51
msgid "All output is sent to stdout, the input must be a seekable file."
msgstr ""
"出力はすべて標準出力に送られ、入力は検索できるファイルでなければなりません。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-sortpkgs.1.xml:57
+#: apt-sortpkgs.1.xml:58
msgid "<option>--source</option>"
msgstr "<option>--source</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-sortpkgs.1.xml:59
+#: apt-sortpkgs.1.xml:60
msgid ""
"Use Source index field ordering. Configuration Item: <literal>APT::"
"SortPkgs::Source</literal>."
@@ -5494,7 +5690,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:73
+#: apt-sortpkgs.1.xml:74
msgid ""
"<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
"100 on error."
@@ -5505,11 +5701,17 @@ msgstr ""
#. The last update date
#. 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 "
"Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; "
-"&apt-product; <date>10 December 2008</date>"
+"&apt-product; <date>18 September 2009</date>"
msgstr ""
"&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
"firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
@@ -5518,7 +5720,7 @@ msgstr ""
# type: Content of: <refentry><refnamediv><refname>
#. type: Content of: <refentry><refnamediv><refname>
-#: apt.conf.5.xml:28 apt.conf.5.xml:34
+#: apt.conf.5.xml:28 apt.conf.5.xml:35
msgid "apt.conf"
msgstr "apt.conf"
@@ -5529,13 +5731,13 @@ msgstr "5"
# type: Content of: <refentry><refnamediv><refpurpose>
#. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.conf.5.xml:35
+#: apt.conf.5.xml:36
msgid "Configuration file for APT"
msgstr "APT の設定ファイル"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:39
+#: apt.conf.5.xml:40
msgid ""
"<filename>apt.conf</filename> is the main configuration file for the APT "
"suite of tools, all tools make use of the configuration file and a common "
@@ -5557,7 +5759,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:49
+#: 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 "
@@ -5572,7 +5774,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:55
+#: apt.conf.5.xml:56
msgid ""
"Syntactically the configuration language is modeled after what the ISC tools "
"such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@ -5592,7 +5794,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><informalexample><programlisting>
#. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:65
+#: apt.conf.5.xml:66
#, no-wrap
msgid ""
"APT {\n"
@@ -5611,7 +5813,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:73
+#: apt.conf.5.xml:74
msgid ""
"with newlines placed to make it more readable. Lists can be created by "
"opening a scope and including a single string enclosed in quotes followed by "
@@ -5623,14 +5825,14 @@ msgstr ""
# type: Content of: <refentry><refsect1><informalexample><programlisting>
#. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:78
+#: apt.conf.5.xml:79
#, no-wrap
msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:81
+#: apt.conf.5.xml:82
msgid ""
"In general the sample configuration file in <filename>&docdir;examples/apt."
"conf</filename> &configureindex; is a good guide for how it should look."
@@ -5639,7 +5841,7 @@ msgstr ""
"定ファイルのサンプルです。どのように設定するか参考になるでしょう。"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:85
+#: apt.conf.5.xml:86
msgid ""
"The names of the configuration items are not case-sensitive. So in the "
"previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
@@ -5649,13 +5851,21 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:88
+#: apt.conf.5.xml:89
+#, 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> 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."
+"The specified element and all its descendants are erased."
msgstr ""
"<literal>#include</literal> と <literal>#clear</literal> の 2 つの特別な記法"
"があります。<literal>#include</literal> は指定したファイルを取り込みます。"
@@ -5665,7 +5875,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:94
+#: apt.conf.5.xml:95
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 "
@@ -5680,13 +5890,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:101
+#: apt.conf.5.xml:102
msgid "The APT Group"
msgstr "APT グループ"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:102
+#: apt.conf.5.xml:103
msgid ""
"This group of options controls general APT behavior as well as holding the "
"options for all of the tools."
@@ -5696,13 +5906,13 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:106
+#: apt.conf.5.xml:107
msgid "Architecture"
msgstr "Architecture"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:107
+#: apt.conf.5.xml:108
msgid ""
"System Architecture; sets the architecture to use when fetching files and "
"parsing package lists. The internal default is the architecture apt was "
@@ -5714,12 +5924,12 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:112
+#: apt.conf.5.xml:113
msgid "Default-Release"
msgstr "Default-Release"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:113
+#: apt.conf.5.xml:114
msgid ""
"Default release to install packages from if more than one version available. "
"Contains release name, codename or release version. Examples: 'stable', "
@@ -5732,13 +5942,13 @@ msgstr ""
"す。 &apt-preferences; も参照してください。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:117
+#: apt.conf.5.xml:118
msgid "Ignore-Hold"
msgstr "Ignore-Hold"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:118
+#: apt.conf.5.xml:119
msgid ""
"Ignore Held packages; This global option causes the problem resolver to "
"ignore held packages in its decision making."
@@ -5748,13 +5958,13 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:122
+#: apt.conf.5.xml:123
msgid "Clean-Installed"
msgstr "Clean-Installed"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:123
+#: apt.conf.5.xml:124
msgid ""
"Defaults to on. When turned on the autoclean feature will remove any "
"packages which can no longer be downloaded from the cache. If turned off "
@@ -5769,13 +5979,13 @@ msgstr ""
# type: Content of: <refentry><refnamediv><refname>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:129
+#: apt.conf.5.xml:130
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:130
+#: apt.conf.5.xml:131
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 "
@@ -5790,13 +6000,13 @@ msgstr ""
"ください。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:137
+#: apt.conf.5.xml:138
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:138
+#: apt.conf.5.xml:139
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/"
@@ -5814,13 +6024,13 @@ msgstr ""
"不可欠パッケージで動作します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:146
+#: apt.conf.5.xml:147
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:147
+#: apt.conf.5.xml:148
msgid ""
"APT uses a fixed size memory mapped cache file to store the 'available' "
"information. This sets the size of that cache (in bytes)."
@@ -5829,24 +6039,24 @@ msgstr ""
"ファイルを使用します。このオプションは、そのキャッシュサイズを指定します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:151
+#: apt.conf.5.xml:152
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:152
+#: apt.conf.5.xml:153
msgid "Defines which package(s) are considered essential build dependencies."
msgstr "構築依存関係で不可欠なパッケージを定義します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:155
+#: apt.conf.5.xml:156
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:156
+#: apt.conf.5.xml:157
msgid ""
"The Get subsection controls the &apt-get; tool, please see its documentation "
"for more information about the options here."
@@ -5855,13 +6065,13 @@ msgstr ""
"&apt-get; の文書を参照してください。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:160
+#: apt.conf.5.xml:161
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:161
+#: apt.conf.5.xml:162
msgid ""
"The Cache subsection controls the &apt-cache; tool, please see its "
"documentation for more information about the options here."
@@ -5870,13 +6080,13 @@ msgstr ""
"は &apt-cache; の文書を参照してください。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:165
+#: apt.conf.5.xml:166
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:166
+#: apt.conf.5.xml:167
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool, please see its "
"documentation for more information about the options here."
@@ -5886,17 +6096,17 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:172
+#: apt.conf.5.xml:173
msgid "The Acquire Group"
msgstr "Acquire グループ"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:177
+#: apt.conf.5.xml:178
msgid "PDiffs"
msgstr "PDiffs"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:178
+#: apt.conf.5.xml:179
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for Packages or "
"Sources files instead of downloading whole ones. True by default."
@@ -5906,13 +6116,13 @@ msgstr ""
"ルトでは True です。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:183
+#: apt.conf.5.xml:184
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:184
+#: apt.conf.5.xml:185
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
"literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -5927,13 +6137,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:191
+#: apt.conf.5.xml:192
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:192
+#: apt.conf.5.xml:193
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
@@ -5942,13 +6152,13 @@ msgstr ""
"えられた回数だけリトライを行います。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:196
+#: apt.conf.5.xml:197
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:197
+#: apt.conf.5.xml:198
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."
@@ -5959,20 +6169,28 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:201 sources.list.5.xml:138
+#: apt.conf.5.xml:202 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:202
+#: apt.conf.5.xml:203
+#, 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 "
"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."
+"meaning to use no proxies. If no one of the above settings is specified, "
+"<envar>http_proxy</envar> environment variable will be used."
msgstr ""
"HTTP URI - http::Proxy は、デフォルトで使用する http プロキシです。"
"<literal>http://[[user][:pass]@]host[:port]/</literal> という標準形で表しま"
@@ -5983,7 +6201,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:209
+#: apt.conf.5.xml:211
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 "
@@ -6008,7 +6226,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:219 apt.conf.5.xml:267
+#: apt.conf.5.xml:221 apt.conf.5.xml:273
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method, this applies to all things including connection timeout and data "
@@ -6020,7 +6238,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:222
+#: apt.conf.5.xml:224
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) "
@@ -6040,12 +6258,12 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:231
+#: apt.conf.5.xml:233
msgid "https"
msgstr "https"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:232
+#: apt.conf.5.xml:234
msgid ""
"HTTPS URIs. Cache-control and proxy options are the same as for "
"<literal>http</literal> method. <literal>Pipeline-Depth</literal> option is "
@@ -6056,7 +6274,7 @@ msgstr ""
"していません。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:238
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -6078,19 +6296,35 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:254 sources.list.5.xml:149
+#: apt.conf.5.xml:256 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:255
-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 "
+#: apt.conf.5.xml:257
+#, 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 "
+"proxies can also be specified by using the form <literal>ftp::Proxy::&lt;"
+"host&gt;</literal> with the special keyword <literal>DIRECT</literal> "
+"meaning to use no proxies. If no one of the above settings is specified, "
+"<envar>ftp_proxy</envar> environment variable will be used. To use a ftp "
+"proxy you will have to set the <literal>ftp::ProxyLogin</literal> script in "
+"the configuration file. This entry specifies the commands to send to tell "
"the proxy server what to connect to. Please see &configureindex; for an "
"example of how to do this. The substitution variables available are <literal>"
"$(PROXY_USER)</literal> <literal>$(PROXY_PASS)</literal> <literal>"
@@ -6111,7 +6345,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:270
+#: apt.conf.5.xml:276
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 "
@@ -6127,7 +6361,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:277
+#: apt.conf.5.xml:283
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 "
@@ -6141,7 +6375,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:282
+#: apt.conf.5.xml:288
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -6158,19 +6392,19 @@ msgstr ""
# type: Content of: <refentry><refnamediv><refname>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:289 sources.list.5.xml:131
+#: apt.conf.5.xml:295 sources.list.5.xml:132
msgid "cdrom"
msgstr "cdrom"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:295
+#: apt.conf.5.xml:301
#, no-wrap
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:290
+#: apt.conf.5.xml:296
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 "
@@ -6191,13 +6425,13 @@ msgstr ""
"す。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:300
+#: apt.conf.5.xml:306
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:301
+#: apt.conf.5.xml:307
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
@@ -6207,9 +6441,92 @@ msgstr ""
"ションです。<literal>gpgv::Options</literal> が gpgv に渡す追加オプションで"
"す。"
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: apt.conf.5.xml:312
+msgid "CompressionTypes"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
+#: apt.conf.5.xml:318
+#, 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:313
+msgid ""
+"List of compression types which are understood by the acquire methods. "
+"Files like <filename>Packages</filename> can be available in various "
+"compression formats. Per default the acquire methods can decompress "
+"<command>bzip2</command>, <command>lzma</command> and <command>gzip</"
+"command> compressed files, with this setting more formats can be added on "
+"the fly or the used method can be changed. The syntax for this is: "
+"<placeholder type=\"synopsis\" id=\"0\"/>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
+#: apt.conf.5.xml:323
+#, no-wrap
+msgid "Acquire::CompressionTypes::Order:: \"gz\";"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
+#: apt.conf.5.xml:326
+#, no-wrap
+msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:319
+msgid ""
+"Also the <literal>Order</literal> subgroup can be used to define in which "
+"order the acquire system will try to download the compressed files. The "
+"acquire system will try the first and proceed with the next compression type "
+"in this list on error, so to prefer one over the other type simple add the "
+"preferred type at first - not already added default types will be added at "
+"run time to the end of the list, so e.g. <placeholder type=\"synopsis\" id="
+"\"0\"/> can be used to prefer <command>gzip</command> compressed files over "
+"<command>bzip2</command> and <command>lzma</command>. If <command>lzma</"
+"command> should be preferred over <command>gzip</command> and "
+"<command>bzip2</command> the configure setting should look like this "
+"<placeholder type=\"synopsis\" id=\"1\"/> It is not needed to add "
+"<literal>bz2</literal> explicit to the list as it will be added automatic."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
+#: apt.conf.5.xml:330
+#, no-wrap
+msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:328
+msgid ""
+"Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
+"replaceable></literal> will be checked: If this setting exists the method "
+"will only be used if this file exists, e.g. for the bzip2 method (the "
+"inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note also "
+"that list entries specified on the commandline will be added at the end of "
+"the list specified in the configuration files, but before the default "
+"entries. To prefer a type in this case over the ones specified in in the "
+"configuration files you can set the option direct - not in list style. This "
+"will not override the defined list, it will only prefix the list with this "
+"type."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:335
+msgid ""
+"While it is possible to add an empty compression type to the order list, but "
+"APT in its current version doesn't understand it correctly and will display "
+"many warnings about not downloaded files - these warnings are most of the "
+"time false negatives. Future versions will maybe include a way to really "
+"prefer uncompressed files to support the usage of local mirrors."
+msgstr ""
+
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:173
+#: apt.conf.5.xml:174
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>"
@@ -6220,13 +6537,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:310
+#: apt.conf.5.xml:344
msgid "Directories"
msgstr "ディレクトリ"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:312
+#: apt.conf.5.xml:346
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -6246,7 +6563,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:319
+#: apt.conf.5.xml:353
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -6268,7 +6585,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:328
+#: apt.conf.5.xml:362
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -6283,7 +6600,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:334
+#: apt.conf.5.xml:368
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 "
@@ -6295,13 +6612,22 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:338
+#: apt.conf.5.xml:372
+#, 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 "
-"<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."
+"<literal>gzip</literal>, <literal>bzip2</literal>, <literal>lzma</literal>, "
+"<literal>dpkg</literal>, <literal>apt-get</literal> <literal>dpkg-source</"
+"literal> <literal>dpkg-buildpackage</literal> and <literal>apt-cache</"
+"literal> specify the location of the respective programs."
msgstr ""
"バイナリプログラムは <literal>Dir::Bin</literal> で指定します。<literal>Dir::"
"Bin::Methods</literal> はメソッドハンドラの場所を指定し、<literal>gzip</"
@@ -6311,7 +6637,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:345
+#: apt.conf.5.xml:380
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -6332,13 +6658,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:358
+#: apt.conf.5.xml:393
msgid "APT in DSelect"
msgstr "DSelect での APT"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:360
+#: apt.conf.5.xml:395
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -6348,13 +6674,13 @@ msgstr ""
"設定項目で、デフォルトの動作を制御します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:364
+#: apt.conf.5.xml:399
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:365
+#: apt.conf.5.xml:400
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 "
@@ -6371,7 +6697,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:374
+#: apt.conf.5.xml:409
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the install phase."
@@ -6381,13 +6707,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:378
+#: apt.conf.5.xml:413
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:379
+#: apt.conf.5.xml:414
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the update phase."
@@ -6396,13 +6722,13 @@ msgstr ""
"されます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:383
+#: apt.conf.5.xml:418
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:384
+#: apt.conf.5.xml:419
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
@@ -6412,13 +6738,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:425
msgid "How APT calls dpkg"
msgstr "APT が dpkg を呼ぶ方法"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:391
+#: apt.conf.5.xml:426
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
@@ -6428,7 +6754,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:396
+#: apt.conf.5.xml:431
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 "
@@ -6438,18 +6764,18 @@ msgstr ""
"ければなりません。また、各リストは単一の引数として &dpkg; に渡されます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:401
+#: apt.conf.5.xml:436
msgid "Pre-Invoke"
msgstr "Pre-Invoke"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:401
+#: apt.conf.5.xml:436
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:402
+#: apt.conf.5.xml:437
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 "
@@ -6463,13 +6789,13 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:408
+#: apt.conf.5.xml:443
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:409
+#: apt.conf.5.xml:444
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 "
@@ -6485,7 +6811,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:415
+#: apt.conf.5.xml:450
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -6501,13 +6827,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:422
+#: apt.conf.5.xml:457
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:423
+#: apt.conf.5.xml:458
msgid ""
"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
"</filename>."
@@ -6517,13 +6843,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:427
+#: apt.conf.5.xml:462
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:428
+#: apt.conf.5.xml:463
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages, the "
"default is to disable signing and produce all binaries."
@@ -6531,13 +6857,179 @@ msgstr ""
"これらのオプションは、パッケージのコンパイル時に &dpkg-buildpackage; に渡され"
"ます。デフォルトでは署名を無効にし、全バイナリを生成します。"
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt.conf.5.xml:468
+msgid "dpkg trigger usage (and related options)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt.conf.5.xml:469
+msgid ""
+"APT can call dpkg in a way so it can make aggressive use of triggers over "
+"multiply calls of dpkg. Without further options dpkg will use triggers only "
+"in between his own run. Activating these options can therefore decrease the "
+"time needed to perform the install / upgrade. Note that it is intended to "
+"activate these options per default in the future, but as it changes the way "
+"APT calling dpkg drastical it needs a lot more testing. <emphasis>These "
+"options are therefore currently experimental and should not be used in "
+"productive environments.</emphasis> Also it breaks the progress reporting so "
+"all frontends will currently stay around half (or more) of the time in the "
+"100% state while it actually configures all packages."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
+#: apt.conf.5.xml:484
+#, no-wrap
+msgid ""
+"DPkg::NoTriggers \"true\";\n"
+"PackageManager::Configure \"smart\";\n"
+"DPkg::ConfigurePending \"true\";\n"
+"DPkg::TriggersPending \"true\";"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt.conf.5.xml:478
+msgid ""
+"Note that it is not garanteed that APT will support these options or that "
+"these options will not cause (big) trouble in the future. If you have "
+"understand the current risks and problems with these options, but are brave "
+"enough to help testing them create a new configuration file and test a "
+"combination of options. Please report any bugs, problems and improvements "
+"you encounter and make sure to note which options you have used in your "
+"reports. Asking dpkg for help could also be useful for debugging proposes, "
+"see e.g. <command>dpkg --audit</command>. A defensive option combination "
+"would be <placeholder type=\"literallayout\" id=\"0\"/>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt.conf.5.xml:490
+msgid "DPkg::NoTriggers"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:491
+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."
+msgstr ""
+
+# type: <tag></tag>
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt.conf.5.xml:498
+#, fuzzy
+#| msgid "Packages::Compress"
+msgid "PackageManager::Configure"
+msgstr "Packages::Compress"
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:499
+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!"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><title>
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt.conf.5.xml:509
+#, fuzzy
+msgid "DPkg::ConfigurePending"
+msgstr "ユーザの設定"
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:510
+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."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt.conf.5.xml:516
+msgid "DPkg::TriggersPending"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:517
+msgid ""
+"Useful for <literal>smart</literal> configuration as a package which has "
+"pending triggers is not considered as <literal>installed</literal> and dpkg "
+"treats them as <literal>unpacked</literal> currently which is a dealbreaker "
+"for Pre-Dependencies (see debbugs #526774). Note that this will process all "
+"triggers, not only the triggers needed to configure this package."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt.conf.5.xml:522
+msgid "PackageManager::UnpackAll"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:523
+msgid ""
+"As the configuration can be deferred to be done at the end by dpkg it can be "
+"tried to order the unpack series only by critical needs, e.g. by Pre-"
+"Depends. Default is true and therefore the \"old\" method of ordering in "
+"verious steps by everything. While both method were present in earlier APT "
+"versions the <literal>OrderCritical</literal> method was unused, so this "
+"method is very experimental and needs further improvements before becoming "
+"really useful."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt.conf.5.xml:530
+msgid "OrderList::Score::Immediate"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
+#: apt.conf.5.xml:538
+#, no-wrap
+msgid ""
+"OrderList::Score {\n"
+"\tDelete 500;\n"
+"\tEssential 200;\n"
+"\tImmediate 10;\n"
+"\tPreDepends 50;\n"
+"};"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:531
+msgid ""
+"Essential packages (and there dependencies) should be configured immediately "
+"after unpacking. It will be a good idea to do this quite early in the "
+"upgrade process as these these configure calls require currently also "
+"<literal>DPkg::TriggersPending</literal> which will run quite a few triggers "
+"(which maybe not needed). Essentials get per default a high score but the "
+"immediate flag is relativly low (a package which has a Pre-Depends is higher "
+"rated). These option and the others in the same group can be used to change "
+"the scoring. The following example shows the settings with there default "
+"values. <placeholder type=\"literallayout\" id=\"0\"/>"
+msgstr ""
+
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:435
+#: apt.conf.5.xml:551
msgid "Periodic and Archives options"
msgstr "Periodic オプションと Archives オプション"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:436
+#: apt.conf.5.xml:552
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -6551,12 +7043,12 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:444
+#: apt.conf.5.xml:560
msgid "Debug options"
msgstr "デバッグオプション"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:446
+#: apt.conf.5.xml:562
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -6567,7 +7059,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:457
+#: apt.conf.5.xml:573
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -6578,7 +7070,7 @@ msgstr ""
"にします。"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:465
+#: apt.conf.5.xml:581
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -6589,7 +7081,7 @@ msgstr ""
"literal>) を行う場合に使用します。"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:474
+#: apt.conf.5.xml:590
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -6599,66 +7091,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:482
+#: apt.conf.5.xml:598
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:492
+#: apt.conf.5.xml:608
msgid "A full list of debugging options to apt follows."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:497
+#: apt.conf.5.xml:613
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:501
+#: apt.conf.5.xml:617
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:508
+#: apt.conf.5.xml:624
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:512
+#: apt.conf.5.xml:628
msgid "Print information related to downloading packages using FTP."
msgstr "FTP を用いたパッケージのダウンロードに関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:519
+#: apt.conf.5.xml:635
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:523
+#: apt.conf.5.xml:639
msgid "Print information related to downloading packages using HTTP."
msgstr "HTTP を用いたパッケージのダウンロードに関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:530
+#: apt.conf.5.xml:646
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:534
+#: apt.conf.5.xml:650
msgid "Print information related to downloading packages using HTTPS."
msgstr "HTTPS を用いたパッケージのダウンロードに関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:541
+#: apt.conf.5.xml:657
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:545
+#: apt.conf.5.xml:661
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
@@ -6666,46 +7158,46 @@ msgstr ""
"<literal>gpg</literal> を用いた暗号署名の検証に関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:552
+#: apt.conf.5.xml:668
msgid "<literal>Debug::aptcdrom</literal>"
msgstr "<literal>Debug::aptcdrom</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:556
+#: apt.conf.5.xml:672
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:563
+#: apt.conf.5.xml:679
msgid "<literal>Debug::BuildDeps</literal>"
msgstr "<literal>Debug::BuildDeps</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:682
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:573
+#: apt.conf.5.xml:689
msgid "<literal>Debug::Hashes</literal>"
msgstr "<literal>Debug::Hashes</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:576
+#: apt.conf.5.xml:692
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:583
+#: apt.conf.5.xml:699
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr "<literal>Debug::IdentCDROM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:586
+#: apt.conf.5.xml:702
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 "
@@ -6713,93 +7205,93 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:594
+#: apt.conf.5.xml:710
msgid "<literal>Debug::NoLocking</literal>"
msgstr "<literal>Debug::NoLocking</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:597
+#: apt.conf.5.xml:713
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:605
+#: apt.conf.5.xml:721
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr "<literal>Debug::pkgAcquire</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:609
+#: apt.conf.5.xml:725
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:616
+#: apt.conf.5.xml:732
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:619
+#: apt.conf.5.xml:735
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:626
+#: apt.conf.5.xml:742
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:629
+#: apt.conf.5.xml:745
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:637
+#: apt.conf.5.xml:753
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:641
+#: apt.conf.5.xml:757
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:648
+#: apt.conf.5.xml:764
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:652
+#: apt.conf.5.xml:768
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:659
+#: apt.conf.5.xml:775
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr "<literal>Debug::pkgAutoRemove</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:663
+#: apt.conf.5.xml:779
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:670
+#: apt.conf.5.xml:786
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:673
+#: apt.conf.5.xml:789
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -6809,12 +7301,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:800
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:687
+#: apt.conf.5.xml:803
msgid ""
"Generate debug messages describing which package is marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -6831,91 +7323,91 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:706
+#: apt.conf.5.xml:822
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr "<literal>Debug::pkgInitConfig</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:709
+#: apt.conf.5.xml:825
msgid "Dump the default configuration to standard error on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:716
+#: apt.conf.5.xml:832
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr "<literal>Debug::pkgDPkgPM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:719
+#: apt.conf.5.xml:835
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:727
+#: apt.conf.5.xml:843
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:730
+#: apt.conf.5.xml:846
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:737
+#: apt.conf.5.xml:853
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr "<literal>Debug::pkgOrderList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:741
+#: apt.conf.5.xml:857
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:749
+#: apt.conf.5.xml:865
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr "<literal>Debug::pkgPackageManager</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:753
+#: apt.conf.5.xml:869
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:760
+#: apt.conf.5.xml:876
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr "<literal>Debug::pkgPolicy</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:764
+#: apt.conf.5.xml:880
msgid "Output the priority of each package list on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:770
+#: apt.conf.5.xml:886
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr "<literal>Debug::pkgProblemResolver</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:774
+#: apt.conf.5.xml:890
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:782
+#: apt.conf.5.xml:898
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:785
+#: apt.conf.5.xml:901
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 "
@@ -6923,12 +7415,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:793
+#: apt.conf.5.xml:909
msgid "<literal>Debug::sourceList</literal>"
msgstr "<literal>Debug::sourceList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:913
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
@@ -6936,7 +7428,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:819
+#: apt.conf.5.xml:935
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -6945,9 +7437,17 @@ msgstr ""
"イルのサンプルがあります。"
# type: Content of: <refentry><refsect1><para>
+#. type: Content of: <refentry><refsect1><variablelist>
+#: apt.conf.5.xml:942
+#, 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:829
+#: apt.conf.5.xml:947
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
@@ -6959,29 +7459,36 @@ msgstr "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>"
# type: Content of: <refentry><refnamediv><refname>
#. type: Content of: <refentry><refnamediv><refname>
-#: apt_preferences.5.xml:21 apt_preferences.5.xml:27
+#: apt_preferences.5.xml:21 apt_preferences.5.xml:28
msgid "apt_preferences"
msgstr "apt_preferences"
# type: Content of: <refentry><refnamediv><refpurpose>
#. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt_preferences.5.xml:28
+#: apt_preferences.5.xml:29
msgid "Preference control file for APT"
msgstr "APT 設定制御ファイル"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:33
+#: 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> can be "
-"used to control which versions of packages will be selected for installation."
+"The APT preferences file <filename>/etc/apt/preferences</filename> and the "
+"fragment files in the <filename>/etc/apt/preferences.d/</filename> folder "
+"can be used to control which versions of packages will be selected for "
+"installation."
msgstr ""
"APT 設定ファイル <filename>/etc/apt/preferences</filename> は、インストールす"
"るパッケージのバージョン選択を制御するのに使用します。"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:37
+#: apt_preferences.5.xml:39
msgid ""
"Several versions of a package may be available for installation when the "
"&sources-list; file contains references to more than one distribution (for "
@@ -7003,7 +7510,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:47
+#: apt_preferences.5.xml:49
msgid ""
"Several instances of the same version of a package may be available when the "
"&sources-list; file contains references to more than one source. In this "
@@ -7019,27 +7526,27 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:54
+#: apt_preferences.5.xml:56
msgid "APT's Default Priority Assignments"
msgstr "APT のデフォルト優先度の割り当て"
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:69
+#: apt_preferences.5.xml:71
#, no-wrap
msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
msgstr "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:72
+#: apt_preferences.5.xml:74
#, no-wrap
msgid "APT::Default-Release \"stable\";\n"
msgstr "APT::Default-Release \"stable\";\n"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:56
+#: apt_preferences.5.xml:58
msgid ""
"If there is no preferences file or if there is no entry in the file that "
"applies to a particular version then the priority assigned to that version "
@@ -7064,25 +7571,25 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:81
+#: apt_preferences.5.xml:83
msgid "priority 100"
msgstr "priority 100"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:82
+#: apt_preferences.5.xml:84
msgid "to the version that is already installed (if any)."
msgstr "(あるならば) 既にインストールされているバージョン。"
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:86
+#: apt_preferences.5.xml:88
msgid "priority 500"
msgstr "priority 500"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:87
+#: apt_preferences.5.xml:89
msgid ""
"to the versions that are not installed and do not belong to the target "
"release."
@@ -7090,20 +7597,20 @@ msgstr "インストールされておらず、ターゲットリリースに含
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:91
+#: apt_preferences.5.xml:93
msgid "priority 990"
msgstr "priority 990"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:92
+#: apt_preferences.5.xml:94
msgid ""
"to the versions that are not installed and belong to the target release."
msgstr "インストールされておらず、ターゲットリリースに含まれるバージョン。"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:76
+#: apt_preferences.5.xml:78
msgid ""
"If the target release has been specified then APT uses the following "
"algorithm to set the priorities of the versions of a package. Assign: "
@@ -7115,7 +7622,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:97
+#: apt_preferences.5.xml:99
msgid ""
"If the target release has not been specified then APT simply assigns "
"priority 100 to all installed package versions and priority 500 to all "
@@ -7127,7 +7634,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:101
+#: apt_preferences.5.xml:103
msgid ""
"APT then applies the following rules, listed in order of precedence, to "
"determine which version of a package to install."
@@ -7137,7 +7644,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:104
+#: apt_preferences.5.xml:106
msgid ""
"Never downgrade unless the priority of an available version exceeds 1000. "
"(\"Downgrading\" is installing a less recent version of a package in place "
@@ -7153,13 +7660,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:110
+#: apt_preferences.5.xml:112
msgid "Install the highest priority version."
msgstr "最も高い優先度のバージョンをインストールします。"
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:111
+#: apt_preferences.5.xml:113
msgid ""
"If two or more versions have the same priority, install the most recent one "
"(that is, the one with the higher version number)."
@@ -7169,7 +7676,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:114
+#: apt_preferences.5.xml:116
msgid ""
"If two or more versions have the same priority and version number but either "
"the packages differ in some of their metadata or the <literal>--reinstall</"
@@ -7181,7 +7688,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:120
+#: apt_preferences.5.xml:122
msgid ""
"In a typical situation, the installed version of a package (priority 100) "
"is not as recent as one of the versions available from the sources listed in "
@@ -7197,7 +7704,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:127
+#: apt_preferences.5.xml:129
msgid ""
"More rarely, the installed version of a package is <emphasis>more</emphasis> "
"recent than any of the other available versions. The package will not be "
@@ -7211,7 +7718,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:132
+#: apt_preferences.5.xml:134
msgid ""
"Sometimes the installed version of a package is more recent than the version "
"belonging to the target release, but not as recent as a version belonging to "
@@ -7231,13 +7738,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:141
+#: apt_preferences.5.xml:143
msgid "The Effect of APT Preferences"
msgstr "APT 設定の効果"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:143
+#: apt_preferences.5.xml:145
msgid ""
"The APT preferences file allows the system administrator to control the "
"assignment of priorities. The file consists of one or more multi-line "
@@ -7250,7 +7757,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:149
+#: apt_preferences.5.xml:151
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
"specified packages and specified version or version range. For example, the "
@@ -7265,7 +7772,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:156
+#: apt_preferences.5.xml:158
#, no-wrap
msgid ""
"Package: perl\n"
@@ -7278,7 +7785,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:162
+#: apt_preferences.5.xml:164
msgid ""
"The general form assigns a priority to all of the package versions in a "
"given distribution (that is, to all the versions of packages that are listed "
@@ -7293,7 +7800,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:168
+#: apt_preferences.5.xml:170
msgid ""
"This general-form entry in the APT preferences file applies only to groups "
"of packages. For example, the following record assigns a high priority to "
@@ -7305,7 +7812,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:173
+#: apt_preferences.5.xml:175
#, no-wrap
msgid ""
"Package: *\n"
@@ -7318,7 +7825,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:178
+#: apt_preferences.5.xml:180
msgid ""
"A note of caution: the keyword used here is \"<literal>origin</literal>\". "
"This should not be confused with the Origin of a distribution as specified "
@@ -7334,7 +7841,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:184
+#: apt_preferences.5.xml:186
msgid ""
"The following record assigns a low priority to all package versions "
"belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -7345,7 +7852,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:188
+#: apt_preferences.5.xml:190
#, no-wrap
msgid ""
"Package: *\n"
@@ -7358,7 +7865,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:193
+#: apt_preferences.5.xml:195
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is \"<literal>squeeze</literal>"
@@ -7369,7 +7876,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:197
+#: apt_preferences.5.xml:199
#, no-wrap
msgid ""
"Package: *\n"
@@ -7382,7 +7889,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:204
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -7394,7 +7901,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:207
+#: apt_preferences.5.xml:209
#, no-wrap
msgid ""
"Package: *\n"
@@ -7407,18 +7914,18 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:218
+#: apt_preferences.5.xml:220
msgid "How APT Interprets Priorities"
msgstr "APT が優先度に割り込む方法"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:226
+#: apt_preferences.5.xml:228
msgid "P &gt; 1000"
msgstr "P &gt; 1000"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:227
+#: apt_preferences.5.xml:229
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
@@ -7426,13 +7933,13 @@ msgstr ""
"パッケージがダウングレードしても、このバージョンのパッケージをインストール"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:231
+#: apt_preferences.5.xml:233
msgid "990 &lt; P &lt;=1000"
msgstr "990 &lt; P &lt;=1000"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:232
+#: apt_preferences.5.xml:234
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
@@ -7441,13 +7948,13 @@ msgstr ""
"含まれなくても、このバージョンのパッケージをインストール"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:237
+#: apt_preferences.5.xml:239
msgid "500 &lt; P &lt;=990"
msgstr "500 &lt; P &lt;=990"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:238
+#: apt_preferences.5.xml:240
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to the target release or the installed version is more recent"
@@ -7456,13 +7963,13 @@ msgstr ""
"ジョンの方が新しいのでなければ、このバージョンのパッケージをインストール"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:243
+#: apt_preferences.5.xml:245
msgid "100 &lt; P &lt;=500"
msgstr "100 &lt; P &lt;=500"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:244
+#: apt_preferences.5.xml:246
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to some other distribution or the installed version is more recent"
@@ -7472,13 +7979,13 @@ msgstr ""
"ル"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:249
+#: apt_preferences.5.xml:251
msgid "0 &lt; P &lt;=100"
msgstr "0 &lt; P &lt;=100"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:250
+#: apt_preferences.5.xml:252
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
@@ -7487,19 +7994,19 @@ msgstr ""
"ンストール"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:254
+#: apt_preferences.5.xml:256
msgid "P &lt; 0"
msgstr "P &lt; 0"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:255
+#: apt_preferences.5.xml:257
msgid "prevents the version from being installed"
msgstr "このバージョンのインストール禁止"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:221
+#: apt_preferences.5.xml:223
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -7511,7 +8018,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:260
+#: apt_preferences.5.xml:262
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -7525,7 +8032,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:266
+#: apt_preferences.5.xml:268
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
@@ -7535,7 +8042,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:270
+#: apt_preferences.5.xml:272
#, no-wrap
msgid ""
"Package: perl\n"
@@ -7564,13 +8071,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:283
+#: apt_preferences.5.xml:285
msgid "Then:"
msgstr "すると、以下のように動作します。"
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:285
+#: apt_preferences.5.xml:287
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -7585,7 +8092,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:290
+#: apt_preferences.5.xml:292
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -7597,7 +8104,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:294
+#: apt_preferences.5.xml:296
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an <literal>unstable</"
@@ -7611,13 +8118,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:304
+#: apt_preferences.5.xml:306
msgid "Determination of Package Version and Distribution Properties"
msgstr "パッケージのバージョンとディストリビューションプロパティの決定"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:308
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -7628,30 +8135,30 @@ msgstr ""
"filename> ファイルを提供します。"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:318
+#: apt_preferences.5.xml:320
msgid "the <literal>Package:</literal> line"
msgstr "<literal>Package:</literal> 行"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:319
+#: apt_preferences.5.xml:321
msgid "gives the package name"
msgstr "パッケージ名"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:322 apt_preferences.5.xml:372
+#: apt_preferences.5.xml:324 apt_preferences.5.xml:374
msgid "the <literal>Version:</literal> line"
msgstr "<literal>Version:</literal> 行"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml:325
msgid "gives the version number for the named package"
msgstr "その名前のパッケージのバージョン番号"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:310
+#: apt_preferences.5.xml:312
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -7671,13 +8178,13 @@ msgstr ""
"type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:339
+#: apt_preferences.5.xml:341
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr "<literal>Archive:</literal> 行や <literal>Suite:</literal> 行"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:340
+#: apt_preferences.5.xml:342
#, fuzzy
msgid ""
"names the archive to which all the packages in the directory tree belong. "
@@ -7695,19 +8202,19 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:350
+#: apt_preferences.5.xml:352
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr "Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:356
+#: apt_preferences.5.xml:358
msgid "the <literal>Codename:</literal> line"
msgstr "<literal>Codename:</literal> 行"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:357
+#: apt_preferences.5.xml:359
#, fuzzy
msgid ""
"names the codename to which all the packages in the directory tree belong. "
@@ -7724,14 +8231,14 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:366
+#: apt_preferences.5.xml:368
#, no-wrap
msgid "Pin: release n=squeeze\n"
msgstr "Pin: release n=squeeze\n"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:373
+#: apt_preferences.5.xml:375
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
@@ -7747,7 +8254,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:382
+#: apt_preferences.5.xml:384
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -7759,13 +8266,13 @@ msgstr ""
"Pin: release 3.0\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:391
+#: apt_preferences.5.xml:393
msgid "the <literal>Component:</literal> line"
msgstr "<literal>Component:</literal> 行"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:392
+#: apt_preferences.5.xml:394
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -7783,19 +8290,19 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:401
+#: apt_preferences.5.xml:403
#, no-wrap
msgid "Pin: release c=main\n"
msgstr "Pin: release c=main\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:407
+#: apt_preferences.5.xml:409
msgid "the <literal>Origin:</literal> line"
msgstr "<literal>Origin:</literal> 行"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:408
+#: apt_preferences.5.xml:410
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -7808,19 +8315,19 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:414
+#: apt_preferences.5.xml:416
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr "Pin: release o=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:420
+#: apt_preferences.5.xml:422
msgid "the <literal>Label:</literal> line"
msgstr "<literal>Label:</literal> 行"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:421
+#: apt_preferences.5.xml:423
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -7833,14 +8340,14 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:427
+#: apt_preferences.5.xml:429
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr "Pin: release l=Debian\n"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:330
#, fuzzy
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
@@ -7862,7 +8369,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:434
+#: apt_preferences.5.xml:436
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -7888,13 +8395,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml:449
msgid "Optional Lines in an APT Preferences Record"
msgstr "APT 設定レコードのオプション行"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:449
+#: apt_preferences.5.xml:451
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -7905,7 +8412,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:453
+#: apt_preferences.5.xml:455
#, fuzzy
msgid ""
"The <literal>Pin-Priority:</literal> line in each APT preferences record is "
@@ -7919,13 +8426,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:462
+#: apt_preferences.5.xml:464
msgid "Tracking Stable"
msgstr "安定版の追跡"
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:470
+#: apt_preferences.5.xml:472
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -7950,7 +8457,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:466
#, fuzzy
msgid ""
"The following APT preferences file will cause APT to assign a priority "
@@ -7966,8 +8473,8 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:487 apt_preferences.5.xml:533
-#: apt_preferences.5.xml:591
+#: apt_preferences.5.xml:489 apt_preferences.5.xml:535
+#: apt_preferences.5.xml:593
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -7980,7 +8487,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:482
+#: apt_preferences.5.xml:484
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -7993,14 +8500,14 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:499
+#: apt_preferences.5.xml:501
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr "apt-get install <replaceable>package</replaceable>/testing\n"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:493
+#: apt_preferences.5.xml:495
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -8014,13 +8521,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:507
msgid "Tracking Testing or Unstable"
msgstr "テスト版や不安定版の追跡"
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:514
+#: apt_preferences.5.xml:516
#, no-wrap
msgid ""
"Package: *\n"
@@ -8049,7 +8556,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:507
+#: apt_preferences.5.xml:509
#, fuzzy
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
@@ -8067,7 +8574,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:528
+#: apt_preferences.5.xml:530
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -8080,14 +8587,14 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:550
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr "apt-get install <replaceable>package</replaceable>/unstable\n"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:539
+#: apt_preferences.5.xml:541
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -8106,13 +8613,13 @@ msgstr ""
"の最新版にアップグレードします。"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:555
+#: apt_preferences.5.xml:557
msgid "Tracking the evolution of a codename release"
msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:569
+#: apt_preferences.5.xml:571
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -8146,7 +8653,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:559
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -8162,7 +8669,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:586
+#: apt_preferences.5.xml:588
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -8175,14 +8682,14 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:606
+#: apt_preferences.5.xml:608
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr "apt-get install <replaceable>package</replaceable>/sid\n"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:597
+#: apt_preferences.5.xml:599
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -8200,27 +8707,35 @@ msgstr ""
"literal> バージョンのパッケージが更新されていれば <literal>unstable</literal>"
"の最新版にアップグレードします。"
+# type: Content of: <refentry><refnamediv><refname>
+#. type: Content of: <refentry><refsect1><variablelist>
+#: apt_preferences.5.xml:617
+#, fuzzy
+#| msgid "apt_preferences"
+msgid "&file-preferences;"
+msgstr "apt_preferences"
+
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:614
+#: apt_preferences.5.xml:623
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
# type: Content of: <refentry><refnamediv><refname>
#. type: Content of: <refentry><refnamediv><refname>
-#: sources.list.5.xml:22 sources.list.5.xml:28
+#: sources.list.5.xml:22 sources.list.5.xml:29
msgid "sources.list"
msgstr "sources.list"
# type: Content of: <refentry><refnamediv><refpurpose>
#. type: Content of: <refentry><refnamediv><refpurpose>
-#: sources.list.5.xml:29
+#: sources.list.5.xml:30
msgid "Package resource list for APT"
msgstr "APT 用パッケージリソースリスト"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:33
+#: sources.list.5.xml:34
msgid ""
"The package resource list is used to locate archives of the package "
"distribution system in use on the system. At this time, this manual page "
@@ -8234,7 +8749,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:38
+#: sources.list.5.xml:39
msgid ""
"The source list is designed to support any number of active sources and a "
"variety of source media. The file lists one source per line, with the most "
@@ -8255,13 +8770,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:49
+#: sources.list.5.xml:50
msgid "sources.list.d"
msgstr "sources.list.d"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:50
+#: sources.list.5.xml:51
#, fuzzy
msgid ""
"The <filename>/etc/apt/sources.list.d</filename> directory provides a way to "
@@ -8278,13 +8793,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:59
+#: sources.list.5.xml:60
msgid "The deb and deb-src types"
msgstr "deb タイプと deb-src タイプ"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:60
+#: sources.list.5.xml:61
msgid ""
"The <literal>deb</literal> type describes a typical two-level Debian "
"archive, <filename>distribution/component</filename>. Typically, "
@@ -8308,7 +8823,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:72
+#: 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 are:"
@@ -8318,14 +8833,14 @@ msgstr ""
"ます。"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:75
+#: sources.list.5.xml:76
#, no-wrap
msgid "deb uri distribution [component1] [component2] [...]"
msgstr "deb uri distribution [component1] [component2] [...]"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:77
+#: sources.list.5.xml:78
msgid ""
"The URI for the <literal>deb</literal> type must specify the base of the "
"Debian distribution, from which APT will find the information it needs. "
@@ -8347,7 +8862,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:86
+#: sources.list.5.xml:87
msgid ""
"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)"
"</literal> which expands to the Debian architecture (i386, m68k, "
@@ -8366,7 +8881,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:94
+#: sources.list.5.xml:95
msgid ""
"Since only one distribution can be specified per line it may be necessary to "
"have multiple lines for the same URI, if a subset of all available "
@@ -8390,7 +8905,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:106
+#: sources.list.5.xml:107
msgid ""
"It is important to list sources in order of preference, with the most "
"preferred source listed first. Typically this will result in sorting by "
@@ -8404,12 +8919,12 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:111
+#: sources.list.5.xml:112
msgid "Some examples:"
msgstr "例:"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:113
+#: sources.list.5.xml:114
#, no-wrap
msgid ""
"deb http://http.us.debian.org/debian stable main contrib non-free\n"
@@ -8422,19 +8937,19 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:119
+#: sources.list.5.xml:120
msgid "URI specification"
msgstr "URI の仕様"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:124
+#: sources.list.5.xml:125
msgid "file"
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:126
+#: sources.list.5.xml:127
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -8445,7 +8960,7 @@ 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:133
+#: sources.list.5.xml:134
msgid ""
"The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
"Use the &apt-cdrom; program to create cdrom entries in the source list."
@@ -8456,7 +8971,7 @@ 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:140
+#: sources.list.5.xml:141
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -8473,7 +8988,7 @@ 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:151
+#: sources.list.5.xml:152
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual page. "
@@ -8492,13 +9007,13 @@ msgstr ""
"ます。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:160
+#: sources.list.5.xml:161
msgid "copy"
msgstr "copy"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:162
+#: sources.list.5.xml:163
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -8509,18 +9024,18 @@ msgstr ""
"て、APT でコピーを行う場合に便利です。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:167
+#: sources.list.5.xml:168
msgid "rsh"
msgstr "rsh"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:167
+#: sources.list.5.xml:168
msgid "ssh"
msgstr "ssh"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:169
+#: sources.list.5.xml:170
msgid ""
"The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
"user and access the files. It is a good idea to do prior arrangements with "
@@ -8536,7 +9051,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:121
+#: sources.list.5.xml:122
msgid ""
"The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
"rsh. <placeholder type=\"variablelist\" id=\"0\"/>"
@@ -8546,7 +9061,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:181
+#: 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."
@@ -8555,38 +9070,38 @@ msgstr ""
"free 用のローカル (または NFS) アーカイブを使用します。"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:183
+#: 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:185
+#: 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:186
+#: 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:188
+#: sources.list.5.xml:189
msgid "Source line for the above"
msgstr "上記のソース行"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:189
+#: 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:191
+#: sources.list.5.xml:192
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
@@ -8596,14 +9111,14 @@ msgstr ""
# type: <example></example>
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:193
+#: 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:195
+#: 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."
@@ -8613,14 +9128,14 @@ msgstr ""
# type: <example></example>
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:197
+#: 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:199
+#: 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 "
@@ -8634,14 +9149,14 @@ msgstr ""
# type: <example></example>
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:203
+#: 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:205
+#: sources.list.5.xml:206
msgid ""
"Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US "
"directory."
@@ -8650,20 +9165,20 @@ msgstr ""
"下を使用します。"
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:207
+#: 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:216
+#: 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:209
+#: 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</"
@@ -8682,10 +9197,71 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:221
+#: sources.list.5.xml:222
msgid "&apt-cache; &apt-conf;"
msgstr "&apt-cache; &apt-conf;"
+# type: Content of: <refentry><refnamediv><refname>
+#, fuzzy
+#~ msgid "NoConfigure"
+#~ msgstr "config-files"
+
+# type: Content of: <refentry><refsect1><para>
+#~ msgid "<filename>/etc/apt/sources.list</filename>"
+#~ msgstr "<filename>/etc/apt/sources.list</filename>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#~ msgid ""
+#~ "Locations to fetch packages from. Configuration Item: <literal>Dir::Etc::"
+#~ "SourceList</literal>."
+#~ msgstr ""
+#~ "パッケージの取得元。設定項目 - <literal>Dir::Etc::SourceList</literal>"
+
+# type: Content of: <refentry><refsect1><para>
+#~ msgid "<filename>&statedir;/lists/</filename>"
+#~ msgstr "<filename>&statedir;/lists/</filename>"
+
+# type: Content of: <refentry><refsect1><para>
+#~ msgid "<filename>&statedir;/lists/partial/</filename>"
+#~ msgstr "<filename>&statedir;/lists/partial/</filename>"
+
+# type: Content of: <refentry><refsect1><para>
+#~ msgid "<filename>/etc/apt/apt.conf</filename>"
+#~ msgstr "<filename>/etc/apt/apt.conf</filename>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#~ msgid ""
+#~ "APT configuration file. Configuration Item: <literal>Dir::Etc::Main</"
+#~ "literal>."
+#~ msgstr "APT 設定ファイル。設定項目 - <literal>Dir::Etc::Main</literal>"
+
+# type: Content of: <refentry><refsect1><para>
+#~ msgid "<filename>/etc/apt/apt.conf.d/</filename>"
+#~ msgstr "<filename>/etc/apt/apt.conf.d/</filename>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#~ msgid ""
+#~ "APT configuration file fragments. Configuration Item: <literal>Dir::Etc::"
+#~ "Parts</literal>."
+#~ msgstr ""
+#~ "APT 設定ファイルの断片。設定項目 - <literal>Dir::Etc::Parts</literal>"
+
+# type: Content of: <refentry><refsect1><para>
+#~ msgid "<filename>&cachedir;/archives/</filename>"
+#~ msgstr "<filename>&cachedir;/archives/</filename>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#~ msgid ""
+#~ "Storage area for retrieved package files. Configuration Item: "
+#~ "<literal>Dir::Cache::Archives</literal>."
+#~ msgstr ""
+#~ "取得済みパッケージファイル格納エリア。設定項目 - <literal>Dir::Cache::"
+#~ "Archives</literal>"
+
+# type: Content of: <refentry><refsect1><para>
+#~ 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>"
@@ -9464,11 +10040,6 @@ msgstr "&apt-cache; &apt-conf;"
#~ msgid "Operation failed"
#~ msgstr "オプション"
-# type: Content of: <refentry><refnamediv><refname>
-#, fuzzy
-#~ msgid "Config-Item"
-#~ msgstr "config-files"
-
# type: <tag></tag>
#, fuzzy
#~ msgid "Single-Instance"
@@ -9494,11 +10065,6 @@ msgstr "&apt-cache; &apt-conf;"
#~ msgid "Version string for the method"
#~ msgstr "ユーザの設定"
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "601 Configuration"
-#~ msgstr "ユーザの設定"
-
#, fuzzy
#~ msgid "Notes"
#~ msgstr "contents"
diff --git a/methods/rred.cc b/methods/rred.cc
index 6fa57f3a6..27d95bdde 100644
--- a/methods/rred.cc
+++ b/methods/rred.cc
@@ -174,7 +174,7 @@ int RredMethod::ed_file(FILE *ed_cmds, FILE *in_file, FILE *out_file,
hash);
/* read the rest from infile */
- if (result > 0) {
+ if (result >= 0) {
while (fgets(buffer, BUF_SIZE, in_file) != NULL) {
written = fwrite(buffer, 1, strlen(buffer), out_file);
hash->Add((unsigned char*)buffer, written);
diff --git a/po/apt-all.pot b/po/apt-all.pot
index 1b763f620..46871528d 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-08-21 11:35+0200\n"
+"POT-Creation-Date: 2009-09-15 22:58+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"
@@ -1388,7 +1388,7 @@ 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:822
+#: 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
@@ -1908,80 +1908,80 @@ msgid ""
msgstr ""
#. 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 "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:342
+#: apt-pkg/contrib/strutl.cc:353
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:349
+#: apt-pkg/contrib/strutl.cc:360
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:354
+#: apt-pkg/contrib/strutl.cc:365
#, c-format
msgid "%lis"
msgstr ""
-#: 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:439
+#: apt-pkg/contrib/configuration.cc:458
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr ""
-#: 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: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:682
+#: apt-pkg/contrib/configuration.cc:703
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr ""
-#: 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: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:746
+#: apt-pkg/contrib/configuration.cc:767
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr ""
-#: 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:759
+#: apt-pkg/contrib/configuration.cc:780
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr ""
-#: 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"
msgstr ""
@@ -2292,7 +2292,7 @@ msgstr ""
msgid "Malformed line %u in source list %s (vendor id)"
msgstr ""
-#: apt-pkg/packagemanager.cc:426
+#: apt-pkg/packagemanager.cc:436
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2666,12 +2666,12 @@ msgstr ""
msgid "Installing %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:659
#, c-format
msgid "Configuring %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:666
#, c-format
msgid "Removing %s"
msgstr ""
@@ -2681,56 +2681,56 @@ msgstr ""
msgid "Running post-installation trigger %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:546
+#: apt-pkg/deb/dpkgpm.cc:557
#, c-format
msgid "Directory '%s' missing"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:635
+#: apt-pkg/deb/dpkgpm.cc:652
#, c-format
msgid "Preparing %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:636
+#: apt-pkg/deb/dpkgpm.cc:653
#, c-format
msgid "Unpacking %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:641
+#: apt-pkg/deb/dpkgpm.cc:658
#, c-format
msgid "Preparing to configure %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:643
+#: apt-pkg/deb/dpkgpm.cc:660
#, c-format
msgid "Installed %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:648
+#: apt-pkg/deb/dpkgpm.cc:665
#, c-format
msgid "Preparing for removal of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:650
+#: apt-pkg/deb/dpkgpm.cc:667
#, c-format
msgid "Removed %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:655
+#: apt-pkg/deb/dpkgpm.cc:672
#, c-format
msgid "Preparing to completely remove %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:656
+#: apt-pkg/deb/dpkgpm.cc:673
#, c-format
msgid "Completely removed %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:820
+#: apt-pkg/deb/dpkgpm.cc:861
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:889
msgid "Running dpkg"
msgstr ""