summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/apt-ftparchive.1.xml4
-rw-r--r--doc/apt-get.8.xml6
-rw-r--r--doc/apt-key.8.xml24
-rw-r--r--doc/apt.conf.5.xml54
-rw-r--r--doc/apt.ent32
-rw-r--r--doc/apt_preferences.5.xml7
-rw-r--r--doc/de/addendum/xml_de.add6
-rw-r--r--doc/es/addendum/xml_es.add9
-rw-r--r--doc/examples/apt-https-method-example.conf21
-rw-r--r--doc/examples/configure-index26
-rw-r--r--doc/fr/addendum/xml_fr.add7
-rw-r--r--doc/guide.sgml6
-rw-r--r--doc/ja/addendum/xml_ja.add7
-rw-r--r--doc/makefile2
-rw-r--r--doc/offline.sgml8
-rw-r--r--doc/po/apt-doc.pot914
-rw-r--r--doc/po/de.po2271
-rw-r--r--doc/po/es.po1041
-rw-r--r--doc/po/fr.po2882
-rw-r--r--doc/po/it.po943
-rw-r--r--doc/po/ja.po1056
-rw-r--r--doc/po/pl.po943
-rw-r--r--doc/po/pt_BR.po956
-rw-r--r--doc/po4a.conf39
-rw-r--r--doc/pt_BR/addendum/xml_pt_BR.add5
-rw-r--r--doc/sources.list.5.xml6
-rw-r--r--doc/xml.add5
27 files changed, 6947 insertions, 4333 deletions
diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml
index 5d538c2c6..eb61eae51 100644
--- a/doc/apt-ftparchive.1.xml
+++ b/doc/apt-ftparchive.1.xml
@@ -350,11 +350,11 @@
<para>
When processing a <literal>Tree</literal> section <command>apt-ftparchive</command>
performs an operation similar to:
-<informalexample><programlisting>
+ <programlisting>
for i in Sections do
for j in Architectures do
Generate for DIST=scope SECTION=i ARCH=j
-</programlisting></informalexample></para>
+ </programlisting></para>
<variablelist>
<varlistentry><term>Sections</term>
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index d3c3772bd..3d22f262c 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -333,8 +333,8 @@
<varlistentry><term><option>-f</option></term><term><option>--fix-broken</option></term>
<listitem><para>Fix; attempt to correct a system with broken dependencies in
place. This option, when used with install/remove, can omit any packages
- to permit APT to deduce a likely solution. Any Package that are specified
- must completely correct the problem. The option is sometimes necessary when
+ to permit APT to deduce a likely solution. If packages are specified,
+ these have to completely correct the problem. The option is sometimes necessary when
running APT for the first time; APT itself does not allow broken package
dependencies to exist on a system. It is possible that a system's
dependency structure can be so corrupt as to require manual intervention
@@ -466,7 +466,7 @@
<varlistentry><term><option>--purge</option></term>
<listitem><para>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
+ scheduled to be purged. <option>remove --purge</option> is equivalent to the
<option>purge</option> command.
Configuration Item: <literal>APT::Get::Purge</literal>.</para></listitem>
</varlistentry>
diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml
index 7b0691b5e..8f445b7f9 100644
--- a/doc/apt-key.8.xml
+++ b/doc/apt-key.8.xml
@@ -26,7 +26,8 @@
<refsynopsisdiv>
<cmdsynopsis>
<command>apt-key</command>
- <arg><replaceable>command</replaceable>/</arg>
+ <arg><option>--keyring <replaceable>filename</replaceable></option></arg>
+ <arg><replaceable>command</replaceable></arg>
<arg rep="repeat"><option><replaceable>arguments</replaceable></option></arg>
</cmdsynopsis>
</refsynopsisdiv>
@@ -135,11 +136,24 @@
</variablelist>
</refsect1>
+ <refsect1><title>Options</title>
+<para>Note that options need to be defined before the commands described in the previous section.</para>
+ <variablelist>
+ <varlistentry><term>--keyring <replaceable>filename</replaceable></term>
+ <listitem><para>With this option it is possible to specify a specific keyring
+ file the command should operate on. The default is that a command is executed
+ on the <filename>trusted.gpg</filename> file as well as on all parts in the
+ <filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</filename>
+ is the primary keyring which means that e.g. new keys are added to this one.
+ </para></listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+
<refsect1><title>Files</title>
<variablelist>
- <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>
- <listitem><para>Keyring of local trusted keys, new keys will be added here.</para></listitem>
- </varlistentry>
+
+ &file-trustedgpg;
<varlistentry><term><filename>/etc/apt/trustdb.gpg</filename></term>
<listitem><para>Local trust database of archive keys.</para></listitem>
@@ -153,8 +167,6 @@
<listitem><para>Keyring of Debian archive removed trusted keys.</para></listitem>
</varlistentry>
-
-
</variablelist>
</refsect1>
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index 777630e14..c13ad4867 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>18 September 2009</date>
+ <date>16 January 2010</date>
</refentryinfo>
<refmeta>
@@ -37,16 +37,27 @@
</refnamediv>
<refsect1><title>Description</title>
- <para><filename>apt.conf</filename> is the main configuration file for the APT suite of
- tools, all tools make use of the configuration file and a common command line
- parser to provide a uniform environment. When an APT tool starts up it will
- read the configuration specified by the <envar>APT_CONFIG</envar> environment
- variable (if any) and then read the files in <literal>Dir::Etc::Parts</literal>
- then read the main configuration file specified by
- <literal>Dir::Etc::main</literal> then finally apply the
- command line options to override the configuration directives, possibly
- loading even more config files.</para>
-
+ <para><filename>apt.conf</filename> is the main configuration file for
+ the APT suite of tools, but by far not the only place changes to options
+ can be made. All tools therefore share the configuration files and also
+ use a common command line parser to provide a uniform environment.</para>
+ <orderedlist>
+ <para>When an APT tool starts up it will read the configuration files
+ in the following order:</para>
+ <listitem><para>the file specified by the <envar>APT_CONFIG</envar>
+ environment variable (if any)</para></listitem>
+ <listitem><para>all files in <literal>Dir::Etc::Parts</literal> in
+ alphanumeric ascending order which have no or "<literal>conf</literal>"
+ as filename extension and which only contain alphanumeric,
+ hyphen (-), underscore (_) and period (.) characters -
+ otherwise they will be silently ignored.</para></listitem>
+ <listitem><para>the main configuration file specified by
+ <literal>Dir::Etc::main</literal></para></listitem>
+ <listitem><para>the command line options are applied to override the
+ configuration directives or to load even more configuration files.</para></listitem>
+ </orderedlist>
+ </refsect1>
+ <refsect1><title>Syntax</title>
<para>The configuration file is organized in a tree with options organized into
functional groups. Option specification is given with a double colon
notation, for instance <literal>APT::Get::Assume-Yes</literal> is an option within
@@ -166,10 +177,10 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
longer guaranteed to work as their dependency on A is not longer satisfied. The immediate configuration marker
is also applied to all dependencies which can generate a problem if the dependencies e.g. form a circle
as a dependency with the immediate flag is comparable with a Pre-Dependency. So in theory it is possible
- that APT encounters a situation in which it is unable to perform immediate configuration, error out and
- refers to this option so the user can deactivate the immediate configuration temporary to be able to perform
+ that APT encounters a situation in which it is unable to perform immediate configuration, errors out and
+ refers to this option so the user can deactivate the immediate configuration temporarily to be able to perform
an install/upgrade again. Note the use of the word "theory" here as this problem was only encountered by now
- in real world a few times in non-stable distribution versions and caused by wrong dependencies of the package
+ in real world a few times in non-stable distribution versions and was caused by wrong dependencies of the package
in question or by a system in an already broken state, so you should not blindly disable this option as
the mentioned scenario above is not the only problem immediate configuration can help to prevent in the first place.
Before a big operation like <literal>dist-upgrade</literal> is run with this option disabled it should be tried to
@@ -221,7 +232,14 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
<varlistentry><term>PDiffs</term>
<listitem><para>Try to download deltas called <literal>PDiffs</literal> for
Packages or Sources files instead of downloading whole ones. True
- by default.</para></listitem>
+ by default.</para>
+ <para>Two sub-options to limit the use of PDiffs are also available:
+ With <literal>FileLimit</literal> can be specified how many PDiff files
+ are downloaded at most to patch a file. <literal>SizeLimit</literal>
+ on the other hand is the maximum precentage of the size of all patches
+ compared to the size of the targeted file. If one of these limits is
+ exceeded the complete file is downloaded instead of the patches.
+ </para></listitem>
</varlistentry>
<varlistentry><term>Queue-Mode</term>
@@ -396,18 +414,18 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
<varlistentry><term>Languages</term>
<listitem><para>The Languages subsection controls which <filename>Translation</filename> files are downloaded
and in which order APT tries to display the Description-Translations. APT will try to display the first
- available Description for the Language which is listed at first. Languages can be defined with their
+ available Description in the Language which is listed at first. Languages can be defined with their
short or long Languagecodes. Note that not all archives provide <filename>Translation</filename>
files for every Language - especially the long Languagecodes are rare, so please
inform you which ones are available before you set here impossible values.</para>
<para>The default list includes "environment" and "en". "<literal>environment</literal>" has a special meaning here:
- It will be replaced at runtime with the languagecodes extracted from the <literal>LC_MESSAGES</literal> enviroment variable.
+ It will be replaced at runtime with the languagecodes extracted from the <literal>LC_MESSAGES</literal> environment variable.
It will also ensure that these codes are not included twice in the list. If <literal>LC_MESSAGES</literal>
is set to "C" only the <filename>Translation-en</filename> file (if available) will be used.
To force apt to use no Translation file use the setting <literal>Acquire::Languages=none</literal>. "<literal>none</literal>"
is another special meaning code which will stop the search for a fitting <filename>Translation</filename> file.
This can be used by the system administrator to let APT know that it should download also this files without
- actually use them if not the environment specifies this languages. So the following example configuration will
+ actually use them if the environment doesn't specify this languages. So the following example configuration will
result in the order "en, de" in an english and in "de, en" in a german localization. Note that "fr" is downloaded,
but not used if APT is not used in a french localization, in such an environment the order would be "fr, de, en".
<programlisting>Acquire::Languages { "environment"; "de"; "en"; "none"; "fr"; };</programlisting></para></listitem>
diff --git a/doc/apt.ent b/doc/apt.ent
index 0b341ec14..c23d906e2 100644
--- a/doc/apt.ent
+++ b/doc/apt.ent
@@ -353,3 +353,35 @@
Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>
</varlistentry>
">
+
+<!ENTITY file-trustedgpg "
+ <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>
+ <listitem><para>Keyring of local trusted keys, new keys will be added here.
+ Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para></listitem>
+ </varlistentry>
+
+ <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>
+ <listitem><para>File fragments for the trusted keys, additional keyrings can
+ be stored here (by other packages or the administrator).
+ Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>
+ </varlistentry>
+">
+
+<!ENTITY translation-title "TRANSLATION">
+
+<!-- TRANSLATOR: This is a placeholder. You should write here who has constributed
+ to the translation in the past, who is responsible now and maybe further information
+ specially related to your translation. -->
+<!ENTITY translation-holder "
+ The english translation was done by John Doe <email>john@doe.org</email> in 2009,
+ 2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together with the
+ Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>.
+">
+
+<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings
+ in a shipped manpage will maybe appear english parts. -->
+<!ENTITY translation-english "
+ Note that this translated document may contain untranslated parts.
+ This is done on purpose, to avoid losing content when the
+ translation is lagging behind the original content.
+">
diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml
index 159d61f2b..9a4791c08 100644
--- a/doc/apt_preferences.5.xml
+++ b/doc/apt_preferences.5.xml
@@ -53,6 +53,13 @@ earliest in the &sources-list; file.
The APT preferences file does not affect the choice of instance, only
the choice of version.</para>
+<para>Note that the files in the <filename>/etc/apt/preferences.d</filename>
+directory are parsed in alphanumeric ascending order and need to obey the
+following naming convention: The files have no or "<literal>pref</literal>"
+as filename extension and which only contain alphanumeric, hyphen (-),
+underscore (_) and period (.) characters - otherwise they will be silently
+ignored.</para>
+
<refsect2><title>APT's Default Priority Assignments</title>
<para>If there is no preferences file or if there is no entry in the file
diff --git a/doc/de/addendum/xml_de.add b/doc/de/addendum/xml_de.add
deleted file mode 100644
index 2332878a6..000000000
--- a/doc/de/addendum/xml_de.add
+++ /dev/null
@@ -1,6 +0,0 @@
-PO4A-HEADER:mode=after;position=manbugs;beginboundary=^</refentry>
- <refsect1><title>Übersetzung</title>
- <para>Die deutsche Übersetzung wurde 2009 von Chris Leick <email>c.leick@vollbio.de</email> angefertigt
- in Zusammenarbeit mit dem Debian German-l10n-Team <email>debian-l10n-german@lists.debian.org</email>.</para>
- </refsect1>
-
diff --git a/doc/es/addendum/xml_es.add b/doc/es/addendum/xml_es.add
deleted file mode 100644
index dc2b06be0..000000000
--- a/doc/es/addendum/xml_es.add
+++ /dev/null
@@ -1,9 +0,0 @@
-PO4A-HEADER:mode=after;position=manbugs;beginboundary=^</refentry>
- <refsect1><title>Translation</title>
- <para>The spanish translation was written 2003 and 2004 by Ismael Fanlo (2003), Carlos Mestre (2003),
- Rudy Godoy <email>rudy@kernel-panik.org</email> (2003),
- Gustavo Saldumbide <email>gsal@adinet.com.uy</email> (2003),
- Javier Fernández-Sanguino <email>jfs@computer.org</email> (2003)
- and Rubén Porras Campo <email>nahoo@inicia.es</email> (2003, 2004)
- under the aegis of the debian spanish-l10n-team <email>debian-l10n-spanish@lists.debian.org</email>.
- </refsect1>
diff --git a/doc/examples/apt-https-method-example.conf b/doc/examples/apt-https-method-example.conf
index 0067171bd..cc7889044 100644
--- a/doc/examples/apt-https-method-example.conf
+++ b/doc/examples/apt-https-method-example.conf
@@ -36,6 +36,8 @@
to access its content.
- The certificate presented by both server have (as expected) a CN that
matches their respective DNS names.
+ - We have CRL available for both dom1.tld and dom2.tld PKI, and intend
+ to use them.
- It somtimes happens that we had other more generic https available
repository to our list. We want the checks to be performed against
a common list of anchors (like the one provided by ca-certificates
@@ -56,10 +58,13 @@ Acquire::https::CaInfo "/etc/ssl/certs/ca-certificates.pem";
// Use a specific anchor and associated CRL. Enforce issuer of
// server certificate using its cert.
Acquire::https::secure.dom1.tld::CaInfo "/etc/apt/certs/ca-dom1-crt.pem";
+Acquire::https::secure.dom1.tld::CrlFile "/etc/apt/certs/ca-dom1-crl.pem";
+Acquire::https::secure.dom1.tld::IssuerCert "/etc/apt/certs/secure.dom1-issuer-crt.pem";
// Like previous for anchor and CRL, but also provide our
// certificate and keys for client authentication.
Acquire::https::secure.dom2.tld::CaInfo "/etc/apt/certs/ca-dom2-crt.pem";
+Acquire::https::secure.dom2.tld::CrlFile "/etc/apt/certs/ca-dom2-crl.pem";
Acquire::https::secure.dom2.tld::SslCert "/etc/apt/certs/my-crt.pem";
Acquire::https::secure.dom2.tld::SslKey "/etc/apt/certs/my-key.pem";
@@ -97,6 +102,22 @@ Acquire::https::secure.dom2.tld::SslKey "/etc/apt/certs/my-key.pem";
used for the https entries in the sources.list file that use that
repository (with the same name).
+ Acquire::https[::repo.domain.tld]::CrlFile "/path/to/all/crl.pem";
+
+ Like previous knob but for passing the list of CRL files (in PEM
+ format) to be used to verify revocation status. Again, if the
+ option is defined with no specific mirror (probably makes little
+ sense), this CRL information is used for all defined https entries
+ in sources.list file. In a mirror specific context, it only applies
+ to that mirror.
+
+ Acquire::https[::repo.domain.tld]::IssuerCert "/path/to/issuer/cert.pem";
+
+ Allows to constrain the issuer of the server certificate (for all
+ https mirrors or a specific one) to a specific issuer. If the
+ server certificate has not been issued by this certificate,
+ connection fails.
+
Acquire::https[::repo.domain.tld]::Verify-Peer "true";
When authenticating the server, if the certificate verification fails
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 05826feaa..0b30a50a9 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -90,11 +90,6 @@ APT
TrustCDROM "false"; // consider the CDROM always trusted
};
- GPGV
- {
- TrustedKeyring "/etc/apt/trusted.gpg";
- };
-
// Some general options
Ignore-Hold "false";
Clean-Installed "true";
@@ -176,7 +171,10 @@ Acquire
Source-Symlinks "true";
PDiffs "true"; // try to get the IndexFile diffs
-
+ PDiffs::FileLimit "4"; // don't use diffs if we would need more than 4 diffs
+ PDiffs::SizeLimit "50"; // don't use diffs if size of all patches excess
+ // 50% of the size of the original file
+
// HTTP method configuration
http
{
@@ -250,6 +248,10 @@ Acquire
cdrom
{
+ // do auto detection of the cdrom mountpoint
+ AutoDetect "true";
+
+ // cdrom mountpoint (needs to be defined in fstab if AutoDetect is not used)
mount "/cdrom";
// You need the trailing slash!
@@ -309,6 +311,7 @@ Dir "/"
// Config files
Etc "etc/apt/" {
Main "apt.conf";
+ Netrc "auth.conf";
Parts "apt.conf.d/";
Preferences "preferences";
PreferencesParts "preferences.d";
@@ -316,6 +319,8 @@ Dir "/"
SourceParts "sources.list.d";
VendorList "vendors.list";
VendorParts "vendors.list.d";
+ Trusted "trusted.gpg";
+ TrustedParts "trusted.gpg.d";
};
// Locations of binaries
@@ -334,6 +339,13 @@ Dir "/"
Log "var/log/apt" {
Terminal "term.log";
};
+
+ // Media
+ Media
+ {
+ // Media AutoDetect mount path
+ MountPath "/media/apt";
+ };
};
// Things that effect the APT dselect method
@@ -391,6 +403,7 @@ Debug
pkgProblemResolver::ShowScores "false";
pkgDepCache::AutoInstall "false"; // what packages apt install to satify dependencies
pkgDepCache::Marker "false";
+ pkgCacheGen "false";
pkgAcquire "false";
pkgAcquire::Worker "false";
pkgAcquire::Auth "false";
@@ -407,6 +420,7 @@ Debug
Acquire::gpgv "false"; // Show the gpgv traffic
aptcdrom "false"; // Show found package files
IdentCdrom "false";
+ acquire::netrc "false"; // netrc parser
}
diff --git a/doc/fr/addendum/xml_fr.add b/doc/fr/addendum/xml_fr.add
deleted file mode 100644
index 987b5b1f5..000000000
--- a/doc/fr/addendum/xml_fr.add
+++ /dev/null
@@ -1,7 +0,0 @@
-PO4A-HEADER:mode=after;position=manbugs;beginboundary=^</refentry>
- <refsect1><title>Traducteurs</title>
- <para>Jérôme Marant, Philippe Batailler, Christian Perrier <email>bubulle@debian.org</email> (2000, 2005, 2009),
- Équipe de traduction francophone de Debian <email>debian-l10n-french@lists.debian.org</email>
- </para>
- </refsect1>
-
diff --git a/doc/guide.sgml b/doc/guide.sgml
index 1b7e1d8f3..ff727f6ca 100644
--- a/doc/guide.sgml
+++ b/doc/guide.sgml
@@ -56,7 +56,7 @@ requires another package to be installed at the same time to work properly.
<p>
For instance, mailcrypt is an emacs extension that aids in encrypting email
-with GPG. Without GPGP installed mail-crypt is useless, so mailcrypt has a
+with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a
simple dependency on GPG. Also, because it is an emacs extension it has a
simple dependency on emacs, without emacs it is completely useless.
@@ -171,7 +171,7 @@ the <prgn>dselect</> package selection GUI. <prgn>dselect</> is used to
select the packages to be installed or removed and APT actually installs them.
<p>
-To enable the APT method you need to to select [A]ccess in <prgn>dselect</>
+To enable the APT method you need to select [A]ccess in <prgn>dselect</>
and then choose the APT method. You will be prompted for a set of
<em>Sources</> which are places to fetch archives from. These can be remote
Internet sites, local Debian mirrors or CDROMs. Each source can provide
@@ -239,7 +239,7 @@ prompt until you have specified all that you want.
<p>
Before starting to use <prgn>dselect</> it is necessary to update the
-available list by selecting [U]pdate from the menu. This is a super-set of
+available list by selecting [U]pdate from the menu. This is a superset of
<tt>apt-get update</> that makes the fetched information available to
<prgn>dselect</>. [U]pdate must be performed even if <tt>apt-get update</>
has been run before.
diff --git a/doc/ja/addendum/xml_ja.add b/doc/ja/addendum/xml_ja.add
deleted file mode 100644
index 05d4cff3f..000000000
--- a/doc/ja/addendum/xml_ja.add
+++ /dev/null
@@ -1,7 +0,0 @@
-PO4A-HEADER:mode=after;position=manbugs;beginboundary=^</refentry>
- <refsect1><title>訳者</title>
- <para>倉澤 望 <email>nabetaro@debian.or.jp</email> (2003-2006,2009),
- Debian JP Documentation ML <email>debian-doc@debian.or.jp</email>
- </para>
- </refsect1>
-
diff --git a/doc/makefile b/doc/makefile
index 6fb604e4e..6e6186466 100644
--- a/doc/makefile
+++ b/doc/makefile
@@ -8,7 +8,7 @@ include ../buildlib/defaults.mak
# Debian Doc SGML Documents
SOURCE = $(wildcard *.sgml)
-DEBIANDOC_HTML_OPTIONS=-l en
+DEBIANDOC_HTML_OPTIONS=-l en.UTF-8
include $(DEBIANDOC_H)
# Do not use XMLTO, build the manpages directly with XSLTPROC
diff --git a/doc/offline.sgml b/doc/offline.sgml
index 99e260bc3..e7ede14de 100644
--- a/doc/offline.sgml
+++ b/doc/offline.sgml
@@ -50,7 +50,7 @@ no connection.
<p>
This is achieved by creatively manipulating the APT configuration file. The
-essential premis to tell APT to look on a disc for it's archive files. Note
+essential premise to tell APT to look on a disc for it's archive files. Note
that the disc should be formated with a filesystem that can handle long file
names such as ext2, fat32 or vfat.
@@ -129,7 +129,7 @@ configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>.
<p>
On the target machine the first thing to do is mount the disc and copy
<em>/var/lib/dpkg/status</em> to it. You will also need to create the directories
-outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</em>
+outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</em>.
Then take the disc to the remote machine and configure the sources.list.
On the remote machine execute the following:
@@ -141,9 +141,9 @@ On the remote machine execute the following:
[ APT fetches all the packages needed to upgrade the target machine ]
</example>
-The dist-upgrade command can be replaced with any-other standard APT commands,
+The dist-upgrade command can be replaced with any other standard APT commands,
particularly dselect-upgrade. You can even use an APT front end such as
-<em>dselect</em> However this presents a problem in communicating your
+<em>dselect</em>. However this presents a problem in communicating your
selections back to the local computer.
<p>
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 5172f7f84..40ed1f589 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-28 02:08+0100\n"
+"POT-Creation-Date: 2010-01-20 12:18+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -758,7 +758,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:355
+#: apt.ent:356
#, no-wrap
msgid ""
" "
@@ -770,6 +770,72 @@ msgid ""
"\">\n"
msgstr ""
+#. type: Plain text
+#: apt.ent:362
+#, no-wrap
+msgid ""
+"<!ENTITY file-trustedgpg \"\n"
+" <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n"
+" <listitem><para>Keyring of local trusted keys, new keys will be added "
+"here.\n"
+" Configuration Item: "
+"<literal>Dir::Etc::Trusted</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:369
+#, no-wrap
+msgid ""
+" "
+"<varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
+" <listitem><para>File fragments for the trusted keys, additional "
+"keyrings can\n"
+" be stored here (by other packages or the administrator).\n"
+" Configuration Item "
+"<literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+"\">\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:371
+msgid "<!ENTITY translation-title \"TRANSLATION\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:380
+#, no-wrap
+msgid ""
+"<!-- TRANSLATOR: This is a placeholder. You should write here who has "
+"constributed\n"
+" to the translation in the past, who is responsible now and maybe "
+"further information\n"
+" specially related to your translation. -->\n"
+"<!ENTITY translation-holder \"\n"
+" The english translation was done by John Doe "
+"<email>john@doe.org</email> in 2009,\n"
+" 2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together "
+"with the\n"
+" Debian Dummy l10n Team "
+"<email>debian-l10n-dummy@lists.debian.org</email>.\n"
+"\">\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:387
+#, no-wrap
+msgid ""
+"<!-- TRANSLATOR: As a translation is allowed to have 20% of "
+"untranslated/fuzzy strings\n"
+" in a shipped manpage will maybe appear english parts. -->\n"
+"<!ENTITY translation-english \"\n"
+" Note that this translated document may contain untranslated parts.\n"
+" This is done on purpose, to avoid losing content when the\n"
+" translation is lagging behind the original content.\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-sortpkgs.1.xml:13 sources.list.5.xml:13
@@ -828,7 +894,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: 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
+#: 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:35 apt-mark.8.xml:52 apt-secure.8.xml:40 apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 sources.list.5.xml:33
msgid "Description"
msgstr ""
@@ -1218,7 +1284,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 apt-sortpkgs.1.xml:54 apt.conf.5.xml:484 apt.conf.5.xml:506
+#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524
msgid "options"
msgstr ""
@@ -1416,7 +1482,7 @@ msgid "&apt-commonoptions;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 apt.conf.5.xml:1017 apt_preferences.5.xml:615
+#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 apt.conf.5.xml:1035 apt_preferences.5.xml:622
msgid "Files"
msgstr ""
@@ -1426,7 +1492,7 @@ msgid "&file-sourceslist; &file-statelists;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622 sources.list.5.xml:233
+#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629 sources.list.5.xml:233
msgid "See Also"
msgstr ""
@@ -1535,7 +1601,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:91
+#: apt-cdrom.8.xml:91 apt-key.8.xml:139
msgid "Options"
msgstr ""
@@ -2270,7 +2336,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:288
msgid ""
-"Sets the output Packages file. Defaults to "
+"Sets the output Sources file. Defaults to "
"<filename>$(DIST)/$(SECTION)/source/Sources</filename>"
msgstr ""
@@ -2383,20 +2449,22 @@ msgid ""
"variables."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: 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>
+#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt-ftparchive.1.xml:354
#, no-wrap
msgid ""
"for i in Sections do \n"
" for j in Architectures do\n"
" Generate for DIST=scope SECTION=i ARCH=j\n"
+" "
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-ftparchive.1.xml:351
+msgid ""
+"When processing a <literal>Tree</literal> section "
+"<command>apt-ftparchive</command> performs an operation similar to: "
+"<placeholder type=\"programlisting\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
@@ -2723,7 +2791,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1011 apt_preferences.5.xml:462 sources.list.5.xml:193
+#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469 sources.list.5.xml:193
msgid "Examples"
msgstr ""
@@ -2815,7 +2883,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:135 apt-key.8.xml:123
+#: apt-get.8.xml:135 apt-key.8.xml:124
msgid "update"
msgstr ""
@@ -3143,15 +3211,15 @@ msgstr ""
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
-"to deduce a likely solution. Any Package that are specified must completely "
-"correct the problem. The option is sometimes necessary when running APT for "
-"the first time; APT itself does not allow broken package dependencies to "
-"exist on a system. It is possible that a system's dependency structure can "
-"be so corrupt as to require manual intervention (which usually means using "
-"&dselect; or <command>dpkg --remove</command> to eliminate some of the "
-"offending packages). Use of this option together with <option>-m</option> "
-"may produce an error in some situations. Configuration Item: "
-"<literal>APT::Get::Fix-Broken</literal>."
+"to deduce a likely solution. If packages are specified, these have to "
+"completely correct the problem. The option is sometimes necessary when "
+"running APT for the first time; APT itself does not allow broken package "
+"dependencies to exist on a system. It is possible that a system's dependency "
+"structure can be so corrupt as to require manual intervention (which usually "
+"means using &dselect; or <command>dpkg --remove</command> to eliminate some "
+"of the offending packages). Use of this option together with "
+"<option>-m</option> may produce an error in some situations. Configuration "
+"Item: <literal>APT::Get::Fix-Broken</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -3408,7 +3476,7 @@ msgstr ""
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 "
+"purged. <option>remove --purge</option> is equivalent to the "
"<option>purge</option> command. Configuration Item: "
"<literal>APT::Get::Purge</literal>."
msgstr ""
@@ -3628,13 +3696,14 @@ msgstr ""
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-key.8.xml:28
msgid ""
-"<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> "
-"<arg "
+"<command>apt-key</command> <arg><option>--keyring "
+"<replaceable>filename</replaceable></option></arg> "
+"<arg><replaceable>command</replaceable></arg> <arg "
"rep=\"repeat\"><option><replaceable>arguments</replaceable></option></arg>"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:36
+#: apt-key.8.xml:37
msgid ""
"<command>apt-key</command> is used to manage the list of keys used by apt to "
"authenticate packages. Packages which have been authenticated using these "
@@ -3642,17 +3711,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:42
+#: apt-key.8.xml:43
msgid "Commands"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:44
+#: apt-key.8.xml:45
msgid "add <replaceable>filename</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:48
+#: apt-key.8.xml:49
msgid ""
"Add a new key to the list of trusted keys. The key is read from "
"<replaceable>filename</replaceable>, or standard input if "
@@ -3660,116 +3729,134 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:56
+#: apt-key.8.xml:57
msgid "del <replaceable>keyid</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:60
+#: apt-key.8.xml:61
msgid "Remove a key from the list of trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:67
+#: apt-key.8.xml:68
msgid "export <replaceable>keyid</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:71
+#: apt-key.8.xml:72
msgid "Output the key <replaceable>keyid</replaceable> to standard output."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:78
+#: apt-key.8.xml:79
msgid "exportall"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:82
+#: apt-key.8.xml:83
msgid "Output all trusted keys to standard output."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:89
+#: apt-key.8.xml:90
msgid "list"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:93
+#: apt-key.8.xml:94
msgid "List trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:100
+#: apt-key.8.xml:101
msgid "finger"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:104
+#: apt-key.8.xml:105
msgid "List fingerprints of trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:111
+#: apt-key.8.xml:112
msgid "adv"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:115
+#: apt-key.8.xml:116
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:127
+#: apt-key.8.xml:128
msgid ""
"Update the local keyring with the keyring of Debian archive keys and removes "
"from the keyring the archive keys which are no longer valid."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><para>
#: apt-key.8.xml:140
-msgid "<filename>/etc/apt/trusted.gpg</filename>"
+msgid ""
+"Note that options need to be defined before the commands described in the "
+"previous section."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml:142
+msgid "--keyring <replaceable>filename</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:141
-msgid "Keyring of local trusted keys, new keys will be added here."
+#: apt-key.8.xml:143
+msgid ""
+"With this option it is possible to specify a specific keyring file the "
+"command should operate on. The default is that a command is executed on the "
+"<filename>trusted.gpg</filename> file as well as on all parts in the "
+"<filename>trusted.gpg.d</filename> directory, through "
+"<filename>trusted.gpg</filename> is the primary keyring which means that "
+"e.g. new keys are added to this one."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist>
+#: apt-key.8.xml:156
+msgid "&file-trustedgpg;"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:144
+#: apt-key.8.xml:158
msgid "<filename>/etc/apt/trustdb.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:145
+#: apt-key.8.xml:159
msgid "Local trust database of archive keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:148
+#: apt-key.8.xml:162
msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:149
+#: apt-key.8.xml:163
msgid "Keyring of Debian archive trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:152
+#: apt-key.8.xml:166
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:153
+#: apt-key.8.xml:167
msgid "Keyring of Debian archive removed trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:164
+#: apt-key.8.xml:176
msgid "&apt-get;, &apt-secure;"
msgstr ""
@@ -4217,7 +4304,7 @@ 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>18 September 2009</date>"
+"</author> &apt-email; &apt-product; <date>16 January 2010</date>"
msgstr ""
#. type: Content of: <refentry><refnamediv><refname>
@@ -4239,18 +4326,53 @@ msgstr ""
#: 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 "
-"command line parser to provide a uniform environment. When an APT tool "
-"starts up it will read the configuration specified by the "
-"<envar>APT_CONFIG</envar> environment variable (if any) and then read the "
-"files in <literal>Dir::Etc::Parts</literal> then read the main configuration "
-"file specified by <literal>Dir::Etc::main</literal> then finally apply the "
-"command line options to override the configuration directives, possibly "
-"loading even more config files."
+"suite of tools, but by far not the only place changes to options can be "
+"made. All tools therefore share the configuration files and also use a "
+"common command line parser to provide a uniform environment."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><para>
+#: apt.conf.5.xml:45
+msgid ""
+"When an APT tool starts up it will read the configuration files in the "
+"following order:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:47
+msgid ""
+"the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
+"any)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:49
+msgid ""
+"all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
+"order which have no or \"<literal>conf</literal>\" as filename extension and "
+"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
+"characters - otherwise they will be silently ignored."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:54
+msgid "the main configuration file specified by <literal>Dir::Etc::main</literal>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:56
+msgid ""
+"the command line options are applied to override the configuration "
+"directives or to load even more configuration files."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.conf.5.xml:60
+msgid "Syntax"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:50
+#: apt.conf.5.xml:61
msgid ""
"The configuration file is organized in a tree with options organized into "
"functional groups. Option specification is given with a double colon "
@@ -4260,7 +4382,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:56
+#: apt.conf.5.xml:67
msgid ""
"Syntactically the configuration language is modeled after what the ISC tools "
"such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@ -4276,7 +4398,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:70
+#: apt.conf.5.xml:81
#, no-wrap
msgid ""
"APT {\n"
@@ -4288,7 +4410,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:78
+#: apt.conf.5.xml:89
msgid ""
"with newlines placed to make it more readable. Lists can be created by "
"opening a scope and including a single string enclosed in quotes followed by "
@@ -4297,13 +4419,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:83
+#: apt.conf.5.xml:94
#, no-wrap
msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:86
+#: apt.conf.5.xml:97
msgid ""
"In general the sample configuration file in "
"<filename>&docdir;examples/apt.conf</filename> &configureindex; is a good "
@@ -4311,14 +4433,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:90
+#: apt.conf.5.xml:101
msgid ""
"The names of the configuration items are not case-sensitive. So in the "
"previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:93
+#: apt.conf.5.xml:104
msgid ""
"Names for the configuration items are optional if a list is defined as it "
"can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example "
@@ -4328,7 +4450,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:98
+#: apt.conf.5.xml:109
msgid ""
"Two specials are allowed, <literal>#include</literal> (which is deprecated "
"and not supported by alternative implementations) and "
@@ -4340,7 +4462,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:106
+#: apt.conf.5.xml:117
msgid ""
"The #clear command is the only way to delete a list or a complete scope. "
"Reopening a scope or the ::-style described below will "
@@ -4350,7 +4472,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:111
+#: apt.conf.5.xml:122
msgid ""
"All of the APT tools take a -o option which allows an arbitrary "
"configuration directive to be specified on the command line. The syntax is a "
@@ -4361,7 +4483,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:118
+#: apt.conf.5.xml:129
msgid ""
"Note that you can use :: only for appending one item per line to a list and "
"that you should not use it in combination with the scope syntax. (The scope "
@@ -4378,24 +4500,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:130
+#: apt.conf.5.xml:141
msgid "The APT Group"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:131
+#: apt.conf.5.xml:142
msgid ""
"This group of options controls general APT behavior as well as holding the "
"options for all of the tools."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:135
+#: apt.conf.5.xml:146
msgid "Architecture"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:136
+#: apt.conf.5.xml:147
msgid ""
"System Architecture; sets the architecture to use when fetching files and "
"parsing package lists. The internal default is the architecture apt was "
@@ -4403,12 +4525,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:141
+#: apt.conf.5.xml:152
msgid "Default-Release"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:142
+#: apt.conf.5.xml:153
msgid ""
"Default release to install packages from if more than one version "
"available. Contains release name, codename or release version. Examples: "
@@ -4417,24 +4539,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:146
+#: apt.conf.5.xml:157
msgid "Ignore-Hold"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:147
+#: apt.conf.5.xml:158
msgid ""
"Ignore Held packages; This global option causes the problem resolver to "
"ignore held packages in its decision making."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:151
+#: apt.conf.5.xml:162
msgid "Clean-Installed"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:152
+#: apt.conf.5.xml:163
msgid ""
"Defaults to on. When turned on the autoclean feature will remove any "
"packages which can no longer be downloaded from the cache. If turned off "
@@ -4443,12 +4565,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:158
+#: apt.conf.5.xml:169
msgid "Immediate-Configure"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:159
+#: apt.conf.5.xml:170
msgid ""
"Defaults to on which will cause APT to install essential and important "
"packages as fast as possible in the install/upgrade operation. This is done "
@@ -4464,13 +4586,13 @@ msgid ""
"dependencies which can generate a problem if the dependencies e.g. form a "
"circle as a dependency with the immediate flag is comparable with a "
"Pre-Dependency. So in theory it is possible that APT encounters a situation "
-"in which it is unable to perform immediate configuration, error out and "
+"in which it is unable to perform immediate configuration, errors out and "
"refers to this option so the user can deactivate the immediate configuration "
-"temporary to be able to perform an install/upgrade again. Note the use of "
+"temporarily to be able to perform an install/upgrade again. Note the use of "
"the word \"theory\" here as this problem was only encountered by now in real "
-"world a few times in non-stable distribution versions and caused by wrong "
-"dependencies of the package in question or by a system in an already broken "
-"state, so you should not blindly disable this option as the mentioned "
+"world a few times in non-stable distribution versions and was caused by "
+"wrong dependencies of the package in question or by a system in an already "
+"broken state, so you should not blindly disable this option as the mentioned "
"scenario above is not the only problem immediate configuration can help to "
"prevent in the first place. Before a big operation like "
"<literal>dist-upgrade</literal> is run with this option disabled it should "
@@ -4481,12 +4603,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:181
+#: apt.conf.5.xml:192
msgid "Force-LoopBreak"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:182
+#: apt.conf.5.xml:193
msgid ""
"Never Enable this option unless you -really- know what you are doing. It "
"permits APT to temporarily remove an essential package to break a "
@@ -4497,87 +4619,98 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:190
+#: apt.conf.5.xml:201
msgid "Cache-Limit"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:191
+#: apt.conf.5.xml:202
msgid ""
"APT uses a fixed size memory mapped cache file to store the 'available' "
"information. This sets the size of that cache (in bytes)."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:195
+#: apt.conf.5.xml:206
msgid "Build-Essential"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:196
+#: apt.conf.5.xml:207
msgid "Defines which package(s) are considered essential build dependencies."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:210
msgid "Get"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:200
+#: apt.conf.5.xml:211
msgid ""
"The Get subsection controls the &apt-get; tool, please see its documentation "
"for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:204
+#: apt.conf.5.xml:215
msgid "Cache"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:205
+#: apt.conf.5.xml:216
msgid ""
"The Cache subsection controls the &apt-cache; tool, please see its "
"documentation for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:209
+#: apt.conf.5.xml:220
msgid "CDROM"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:210
+#: apt.conf.5.xml:221
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool, please see its "
"documentation for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:216
+#: apt.conf.5.xml:227
msgid "The Acquire Group"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:232
msgid "PDiffs"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:222
+#: apt.conf.5.xml:233
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for Packages or "
"Sources files instead of downloading whole ones. True by default."
msgstr ""
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:236
+msgid ""
+"Two sub-options to limit the use of PDiffs are also available: With "
+"<literal>FileLimit</literal> can be specified how many PDiff files are "
+"downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
+"other hand is the maximum precentage of the size of all patches compared to "
+"the size of the targeted file. If one of these limits is exceeded the "
+"complete file is downloaded instead of the patches."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:227
+#: apt.conf.5.xml:245
msgid "Queue-Mode"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:228
+#: apt.conf.5.xml:246
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of "
"<literal>host</literal> or <literal>access</literal> which determines how "
@@ -4587,36 +4720,36 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:235
+#: apt.conf.5.xml:253
msgid "Retries"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:254
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:240
+#: apt.conf.5.xml:258
msgid "Source-Symlinks"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:241
+#: apt.conf.5.xml:259
msgid ""
"Use symlinks for source archives. If set to true then source archives will "
"be symlinked when possible instead of copying. True is the default."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:245 sources.list.5.xml:139
+#: apt.conf.5.xml:263 sources.list.5.xml:139
msgid "http"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:246
+#: apt.conf.5.xml:264
msgid ""
"HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
"standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@ -4628,7 +4761,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:254
+#: apt.conf.5.xml:272
msgid ""
"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
"caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@ -4642,7 +4775,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:264 apt.conf.5.xml:328
+#: apt.conf.5.xml:282 apt.conf.5.xml:346
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method, this applies to all things including connection timeout and data "
@@ -4650,7 +4783,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:267
+#: apt.conf.5.xml:285
msgid ""
"One setting is provided to control the pipeline depth in cases where the "
"remote server is not RFC conforming or buggy (such as Squid 2.0.2). "
@@ -4662,7 +4795,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:275
+#: apt.conf.5.xml:293
msgid ""
"The used bandwidth can be limited with "
"<literal>Acquire::http::Dl-Limit</literal> which accepts integer values in "
@@ -4672,7 +4805,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:280
+#: apt.conf.5.xml:298
msgid ""
"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
"User-Agent for the http download method as some proxies allow access for "
@@ -4680,12 +4813,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:286
+#: apt.conf.5.xml:304
msgid "https"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:287
+#: apt.conf.5.xml:305
msgid ""
"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
"options are the same as for <literal>http</literal> method and will also "
@@ -4695,7 +4828,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:311
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -4717,12 +4850,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:311 sources.list.5.xml:150
+#: apt.conf.5.xml:329 sources.list.5.xml:150
msgid "ftp"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:312
+#: apt.conf.5.xml:330
msgid ""
"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@ -4742,7 +4875,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#: apt.conf.5.xml:349
msgid ""
"Several settings are provided to control passive mode. Generally it is safe "
"to leave passive mode on, it works in nearly every environment. However "
@@ -4752,7 +4885,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:338
+#: apt.conf.5.xml:356
msgid ""
"It is possible to proxy FTP over HTTP by setting the "
"<envar>ftp_proxy</envar> environment variable to a http url - see the "
@@ -4762,7 +4895,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:343
+#: apt.conf.5.xml:361
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4772,18 +4905,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:350 sources.list.5.xml:132
+#: apt.conf.5.xml:368 sources.list.5.xml:132
msgid "cdrom"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:356
+#: apt.conf.5.xml:374
#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:369
msgid ""
"CDROM URIs; the only setting for CDROM URIs is the mount point, "
"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@ -4796,12 +4929,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:361
+#: apt.conf.5.xml:379
msgid "gpgv"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:362
+#: apt.conf.5.xml:380
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
@@ -4809,12 +4942,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:385
msgid "CompressionTypes"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:373
+#: apt.conf.5.xml:391
#, no-wrap
msgid ""
"Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> "
@@ -4822,7 +4955,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:368
+#: apt.conf.5.xml:386
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -4834,19 +4967,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:378
+#: apt.conf.5.xml:396
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:381
+#: apt.conf.5.xml:399
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:374
+#: apt.conf.5.xml:392
msgid ""
"Also the <literal>Order</literal> subgroup can be used to define in which "
"order the acquire system will try to download the compressed files. The "
@@ -4863,13 +4996,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:385
+#: apt.conf.5.xml:403
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:383
+#: apt.conf.5.xml:401
msgid ""
"Note that at run time the "
"<literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will be "
@@ -4884,7 +5017,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:408
msgid ""
"While it is possible to add an empty compression type to the order list, but "
"APT in its current version doesn't understand it correctly and will display "
@@ -4894,17 +5027,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:396
+#: apt.conf.5.xml:414
msgid "Languages"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:397
+#: apt.conf.5.xml:415
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the "
"Description-Translations. APT will try to display the first available "
-"Description for the Language which is listed at first. Languages can be "
+"Description in the Language which is listed at first. Languages can be "
"defined with their short or long Languagecodes. Note that not all archives "
"provide <filename>Translation</filename> files for every Language - "
"especially the long Languagecodes are rare, so please inform you which ones "
@@ -4912,18 +5045,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:413
+#: apt.conf.5.xml:431
#, no-wrap
msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:421
msgid ""
"The default list includes \"environment\" and "
"\"en\". \"<literal>environment</literal>\" has a special meaning here: It "
"will be replaced at runtime with the languagecodes extracted from the "
-"<literal>LC_MESSAGES</literal> enviroment variable. It will also ensure "
+"<literal>LC_MESSAGES</literal> environment variable. It will also ensure "
"that these codes are not included twice in the list. If "
"<literal>LC_MESSAGES</literal> is set to \"C\" only the "
"<filename>Translation-en</filename> file (if available) will be used. To "
@@ -4932,7 +5065,7 @@ msgid ""
"another special meaning code which will stop the search for a fitting "
"<filename>Translation</filename> file. This can be used by the system "
"administrator to let APT know that it should download also this files "
-"without actually use them if not the environment specifies this "
+"without actually use them if the environment doesn't specify this "
"languages. So the following example configuration will result in the order "
"\"en, de\" in an english and in \"de, en\" in a german localization. Note "
"that \"fr\" is downloaded, but not used if APT is not used in a french "
@@ -4941,7 +5074,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:217
+#: apt.conf.5.xml:228
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages and the URI handlers. <placeholder type=\"variablelist\" "
@@ -4949,12 +5082,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:438
msgid "Directories"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:422
+#: apt.conf.5.xml:440
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -4966,7 +5099,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:429
+#: apt.conf.5.xml:447
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4979,7 +5112,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:438
+#: apt.conf.5.xml:456
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4989,7 +5122,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:444
+#: apt.conf.5.xml:462
msgid ""
"The <literal>Dir::Parts</literal> setting reads in all the config fragments "
"in lexical order from the directory specified. After this is done then the "
@@ -4997,7 +5130,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:448
+#: apt.conf.5.xml:466
msgid ""
"Binary programs are pointed to by "
"<literal>Dir::Bin</literal>. <literal>Dir::Bin::Methods</literal> specifies "
@@ -5009,7 +5142,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:456
+#: apt.conf.5.xml:474
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -5022,12 +5155,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:469
+#: apt.conf.5.xml:487
msgid "APT in DSelect"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:471
+#: apt.conf.5.xml:489
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -5035,12 +5168,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:475
+#: apt.conf.5.xml:493
msgid "Clean"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:476
+#: apt.conf.5.xml:494
msgid ""
"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
"and never. always and prompt will remove all packages from the cache after "
@@ -5051,50 +5184,50 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:485
+#: apt.conf.5.xml:503
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the install phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:489
+#: apt.conf.5.xml:507
msgid "Updateoptions"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:508
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the update phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:494
+#: apt.conf.5.xml:512
msgid "PromptAfterUpdate"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:495
+#: apt.conf.5.xml:513
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:501
+#: apt.conf.5.xml:519
msgid "How APT calls dpkg"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:520
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:507
+#: apt.conf.5.xml:525
msgid ""
"This is a list of options to pass to dpkg. The options must be specified "
"using the list notation and each list item is passed as a single argument to "
@@ -5102,17 +5235,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:530
msgid "Pre-Invoke"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:530
msgid "Post-Invoke"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:513
+#: apt.conf.5.xml:531
msgid ""
"This is a list of shell commands to run before/after invoking &dpkg;. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -5121,12 +5254,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:519
+#: apt.conf.5.xml:537
msgid "Pre-Install-Pkgs"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:520
+#: apt.conf.5.xml:538
msgid ""
"This is a list of shell commands to run before invoking dpkg. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -5136,7 +5269,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:526
+#: apt.conf.5.xml:544
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -5147,36 +5280,36 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:533
+#: apt.conf.5.xml:551
msgid "Run-Directory"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:534
+#: apt.conf.5.xml:552
msgid ""
"APT chdirs to this directory before invoking dpkg, the default is "
"<filename>/</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:556
msgid "Build-options"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:557
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages, the "
"default is to disable signing and produce all binaries."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:544
+#: apt.conf.5.xml:562
msgid "dpkg trigger usage (and related options)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:545
+#: apt.conf.5.xml:563
msgid ""
"APT can call dpkg in a way so it can make aggressive use of triggers over "
"multiply calls of dpkg. Without further options dpkg will use triggers only "
@@ -5191,7 +5324,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:578
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -5201,7 +5334,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:554
+#: apt.conf.5.xml:572
msgid ""
"Note that it is not guaranteed that APT will support these options or that "
"these options will not cause (big) trouble in the future. If you have "
@@ -5215,12 +5348,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:584
msgid "DPkg::NoTriggers"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:567
+#: apt.conf.5.xml:585
msgid ""
"Add the no triggers flag to all dpkg calls (except the ConfigurePending "
"call). See &dpkg; if you are interested in what this actually means. In "
@@ -5232,12 +5365,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:574
+#: apt.conf.5.xml:592
msgid "PackageManager::Configure"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:575
+#: apt.conf.5.xml:593
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
@@ -5254,12 +5387,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:603
msgid "DPkg::ConfigurePending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:586
+#: apt.conf.5.xml:604
msgid ""
"If this option is set apt will call <command>dpkg --configure "
"--pending</command> to let dpkg handle all required configurations and "
@@ -5271,12 +5404,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:592
+#: apt.conf.5.xml:610
msgid "DPkg::TriggersPending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:593
+#: apt.conf.5.xml:611
msgid ""
"Useful for <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -5286,12 +5419,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:616
msgid "PackageManager::UnpackAll"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:599
+#: apt.conf.5.xml:617
msgid ""
"As the configuration can be deferred to be done at the end by dpkg it can be "
"tried to order the unpack series only by critical needs, e.g. by "
@@ -5303,12 +5436,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:606
+#: apt.conf.5.xml:624
msgid "OrderList::Score::Immediate"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:632
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -5320,7 +5453,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:625
msgid ""
"Essential packages (and there dependencies) should be configured immediately "
"after unpacking. It will be a good idea to do this quite early in the "
@@ -5334,12 +5467,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:627
+#: apt.conf.5.xml:645
msgid "Periodic and Archives options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:628
+#: apt.conf.5.xml:646
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -5348,12 +5481,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:636
+#: apt.conf.5.xml:654
msgid "Debug options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:638
+#: apt.conf.5.xml:656
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -5364,7 +5497,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:667
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, "
@@ -5372,7 +5505,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:657
+#: apt.conf.5.xml:675
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s "
@@ -5380,7 +5513,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:666
+#: apt.conf.5.xml:684
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -5390,110 +5523,110 @@ msgstr ""
#. motivating example, except I haven't a clue why you'd want
#. to do this.
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:674
+#: apt.conf.5.xml:692
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CDROM IDs."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:702
msgid "A full list of debugging options to apt follows."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:689
+#: apt.conf.5.xml:707
msgid "<literal>Debug::Acquire::cdrom</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:711
msgid "Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:700
+#: apt.conf.5.xml:718
msgid "<literal>Debug::Acquire::ftp</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:704
+#: apt.conf.5.xml:722
msgid "Print information related to downloading packages using FTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:729
msgid "<literal>Debug::Acquire::http</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:733
msgid "Print information related to downloading packages using HTTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:722
+#: apt.conf.5.xml:740
msgid "<literal>Debug::Acquire::https</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:744
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:751
msgid "<literal>Debug::Acquire::gpgv</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:755
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:744
+#: apt.conf.5.xml:762
msgid "<literal>Debug::aptcdrom</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:748
+#: apt.conf.5.xml:766
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:755
+#: apt.conf.5.xml:773
msgid "<literal>Debug::BuildDeps</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:776
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:783
msgid "<literal>Debug::Hashes</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:768
+#: apt.conf.5.xml:786
msgid ""
"Output each cryptographic hash that is generated by the "
"<literal>apt</literal> libraries."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:775
+#: apt.conf.5.xml:793
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:778
+#: apt.conf.5.xml:796
msgid ""
"Do not include information from <literal>statfs</literal>, namely the number "
"of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -5501,92 +5634,92 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:786
+#: apt.conf.5.xml:804
msgid "<literal>Debug::NoLocking</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:807
msgid ""
"Disable all file locking. For instance, this will allow two instances of "
"<quote><literal>apt-get update</literal></quote> to run at the same time."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:815
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:819
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:808
+#: apt.conf.5.xml:826
msgid "<literal>Debug::pkgAcquire::Auth</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:811
+#: apt.conf.5.xml:829
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:818
+#: apt.conf.5.xml:836
msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:821
+#: apt.conf.5.xml:839
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:829
+#: apt.conf.5.xml:847
msgid "<literal>Debug::pkgAcquire::RRed</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:833
+#: apt.conf.5.xml:851
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:840
+#: apt.conf.5.xml:858
msgid "<literal>Debug::pkgAcquire::Worker</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:844
+#: apt.conf.5.xml:862
msgid "Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:851
+#: apt.conf.5.xml:869
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:873
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:862
+#: apt.conf.5.xml:880
msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:883
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial "
@@ -5596,12 +5729,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:876
+#: apt.conf.5.xml:894
msgid "<literal>Debug::pkgDepCache::Marker</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:897
msgid ""
"Generate debug messages describing which package is marked as "
"keep/install/remove while the ProblemResolver does his work. Each addition "
@@ -5619,90 +5752,90 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:898
+#: apt.conf.5.xml:916
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:901
+#: apt.conf.5.xml:919
msgid "Dump the default configuration to standard error on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:908
+#: apt.conf.5.xml:926
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:911
+#: apt.conf.5.xml:929
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:919
+#: apt.conf.5.xml:937
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:922
+#: apt.conf.5.xml:940
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:947
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:933
+#: apt.conf.5.xml:951
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:941
+#: apt.conf.5.xml:959
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:945
+#: apt.conf.5.xml:963
msgid "Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:952
+#: apt.conf.5.xml:970
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:974
msgid "Output the priority of each package list on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:962
+#: apt.conf.5.xml:980
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:966
+#: apt.conf.5.xml:984
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:974
+#: apt.conf.5.xml:992
msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:977
+#: apt.conf.5.xml:995
msgid ""
"Display a list of all installed packages with their calculated score used by "
"the pkgProblemResolver. The description of the package is the same as "
@@ -5710,32 +5843,32 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:985
+#: apt.conf.5.xml:1003
msgid "<literal>Debug::sourceList</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:989
+#: apt.conf.5.xml:1007
msgid ""
"Print information about the vendors read from "
"<filename>/etc/apt/vendors.list</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1012
+#: apt.conf.5.xml:1030
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1019
+#: apt.conf.5.xml:1037
msgid "&file-aptconf;"
msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:1042
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr ""
@@ -5787,13 +5920,24 @@ msgid ""
"choice of instance, only the choice of version."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><title>
+#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:56
+msgid ""
+"Note that the files in the <filename>/etc/apt/preferences.d</filename> "
+"directory are parsed in alphanumeric ascending order and need to obey the "
+"following naming convention: The files have no or "
+"\"<literal>pref</literal>\" as filename extension and which only contain "
+"alphanumeric, hyphen (-), underscore (_) and period (.) characters - "
+"otherwise they will be silently ignored."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt_preferences.5.xml:63
msgid "APT's Default Priority Assignments"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:71
+#: apt_preferences.5.xml:78
#, no-wrap
msgid ""
"<command>apt-get install -t testing "
@@ -5801,13 +5945,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:74
+#: apt_preferences.5.xml:81
#, no-wrap
msgid "APT::Default-Release \"stable\";\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:58
+#: apt_preferences.5.xml:65
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 "
@@ -5824,39 +5968,39 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:83
+#: apt_preferences.5.xml:90
msgid "priority 100"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:84
+#: apt_preferences.5.xml:91
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:88
+#: apt_preferences.5.xml:95
msgid "priority 500"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:89
+#: apt_preferences.5.xml:96
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:93
+#: apt_preferences.5.xml:100
msgid "priority 990"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:94
+#: apt_preferences.5.xml:101
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:78
+#: apt_preferences.5.xml:85
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: "
@@ -5864,7 +6008,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:99
+#: apt_preferences.5.xml:106
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 "
@@ -5872,14 +6016,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml:110
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:106
+#: apt_preferences.5.xml:113
msgid ""
"Never downgrade unless the priority of an available version exceeds 1000. "
"(\"Downgrading\" is installing a less recent version of a package in place "
@@ -5889,19 +6033,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:112
+#: apt_preferences.5.xml:119
msgid "Install the highest priority version."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:113
+#: apt_preferences.5.xml:120
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:116
+#: apt_preferences.5.xml:123
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 "
@@ -5909,7 +6053,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:122
+#: apt_preferences.5.xml:129
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 "
@@ -5920,7 +6064,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml:136
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 "
@@ -5930,7 +6074,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:141
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 "
@@ -5942,12 +6086,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:143
+#: apt_preferences.5.xml:150
msgid "The Effect of APT Preferences"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:145
+#: apt_preferences.5.xml:152
msgid ""
"The APT preferences file allows the system administrator to control the "
"assignment of priorities. The file consists of one or more multi-line "
@@ -5956,7 +6100,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:151
+#: apt_preferences.5.xml:158
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 "
@@ -5966,7 +6110,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:158
+#: apt_preferences.5.xml:165
#, no-wrap
msgid ""
"Package: perl\n"
@@ -5975,7 +6119,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:164
+#: apt_preferences.5.xml:171
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 "
@@ -5985,7 +6129,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:170
+#: apt_preferences.5.xml:177
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 "
@@ -5993,7 +6137,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:175
+#: apt_preferences.5.xml:182
#, no-wrap
msgid ""
"Package: *\n"
@@ -6002,7 +6146,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:180
+#: apt_preferences.5.xml:187
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 "
@@ -6012,7 +6156,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:186
+#: apt_preferences.5.xml:193
msgid ""
"The following record assigns a low priority to all package versions "
"belonging to any distribution whose Archive name is "
@@ -6020,7 +6164,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:190
+#: apt_preferences.5.xml:197
#, no-wrap
msgid ""
"Package: *\n"
@@ -6029,7 +6173,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:195
+#: apt_preferences.5.xml:202
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is "
@@ -6037,7 +6181,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:199
+#: apt_preferences.5.xml:206
#, no-wrap
msgid ""
"Package: *\n"
@@ -6046,7 +6190,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:204
+#: apt_preferences.5.xml:211
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -6054,7 +6198,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:209
+#: apt_preferences.5.xml:216
#, no-wrap
msgid ""
"Package: *\n"
@@ -6063,82 +6207,82 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:220
+#: apt_preferences.5.xml:227
msgid "How APT Interprets Priorities"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:228
+#: apt_preferences.5.xml:235
msgid "P &gt; 1000"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:229
+#: apt_preferences.5.xml:236
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:233
+#: apt_preferences.5.xml:240
msgid "990 &lt; P &lt;=1000"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:234
+#: apt_preferences.5.xml:241
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:239
+#: apt_preferences.5.xml:246
msgid "500 &lt; P &lt;=990"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:240
+#: apt_preferences.5.xml:247
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:245
+#: apt_preferences.5.xml:252
msgid "100 &lt; P &lt;=500"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:246
+#: apt_preferences.5.xml:253
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:251
+#: apt_preferences.5.xml:258
msgid "0 &lt; P &lt;=100"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:252
+#: apt_preferences.5.xml:259
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:256
+#: apt_preferences.5.xml:263
msgid "P &lt; 0"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:257
+#: apt_preferences.5.xml:264
msgid "prevents the version from being installed"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:223
+#: apt_preferences.5.xml:230
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -6146,7 +6290,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:262
+#: apt_preferences.5.xml:269
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -6155,14 +6299,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:268
+#: apt_preferences.5.xml:275
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:272
+#: apt_preferences.5.xml:279
#, no-wrap
msgid ""
"Package: perl\n"
@@ -6179,12 +6323,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:285
+#: apt_preferences.5.xml:292
msgid "Then:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:294
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 "
@@ -6194,7 +6338,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:292
+#: apt_preferences.5.xml:299
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -6202,7 +6346,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:296
+#: apt_preferences.5.xml:303
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 "
@@ -6211,12 +6355,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:313
msgid "Determination of Package Version and Distribution Properties"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:308
+#: apt_preferences.5.xml:315
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -6224,27 +6368,27 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:320
+#: apt_preferences.5.xml:327
msgid "the <literal>Package:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:321
+#: apt_preferences.5.xml:328
msgid "gives the package name"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:324 apt_preferences.5.xml:374
+#: apt_preferences.5.xml:331 apt_preferences.5.xml:381
msgid "the <literal>Version:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:325
+#: apt_preferences.5.xml:332
msgid "gives the version number for the named package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:319
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>: "
@@ -6256,12 +6400,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:341
+#: apt_preferences.5.xml:348
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:342
+#: apt_preferences.5.xml:349
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -6272,18 +6416,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:352
+#: apt_preferences.5.xml:359
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:358
+#: apt_preferences.5.xml:365
msgid "the <literal>Codename:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:359
+#: apt_preferences.5.xml:366
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 "
@@ -6294,13 +6438,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:368
+#: apt_preferences.5.xml:375
#, no-wrap
msgid "Pin: release n=squeeze\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:375
+#: apt_preferences.5.xml:382
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 "
@@ -6311,7 +6455,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:384
+#: apt_preferences.5.xml:391
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -6320,12 +6464,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:393
+#: apt_preferences.5.xml:400
msgid "the <literal>Component:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:394
+#: apt_preferences.5.xml:401
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -6337,18 +6481,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:403
+#: apt_preferences.5.xml:410
#, no-wrap
msgid "Pin: release c=main\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:416
msgid "the <literal>Origin:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:410
+#: apt_preferences.5.xml:417
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is "
@@ -6357,18 +6501,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:416
+#: apt_preferences.5.xml:423
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:422
+#: apt_preferences.5.xml:429
msgid "the <literal>Label:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:423
+#: apt_preferences.5.xml:430
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is "
@@ -6377,13 +6521,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:429
+#: apt_preferences.5.xml:436
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:330
+#: apt_preferences.5.xml:337
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -6397,7 +6541,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:436
+#: apt_preferences.5.xml:443
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -6412,12 +6556,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:449
+#: apt_preferences.5.xml:456
msgid "Optional Lines in an APT Preferences Record"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:451
+#: apt_preferences.5.xml:458
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -6425,7 +6569,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:455
+#: apt_preferences.5.xml:462
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 "
@@ -6434,12 +6578,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:471
msgid "Tracking Stable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:472
+#: apt_preferences.5.xml:479
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6454,7 +6598,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:466
+#: apt_preferences.5.xml:473
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 "
@@ -6464,7 +6608,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:489 apt_preferences.5.xml:535 apt_preferences.5.xml:593
+#: apt_preferences.5.xml:496 apt_preferences.5.xml:542 apt_preferences.5.xml:600
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -6473,7 +6617,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:484
+#: apt_preferences.5.xml:491
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 "
@@ -6482,13 +6626,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:501
+#: apt_preferences.5.xml:508
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:495
+#: apt_preferences.5.xml:502
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -6497,12 +6641,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:507
+#: apt_preferences.5.xml:514
msgid "Tracking Testing or Unstable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:516
+#: apt_preferences.5.xml:523
#, no-wrap
msgid ""
"Package: *\n"
@@ -6519,7 +6663,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:509
+#: apt_preferences.5.xml:516
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -6530,7 +6674,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:530
+#: apt_preferences.5.xml:537
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 "
@@ -6539,13 +6683,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:550
+#: apt_preferences.5.xml:557
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:541
+#: apt_preferences.5.xml:548
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -6557,12 +6701,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:564
msgid "Tracking the evolution of a codename release"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:571
+#: apt_preferences.5.xml:578
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package "
@@ -6584,7 +6728,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:559
+#: apt_preferences.5.xml:566
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 "
@@ -6599,7 +6743,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:588
+#: apt_preferences.5.xml:595
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 "
@@ -6608,13 +6752,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:608
+#: apt_preferences.5.xml:615
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:599
+#: apt_preferences.5.xml:606
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -6626,12 +6770,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:617
+#: apt_preferences.5.xml:624
msgid "&file-preferences;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:623
+#: apt_preferences.5.xml:630
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr ""
@@ -6863,7 +7007,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
#: sources.list.5.xml:178
-msgid "more recongnizable URI types"
+msgid "more recognizable URI types"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
@@ -6872,8 +7016,8 @@ msgid ""
"APT can be extended with more methods shipped in other optional packages "
"which should follow the nameing scheme "
"<literal>apt-transport-<replaceable>method</replaceable></literal>. The APT "
-"team e.g. maintain also the <literal>apt-transport-https</literal> package "
-"which provides access methods for https-URIs with features similiar to the "
+"team e.g. maintains also the <literal>apt-transport-https</literal> package "
+"which provides access methods for https-URIs with features similar to the "
"http method, but other methods for using e.g. debtorrent are also available, "
"see <citerefentry> "
"<refentrytitle><filename>apt-transport-debtorrent</filename></refentrytitle> "
@@ -7094,7 +7238,7 @@ msgstr ""
#: guide.sgml:63
msgid ""
"For instance, mailcrypt is an emacs extension that aids in encrypting email "
-"with GPG. Without GPGP installed mail-crypt is useless, so mailcrypt has a "
+"with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
"simple dependency on GPG. Also, because it is an emacs extension it has a "
"simple dependency on emacs, without emacs it is completely useless."
msgstr ""
@@ -7243,11 +7387,11 @@ msgstr ""
#. type: <p></p>
#: guide.sgml:184
msgid ""
-"To enable the APT method you need to to select [A]ccess in "
-"<prgn>dselect</prgn> and then choose the APT method. You will be prompted "
-"for a set of <em>Sources</em> which are places to fetch archives from. These "
-"can be remote Internet sites, local Debian mirrors or CDROMs. Each source "
-"can provide a fragment of the total Debian archive, APT will automatically "
+"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
+"and then choose the APT method. You will be prompted for a set of "
+"<em>Sources</em> which are places to fetch archives from. These can be "
+"remote Internet sites, local Debian mirrors or CDROMs. Each source can "
+"provide a fragment of the total Debian archive, APT will automatically "
"combine them to form a complete set of packages. If you have a CDROM then it "
"is a good idea to specify it first and then specify a mirror so that you "
"have access to the latest bug fixes. APT will automatically use packages on "
@@ -7332,7 +7476,7 @@ msgstr ""
#: guide.sgml:247
msgid ""
"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a super-set of "
+"available list by selecting [U]pdate from the menu. This is a superset of "
"<tt>apt-get update</tt> that makes the fetched information available to "
"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get "
"update</tt> has been run before."
@@ -7812,7 +7956,7 @@ msgstr ""
#: offline.sgml:57
msgid ""
"This is achieved by creatively manipulating the APT configuration file. The "
-"essential premis to tell APT to look on a disc for it's archive files. Note "
+"essential premise to tell APT to look on a disc for it's archive files. Note "
"that the disc should be formated with a filesystem that can handle long file "
"names such as ext2, fat32 or vfat."
msgstr ""
@@ -7911,7 +8055,7 @@ msgid ""
"On the target machine the first thing to do is mount the disc and copy "
"<em>/var/lib/dpkg/status</em> to it. You will also need to create the "
"directories outlined in the Overview, <em>archives/partial/</em> and "
-"<em>lists/partial/</em> Then take the disc to the remote machine and "
+"<em>lists/partial/</em>. Then take the disc to the remote machine and "
"configure the sources.list. On the remote machine execute the following:"
msgstr ""
@@ -7929,9 +8073,9 @@ msgstr ""
#. type: </example></p>
#: offline.sgml:149
msgid ""
-"The dist-upgrade command can be replaced with any-other standard APT "
+"The dist-upgrade command can be replaced with any other standard APT "
"commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em> However this presents a problem in communicating "
+"such as <em>dselect</em>. However this presents a problem in communicating "
"your selections back to the local computer."
msgstr ""
diff --git a/doc/po/de.po b/doc/po/de.po
index 3ec7c4a5b..f9d374a6d 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 0.7.24\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2009-11-27 00:05+0100\n"
-"PO-Revision-Date: 2009-10-28 23:51+GMT\n"
+"POT-Creation-Date: 2010-01-20 12:18+0100\n"
+"PO-Revision-Date: 2009-12-31 17:41+GMT\n"
"Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
"MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgstr "NAME"
#. type: Plain text
#: apt.8:20
msgid "apt - Advanced Package Tool"
-msgstr "apt - Fortschrittliches Paketierungswerkzeug (Advanced Package Tool)"
+msgstr "apt - Fortschrittliches Paketwerkzeug (Advanced Package Tool)"
#. type: SH
#: apt.8:20
@@ -350,13 +350,7 @@ msgstr ""
#. type: Plain text
#: apt.ent:84
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY dpkg \"<citerefentry>\n"
-#| " <refentrytitle><command>dpkg</command></refentrytitle>\n"
-#| " <manvolnum>8</manvolnum>\n"
-#| " </citerefentry>\"\n"
-#| ">\n"
+#, no-wrap
msgid ""
"<!ENTITY dpkg \"<citerefentry>\n"
" <refentrytitle><command>dpkg</command></refentrytitle>\n"
@@ -366,7 +360,7 @@ msgid ""
msgstr ""
"<!ENTITY dpkg \"<citerefentry>\n"
" <refentrytitle><command>dpkg</command></refentrytitle>\n"
-" <manvolnum>8</manvolnum>\n"
+" <manvolnum>1</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
@@ -404,13 +398,7 @@ msgstr ""
#. type: Plain text
#: apt.ent:102
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY dpkg-scanpackages \"<citerefentry>\n"
-#| " <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n"
-#| " <manvolnum>8</manvolnum>\n"
-#| " </citerefentry>\"\n"
-#| ">\n"
+#, no-wrap
msgid ""
"<!ENTITY dpkg-scanpackages \"<citerefentry>\n"
" <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n"
@@ -420,19 +408,13 @@ msgid ""
msgstr ""
"<!ENTITY dpkg-scanpackages \"<citerefentry>\n"
" <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n"
-" <manvolnum>8</manvolnum>\n"
+" <manvolnum>1</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
#. type: Plain text
#: apt.ent:108
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY dpkg-scansources \"<citerefentry>\n"
-#| " <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n"
-#| " <manvolnum>8</manvolnum>\n"
-#| " </citerefentry>\"\n"
-#| ">\n"
+#, no-wrap
msgid ""
"<!ENTITY dpkg-scansources \"<citerefentry>\n"
" <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n"
@@ -442,19 +424,13 @@ msgid ""
msgstr ""
"<!ENTITY dpkg-scansources \"<citerefentry>\n"
" <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n"
-" <manvolnum>8</manvolnum>\n"
+" <manvolnum>1</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
#. type: Plain text
#: apt.ent:114
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY dselect \"<citerefentry>\n"
-#| " <refentrytitle><command>dselect</command></refentrytitle>\n"
-#| " <manvolnum>8</manvolnum>\n"
-#| " </citerefentry>\"\n"
-#| ">\n"
+#, no-wrap
msgid ""
"<!ENTITY dselect \"<citerefentry>\n"
" <refentrytitle><command>dselect</command></refentrytitle>\n"
@@ -464,7 +440,7 @@ msgid ""
msgstr ""
"<!ENTITY dselect \"<citerefentry>\n"
" <refentrytitle><command>dselect</command></refentrytitle>\n"
-" <manvolnum>8</manvolnum>\n"
+" <manvolnum>1</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
@@ -1060,7 +1036,7 @@ msgstr ""
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:355
+#: apt.ent:356
#, no-wrap
msgid ""
" <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
@@ -1075,6 +1051,87 @@ msgstr ""
" </varlistentry>\n"
"\">\n"
+#. type: Plain text
+#: apt.ent:362
+#, fuzzy, 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"
+msgid ""
+"<!ENTITY file-trustedgpg \"\n"
+" <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n"
+" <listitem><para>Keyring of local trusted keys, new keys will be added here.\n"
+" Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+msgstr ""
+"<!ENTITY file-sourceslist \"\n"
+" <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n"
+" <listitem><para>Orte, von denen Pakete geladen werden.\n"
+" Konfigurationselement: <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+
+#. type: Plain text
+#: apt.ent:369
+#, fuzzy, 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"
+msgid ""
+" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
+" <listitem><para>File fragments for the trusted keys, additional keyrings can\n"
+" be stored here (by other packages or the administrator).\n"
+" Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+"\">\n"
+msgstr ""
+" <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
+" <listitem><para>Dateifragmente für Orte, von denen Pakete geladen werden.\n"
+" Konfigurationselement: <literal>Dir::Etc::SourceParts</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+"\">\n"
+
+#. type: Plain text
+#: apt.ent:371
+msgid "<!ENTITY translation-title \"TRANSLATION\">"
+msgstr "<!ENTITY translation-title \"Übersetzung\">"
+
+#. type: Plain text
+#: apt.ent:380
+#, no-wrap
+msgid ""
+"<!-- TRANSLATOR: This is a placeholder. You should write here who has constributed\n"
+" to the translation in the past, who is responsible now and maybe further information\n"
+" specially related to your translation. -->\n"
+"<!ENTITY translation-holder \"\n"
+" The english translation was done by John Doe <email>john@doe.org</email> in 2009,\n"
+" 2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together with the\n"
+" Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>.\n"
+"\">\n"
+msgstr ""
+"<!ENTITY translation-holder \"\n"
+" Die deutsche Übersetzung wurde 2009 von Chris Leick <email>c.leick@vollbio.de</email> angefertigt\n"
+" in Zusammenarbeit mit dem Debian German-l10n-Team <email>debian-l10n-german@lists.debian.org</email>.\n"
+"\">\n"
+
+#. type: Plain text
+#: apt.ent:387
+#, no-wrap
+msgid ""
+"<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
+" in a shipped manpage will maybe appear english parts. -->\n"
+"<!ENTITY translation-english \"\n"
+" Note that this translated document may contain untranslated parts.\n"
+" This is done on purpose, to avoid losing content when the\n"
+" translation is lagging behind the original content.\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
@@ -1161,7 +1218,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: 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-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40
#: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33
#: sources.list.5.xml:33
msgid "Description"
@@ -1375,13 +1432,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
#: apt-cache.8.xml:152
-#, fuzzy
-#| msgid ""
-#| "<literal>Missing</literal> is the number of package names that were "
-#| "referenced in a dependency but were not provided by any package. Missing "
-#| "packages may be in evidence if a full distribution is not accessed, or if "
-#| "a package (real or virtual) has been dropped from the distribution. "
-#| "Usually they are referenced from Conflicts or Breaks statements."
msgid ""
"<literal>Missing</literal> is the number of package names that were "
"referenced in a dependency but were not provided by any package. Missing "
@@ -1584,11 +1634,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cache.8.xml:234
-#, fuzzy
-#| msgid ""
-#| "Note that a package which APT knows of is not nessasarily available to "
-#| "download, installable or installed, e.g. virtual packages are also listed "
-#| "in the generated list."
msgid ""
"Note that a package which APT knows of is not necessarily available to "
"download, installable or installed, e.g. virtual packages are also listed in "
@@ -1706,7 +1751,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89
-#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:484 apt.conf.5.xml:506
+#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524
msgid "options"
msgstr "Optionen"
@@ -1942,14 +1987,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:556 apt-get.8.xml:554
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 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:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122
-#: apt.conf.5.xml:1017 apt_preferences.5.xml:615
+#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122
+#: apt.conf.5.xml:1035 apt_preferences.5.xml:622
msgid "Files"
msgstr "Dateien"
@@ -1960,9 +2005,9 @@ msgstr "&file-sourceslist; &file-statelists;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569
-#: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569
+#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629
#: sources.list.5.xml:233
msgid "See Also"
msgstr "Siehe auch"
@@ -1974,7 +2019,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:576 apt-get.8.xml:575
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575
#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
msgstr "Diagnose"
@@ -2017,7 +2062,7 @@ msgid ""
"<arg>add</arg> <arg>ident</arg> </group>"
msgstr ""
"<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
-"<arg><option>-d=<replaceable>CDROM-Einhängepunkt</replaceable></option></"
+"<arg><option>-d=<replaceable>CD-ROM-Einhängepunkt</replaceable></option></"
"arg><arg><option>-o=<replaceable>Konfigurationszeichenkette</replaceable></"
"option></arg><arg><option>-c=<replaceable>Datei</replaceable></option></"
"arg><group><arg>hinzufügen</arg><arg>Identifikation</arg></group>"
@@ -2030,7 +2075,7 @@ msgid ""
"the structure of the disc as well as correcting for several possible mis-"
"burns and verifying the index files."
msgstr ""
-"<command>apt-cdrom</command> wird benutzt, um eine neue CDROM zu APTs Liste "
+"<command>apt-cdrom</command> wird benutzt, um eine neue CD-ROM zu APTs Liste "
"der verfügbaren Quellen hinzuzufügen. <command>apt-cdrom</command> kümmert "
"sich um die festgestellte Struktur des Mediums, sowie die Korrektur für "
"mehrere mögliche Fehlbrennungen und prüft die Indexdateien."
@@ -2062,7 +2107,7 @@ msgid ""
"title."
msgstr ""
"<literal>add</literal> wird benutzt, um ein neues Medium zur Quellenliste "
-"hinzuzufügen. Es wird das CDROM-Gerät aushängen, verlangen, dass ein Medium "
+"hinzuzufügen. Es wird das CD-ROM-Gerät aushängen, verlangen, dass ein Medium "
"eingelegt wird und dann mit den Einlesen und Kopieren der Indexdateien "
"fortfahren. Wenn das Medium kein angemessenes <filename>disk</filename>-"
"Verzeichnis hat, werden Sie nach einem aussagekräftigen Titel gefragt."
@@ -2074,7 +2119,7 @@ msgid ""
"maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
"filename>"
msgstr ""
-"APT benutzt eine CDROM-ID, um nachzuverfolgen, welches Medium gerade im "
+"APT benutzt eine CD-ROM-ID, um nachzuverfolgen, welches Medium gerade im "
"Laufwerk ist und verwaltet eine Datenbank mit diesen IDs in "
"<filename>&statedir;/cdroms.list</filename>"
@@ -2104,7 +2149,7 @@ msgstr ""
"<placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:91
+#: apt-cdrom.8.xml:91 apt-key.8.xml:139
msgid "Options"
msgstr "Optionen"
@@ -2341,9 +2386,9 @@ msgid ""
"names, d returns directories, b returns true or false and i returns an "
"integer. Each of the returns is normalized and verified internally."
msgstr ""
-"An das Konfigurationselement kann /[fdbi] angehängt werden. f gibt "
-"Dateinamen zurück, d gibt Verzeichnisse zurück, b gibt true oder false "
-"zurück und i gibt eine Ganzzahl zurück. Jede Rückgabe ist normiert und "
+"An das Konfigurationselement kann /[fdbi] angehängt werden. »f« gibt "
+"Dateinamen zurück, »d« gibt Verzeichnisse zurück, »b« gibt true oder false "
+"zurück und »i« gibt eine Ganzzahl zurück. Jede Rückgabe ist normiert und "
"intern geprüft."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2352,7 +2397,7 @@ msgid "Just show the contents of the configuration space."
msgstr "Nur der Inhalt des Konfigurationsbereichs wird angezeigt."
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585
#: apt-sortpkgs.1.xml:70
msgid "&apt-conf;"
msgstr "&apt-conf;"
@@ -2426,8 +2471,8 @@ msgid ""
"XXXX</filename> and <filename>package.config.XXXX</filename>"
msgstr ""
"Schablonendatei und Konfigurationsskript werden in das temporäre Verzeichnis "
-"geschrieben, das durch -t oder --tempdir (<literal>APT::ExtractTemplates::"
-"TempDir</literal>) Verzeichnis mit Dateinamen der Form <filename>package."
+"geschrieben, das durch »-t« oder »--tempdir« (<literal>APT::ExtractTemplates::"
+"TempDir</literal>) Verzeichnis mit Dateinamen der Form <filename>package. "
"template.XXXX</filename> und <filename>package.config.XXXX</filename> "
"angegeben wurde"
@@ -2443,11 +2488,6 @@ msgstr "<option>--tempdir</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-extracttemplates.1.xml:62
-#, fuzzy
-#| msgid ""
-#| "Temporary directory in which to write extracted debconf template files "
-#| "and config scripts Configuration Item: <literal>APT::ExtractTemplates::"
-#| "TempDir</literal>"
msgid ""
"Temporary directory in which to write extracted debconf template files and "
"config scripts. Configuration Item: <literal>APT::ExtractTemplates::"
@@ -2469,16 +2509,12 @@ msgstr ""
#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-ftparchive.1.xml:13
-#, fuzzy
-#| msgid ""
-#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
-#| "August 2009</date>"
msgid ""
"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 "
"August 2009</date>"
msgstr ""
-"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9. "
-"August 2009</date>"
+"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
+"<date>17. August 2009</date>"
#. type: Content of: <refentry><refnamediv><refname>
#: apt-ftparchive.1.xml:22 apt-ftparchive.1.xml:29
@@ -2567,9 +2603,9 @@ msgid ""
"automatically performs file-change checks and builds the desired compressed "
"output files."
msgstr ""
-"Intern kann <command>apt-ftparchive</command> von Programmdatenbänken "
+"Intern kann <command>apt-ftparchive</command> von Programmdatenbanken "
"Gebrauch machen, um die Inhalte einer .deb-Datei zwischenzuspeichern und es "
-"verlässt sich nicht auf irgendwelche externen Programme, abgesehen von "
+"verlasst sich nicht auf irgendwelche externen Programme, abgesehen von "
"&gzip;. Wenn eine vollständige Generierung erfolgt, werden automatisch "
"Dateiänderungsprüfungen durchgeführt und die gewünschten gepackten "
"Ausgabedateien erzeugt."
@@ -2587,7 +2623,7 @@ msgid ""
"emitting a package record to stdout for each. This command is approximately "
"equivalent to &dpkg-scanpackages;."
msgstr ""
-"Der packages-Befehl generiert eine Paketdatei aus einem Verzeichnisbaum. Er "
+"Der »packages«-Befehl generiert eine Paketdatei aus einem Verzeichnisbaum. Er "
"nimmt ein vorgegebenes Verzeichnis und durchsucht es rekursiv nach .deb-"
"Dateien, wobei es für jede einen Paketdatensatz auf stdout ausgibt.Dieser "
"Befehl entspricht etwa &dpkg-scanpackages;."
@@ -2626,7 +2662,7 @@ msgid ""
"change the source override file that will be used."
msgstr ""
"Wenn eine Override-Datei angegeben ist, wird nach einer Quellen-Override-"
-"Datei mit einer .src-Dateiendung gesucht. Die Option --source-override kann "
+"Datei mit einer .src-Dateiendung gesucht. Die Option »--source-override« kann "
"benutzt werden, um die Quellen-Override-Datei, die benutzt wird, zu ändern."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -2766,12 +2802,6 @@ msgstr "Dir-Abschnitt"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt-ftparchive.1.xml:159
-#, fuzzy
-#| msgid ""
-#| "The <literal>Dir</literal> section defines the standard directories "
-#| "needed to locate the files required during the generation process. These "
-#| "directories are prepended to certain relative paths defined in later "
-#| "sections to produce a complete an absolute path."
msgid ""
"The <literal>Dir</literal> section defines the standard directories needed "
"to locate the files required during the generation process. These "
@@ -3058,8 +3088,12 @@ msgstr "Sources"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:288
+#, fuzzy
+#| msgid ""
+#| "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
+#| "source/Sources</filename>"
msgid ""
-"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
+"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
"source/Sources</filename>"
msgstr ""
"Setzt die Ausgabe-Packages-Datei. Vorgabe ist <filename>$(DIST)/$(SECTION)/"
@@ -3203,28 +3237,37 @@ msgstr ""
"können in einem <literal>Tree</literal>-Abschnitt, sowie als drei neue "
"Variablen benutzt werden."
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:351
-msgid ""
-"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
-"command> performs an operation similar to:"
-msgstr ""
-"Wenn ein <literal>Tree</literal>-Abschnitt bearbeitet wird, führt "
-"<command>apt-ftparchive</command> eine Operation aus, die folgender ähnelt:"
-
-# report, that this string is missing in man page
-#. type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting>
+#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt-ftparchive.1.xml:354
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "for i in Sections do \n"
+#| " for j in Architectures do\n"
+#| " Generate for DIST=scope SECTION=i ARCH=j\n"
msgid ""
"for i in Sections do \n"
" for j in Architectures do\n"
" Generate for DIST=scope SECTION=i ARCH=j\n"
+" "
msgstr ""
"for i in Abschnitte do \n"
" for j in Architekturen do\n"
" Generiere for DIST=Geltungsbereich SECTION=i ARCH=j\n"
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-ftparchive.1.xml:351
+#, fuzzy
+#| msgid ""
+#| "When processing a <literal>Tree</literal> section <command>apt-"
+#| "ftparchive</command> performs an operation similar to:"
+msgid ""
+"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
+"command> performs an operation similar to: <placeholder type=\"programlisting"
+"\" id=\"0\"/>"
+msgstr ""
+"Wenn ein <literal>Tree</literal>-Abschnitt bearbeitet wird, führt "
+"<command>apt-ftparchive</command> eine Operation aus, die folgender ähnelt:"
+
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:360
msgid "Sections"
@@ -3489,7 +3532,7 @@ msgid ""
"Configuration Item: <literal>APT::FTPArchive::DB</literal>."
msgstr ""
"Benutzt eine Programmzwischenspeicherdatenbank. Dies hat keine Auswirkung "
-"auf den generate-Befehl. Konfigurationselement: <literal>APT::FTPArchive::"
+"auf den »generate«-Befehl. Konfigurationselement: <literal>APT::FTPArchive::"
"DB</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -3542,7 +3585,7 @@ msgstr ""
"Führt Inhaltsgenerierung durch. Wenn diese Option gesetzt ist und "
"Paketindizes mit einer Zwischenspeicherdatenbank generiert werden, dann wird "
"die Dateiliste auch extrahiert und für spätere Benutzung in der Datenbank "
-"gespeichert. Wenn der generate-Befehl benutzt wird, erlaubt diese Option "
+"gespeichert. Wenn der »generate«-Befehl benutzt wird, erlaubt diese Option "
"außerdem die Erzeugung beliebiger Contents-Dateien. Die Vorgabe ist an. "
"Konfigurationselement: <literal>APT::FTPArchive::Contents</literal>."
@@ -3579,34 +3622,58 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:547
#, fuzzy
-#| msgid "<option>--version</option>"
-msgid "<option>APT::FTPArchive::LongDescription</option>"
-msgstr "<option>--version</option>"
+#| msgid "<option>APT::FTPArchive::LongDescription</option>"
+msgid "<option>APT::FTPArchive::AlwaysStat</option>"
+msgstr "<option>APT::FTPArchive::LongDescription</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:549
msgid ""
+"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If "
+"packages are recompiled and/or republished with the same version again, this "
+"will lead to problems as the now outdated cached metadata like size and "
+"checksums will be used. With this option enabled this will no longer happen "
+"as it will be checked if the file was changed. Note that this option is set "
+"to \"<literal>false</literal>\" by default as it is not recommend to upload "
+"multiply versions/builds of a package with the same versionnumber, so in "
+"theory nobody will have these problems and therefore all these extra checks "
+"are useless."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:559
+msgid "<option>APT::FTPArchive::LongDescription</option>"
+msgstr "<option>APT::FTPArchive::LongDescription</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:561
+msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
"only be set to <literal>\"false\"</literal> if the Archive generated with "
"&apt-ftparchive; also provides <filename>Translation</filename> files. Note "
"that it is currently not possible to create these files with <command>apt-"
"ftparchive</command>."
msgstr ""
+"Diese Konfigurationsoption ist standardmäßig »<literal>true</literal>« und "
+"sollte nur auf »<literal>false</literal>« gesetzt werden, wenn das mit &apt-"
+"ftparchive; generierte Archiv außerdem <filename>Translation</filename>-"
+"Dateien bereitstellt. Beachten Sie, dass es derzeit nicht möglich ist, diese "
+"Dateien mit <command>apt-ftparchive</command> zu erstellen."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462
+#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469
#: sources.list.5.xml:193
msgid "Examples"
msgstr "Beispiele"
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:567
+#: apt-ftparchive.1.xml:579
#, no-wrap
msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
msgstr "<command>apt-ftparchive</command> Pakete <replaceable>Verzeichnis</replaceable> | <command>gzip</command> > <filename>Pakete.gz</filename>\n"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:563
+#: apt-ftparchive.1.xml:575
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3616,7 +3683,7 @@ msgstr ""
">"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:577
+#: apt-ftparchive.1.xml:589
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -3726,7 +3793,7 @@ msgstr ""
"apt; und &wajig;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:135 apt-key.8.xml:123
+#: apt-get.8.xml:135 apt-key.8.xml:124
msgid "update"
msgstr "update"
@@ -3885,7 +3952,7 @@ msgstr ""
"ausgewählt werden. Dies bewirkt, dass diese Version gesucht und zum "
"Installieren ausgewählt wird. Alternativ kann eine bestimmte Distribution "
"durch den Paketnamen gefolgt von einem Schrägstrich und der Version der "
-"Distribution oder des Archivnamens (stable, testing, unstable) ausgewählt "
+"Distribution oder des Archivnamens (»stable«, »testing«, »unstable«) ausgewählt "
"werden."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -3990,15 +4057,6 @@ msgstr "source"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:251
-#, fuzzy
-#| msgid ""
-#| "<literal>source</literal> causes <command>apt-get</command> to fetch "
-#| "source packages. APT will examine the available packages to decide which "
-#| "source package to fetch. It will then find and download into the current "
-#| "directory the newest available version of that source package while "
-#| "respect the default release, set with the option <literal>APT::Default-"
-#| "Release</literal>, the <option>-t</option> option or per package with "
-#| "with the <literal>pkg/release</literal> syntax, if possible."
msgid ""
"<literal>source</literal> causes <command>apt-get</command> to fetch source "
"packages. APT will examine the available packages to decide which source "
@@ -4026,7 +4084,7 @@ msgid ""
"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 ""
-"Paketquellen werden von Programmpaket getrennt über <literal>deb-src</"
+"Paketquellen werden vom Programmpaket getrennt über <literal>deb-src</"
"literal>-Typzeilen in der &sources-list;-Datei nachverfolgt. Das bedeutet, "
"dass Sie für jedes Depot, aus dem Sie Quellen erhalten wollen, eine solche "
"Zeile hinzufügen müssen. Wenn Sie dies nicht tun, werden Sie eine andere als "
@@ -4035,12 +4093,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:266
-#, fuzzy
-#| msgid ""
-#| "If the <option>--compile</option> options is specified then the package "
-#| "will be compiled to a binary .deb using <command>dpkg-buildpackage</"
-#| "command>, if <option>--download-only</option> is specified then the "
-#| "source package will not be unpacked."
msgid ""
"If the <option>--compile</option> option is specified then the package will "
"be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
@@ -4150,7 +4202,7 @@ msgstr ""
"Zwischenspeicher über eine lange Zeitspanne zu betreuen, ohne dass er "
"unkontrolliert anwächst. Die Konfigurationsoption <literal>APT::Clean-"
"Installed</literal> wird installierte Pakete vor der Löschung bewahren, wenn "
-"sie auf off gesetzt ist."
+"sie auf »off« gesetzt ist."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-get.8.xml:312
@@ -4165,8 +4217,8 @@ msgid ""
"are no more needed."
msgstr ""
"<literal>autoremove</literal> wird benutzt, um Pakete, die automatisch "
-"installiert wurden, um Abhängigkeiten für einige Pakete zu erfüllen und und "
-"die nicht mehr benötigt werden, zu entfernen."
+"installiert wurden, um Abhängigkeiten für einige Pakete zu erfüllen und die "
+"nicht mehr benötigt werden, zu entfernen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-get.8.xml:323 apt-get.8.xml:429
@@ -4202,24 +4254,36 @@ msgstr ""
msgid "<option>--fix-broken</option>"
msgstr "<option>--fix-broken</option>"
-# s/Any Package that are specified/Any package that is specified/
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:334
+#, fuzzy
+#| msgid ""
+#| "Fix; attempt to correct a system with broken dependencies in place. This "
+#| "option, when used with install/remove, can omit any packages to permit "
+#| "APT to deduce a likely solution. Any Package that are specified must "
+#| "completely correct the problem. The option is sometimes necessary when "
+#| "running APT for the first time; APT itself does not allow broken package "
+#| "dependencies to exist on a system. It is possible that a system's "
+#| "dependency structure can be so corrupt as to require manual intervention "
+#| "(which usually means using &dselect; or <command>dpkg --remove</command> "
+#| "to eliminate some of the offending packages). Use of this option together "
+#| "with <option>-m</option> may produce an error in some situations. "
+#| "Configuration Item: <literal>APT::Get::Fix-Broken</literal>."
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
-"to deduce a likely solution. Any Package that are specified must completely "
-"correct the problem. The option is sometimes necessary when running APT for "
-"the first time; APT itself does not allow broken package dependencies to "
-"exist on a system. It is possible that a system's dependency structure can "
-"be so corrupt as to require manual intervention (which usually means using "
-"&dselect; or <command>dpkg --remove</command> to eliminate some of the "
-"offending packages). Use of this option together with <option>-m</option> "
-"may produce an error in some situations. Configuration Item: <literal>APT::"
-"Get::Fix-Broken</literal>."
+"to deduce a likely solution. If packages are specified, these have to "
+"completely correct the problem. The option is sometimes necessary when "
+"running APT for the first time; APT itself does not allow broken package "
+"dependencies to exist on a system. It is possible that a system's dependency "
+"structure can be so corrupt as to require manual intervention (which usually "
+"means using &dselect; or <command>dpkg --remove</command> to eliminate some "
+"of the offending packages). Use of this option together with <option>-m</"
+"option> may produce an error in some situations. Configuration Item: "
+"<literal>APT::Get::Fix-Broken</literal>."
msgstr ""
"Beheben; Versucht ein System von vorhandenen beschädigten Abhängigkeiten zu "
-"korrigieren. Diese Option kann, wenn sie mit install/remove benutzt wird, "
+"korrigieren. Diese Option kann, wenn sie mit »install«/»remove« benutzt wird, "
"einige Pakete weglassen, um es APT zu erlauben, eine wahrscheinliche Lösung "
"herzuleiten. Jedes Paket, das angegeben ist, muss das Problem vollständig "
"korrigieren. Die Option ist manchmal nötig, wenn APT zum ersten Mal "
@@ -4335,18 +4399,12 @@ msgstr ""
"(<literal>Debug::NoLocking</literal>) automatisch deaktivieren. Außerdem "
"wird eine Mitteilung angezeigt, die angibt, dass dies nur eine Simulation "
"ist, wenn die Option <literal>APT::Get::Show-User-Simulation-Note</literal> "
-"gesetzt ist (Vorgabe ist true). Weder NoLocking noch die Mitteilung werden "
+"gesetzt ist (Vorgabe ist »true«). Weder NoLocking noch die Mitteilung werden "
"ausgelöst, wenn es als root ausgeführt wird (root sollte ohne weitere "
"Warnungen von <literal>apt-get</literal> wissen, was er tut)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:392
-#, fuzzy
-#| msgid ""
-#| "Simulate prints out a series of lines each one representing a dpkg "
-#| "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square "
-#| "brackets indicate broken packages with and empty set of square brackets "
-#| "meaning breaks that are of no consequence (rare)."
msgid ""
"Simulate prints out a series of lines each one representing a dpkg "
"operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@ -4558,18 +4616,24 @@ msgstr ""
msgid "<option>--purge</option>"
msgstr "<option>--purge</option>"
-# s/equivalent for/equivalent to the/
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:467
+#, fuzzy
+#| 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>."
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> "
+"<option>remove --purge</option> is equivalent to the <option>purge</option> "
"command. Configuration Item: <literal>APT::Get::Purge</literal>."
msgstr ""
-"»remove« »purge« für alles zu entfernende benutzen. Ein Stern (»*«) wird bei "
-"Paketen angezeigt, die zum vollständigen Entfernen vorgemerkt sind. "
-"<option>remove --purge</option> entspricht dem Befehl <option>purge</"
+"»purge« anstelle von »remove« für alles zu entfernende benutzen. Ein Stern "
+"(»*«) wird bei Paketen angezeigt, die zum vollständigen Entfernen vorgemerkt "
+"sind. <option>remove --purge</option> entspricht dem Befehl <option>purge</"
"option>. Konfigurationselement: <literal>APT::Get::Purge</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -4606,7 +4670,7 @@ msgstr ""
"<command>apt-get</command> den Inhalt von <filename>&statedir;/lists</"
"filename> automatisch verwalten, um sicherzustellen, dass veraltete Dateien "
"gelöscht werden. Nur das häufige Ändern der Quelllisten stellt den einzigen "
-"Grund zum Ausschalten der Option dar.Konfigurationselement: <literal>APT::"
+"Grund zum Ausschalten der Option dar. Konfigurationselement: <literal>APT::"
"Get::List-Cleanup</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -4838,8 +4902,14 @@ msgstr "APT-Schlüsselverwaltungsdienstprogramm"
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-key.8.xml:28
+#, fuzzy
+#| msgid ""
+#| "<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> "
+#| "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></"
+#| "option></arg>"
msgid ""
-"<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> "
+"<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
+"replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
"<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></"
"arg>"
msgstr ""
@@ -4848,7 +4918,7 @@ msgstr ""
"arg>"
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:36
+#: apt-key.8.xml:37
msgid ""
"<command>apt-key</command> is used to manage the list of keys used by apt to "
"authenticate packages. Packages which have been authenticated using these "
@@ -4860,17 +4930,17 @@ msgstr ""
"vertrauenswürdig betrachtet."
#. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:42
+#: apt-key.8.xml:43
msgid "Commands"
msgstr "Befehle"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:44
+#: apt-key.8.xml:45
msgid "add <replaceable>filename</replaceable>"
msgstr "add <replaceable>Dateiname</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:48
+#: apt-key.8.xml:49
msgid ""
"Add a new key to the list of trusted keys. The key is read from "
"<replaceable>filename</replaceable>, or standard input if "
@@ -4882,65 +4952,65 @@ msgstr ""
"Standardeingabe."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:56
+#: apt-key.8.xml:57
msgid "del <replaceable>keyid</replaceable>"
msgstr "del <replaceable>Schlüssel-ID</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:60
+#: apt-key.8.xml:61
msgid "Remove a key from the list of trusted keys."
msgstr ""
"Einen Schlüssel von der Liste der vertrauenswürdigen Schlüssel entfernen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:67
+#: apt-key.8.xml:68
msgid "export <replaceable>keyid</replaceable>"
msgstr "export <replaceable>Schlüssel-ID</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:71
+#: apt-key.8.xml:72
msgid "Output the key <replaceable>keyid</replaceable> to standard output."
msgstr ""
"Den Schlüssel <replaceable>Schlüssel-ID</replaceable> auf der "
"Standardausgabe ausgeben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:78
+#: apt-key.8.xml:79
msgid "exportall"
msgstr "exportall"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:82
+#: apt-key.8.xml:83
msgid "Output all trusted keys to standard output."
msgstr "Alle vertrauenswürdigen Schlüssel auf der Standardausgabe ausgeben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:89
+#: apt-key.8.xml:90
msgid "list"
msgstr "list"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:93
+#: apt-key.8.xml:94
msgid "List trusted keys."
msgstr "Vertrauenswürdige Schlüssel auflisten."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:100
+#: apt-key.8.xml:101
msgid "finger"
msgstr "finger"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:104
+#: apt-key.8.xml:105
msgid "List fingerprints of trusted keys."
msgstr "Fingerabdrücke vertrauenswürdiger Schlüssel auflisten."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:111
+#: apt-key.8.xml:112
msgid "adv"
msgstr "adv"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:115
+#: apt-key.8.xml:116
msgid ""
"Pass advanced options to gpg. With adv --recv-key you can download the "
"public key."
@@ -4949,7 +5019,7 @@ msgstr ""
"öffentlichen Schlüssel herunterladen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:127
+#: apt-key.8.xml:128
msgid ""
"Update the local keyring with the keyring of Debian archive keys and removes "
"from the keyring the archive keys which are no longer valid."
@@ -4958,53 +5028,71 @@ msgstr ""
"aktualisieren und aus dem Schlüsselring die Archivschlüssel entfernen, die "
"nicht länger gültig sind."
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><para>
#: apt-key.8.xml:140
-msgid "<filename>/etc/apt/trusted.gpg</filename>"
-msgstr "<filename>/etc/apt/trusted.gpg</filename>"
+msgid ""
+"Note that options need to be defined before the commands described in the "
+"previous section."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml:142
+#, fuzzy
+#| msgid "add <replaceable>filename</replaceable>"
+msgid "--keyring <replaceable>filename</replaceable>"
+msgstr "add <replaceable>Dateiname</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:141
-msgid "Keyring of local trusted keys, new keys will be added here."
+#: apt-key.8.xml:143
+msgid ""
+"With this option it is possible to specify a specific keyring file the "
+"command should operate on. The default is that a command is executed on the "
+"<filename>trusted.gpg</filename> file as well as on all parts in the "
+"<filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</"
+"filename> is the primary keyring which means that e.g. new keys are added to "
+"this one."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist>
+#: apt-key.8.xml:156
+msgid "&file-trustedgpg;"
msgstr ""
-"Schlüsselring der lokalen vertrauenswürdigen Schlüssel, neue Schlüssel "
-"werden hier hinzugefügt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:144
+#: apt-key.8.xml:158
msgid "<filename>/etc/apt/trustdb.gpg</filename>"
msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:145
+#: apt-key.8.xml:159
msgid "Local trust database of archive keys."
msgstr "Lokale Datenbank vertrauenswürdiger Archivschlüssel."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:148
+#: apt-key.8.xml:162
msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:149
+#: apt-key.8.xml:163
msgid "Keyring of Debian archive trusted keys."
msgstr "Schlüsselring vertrauenswürdiger Schlüssel des Debian-Archivs."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:152
+#: apt-key.8.xml:166
msgid ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgstr ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:153
+#: apt-key.8.xml:167
msgid "Keyring of Debian archive removed trusted keys."
msgstr ""
"Schlüsselring entfernter vertrauenswürdiger Schlüssel des Debian-Archivs."
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:164
+#: apt-key.8.xml:176
msgid "&apt-get;, &apt-secure;"
msgstr "&apt-get;, &apt-secure;"
@@ -5111,15 +5199,11 @@ msgstr "showauto"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml:82
-#, fuzzy
-#| msgid ""
-#| "<literal>showauto</literal> is used to print a list of manually installed "
-#| "packages with each package on a new line."
msgid ""
"<literal>showauto</literal> is used to print a list of automatically "
"installed packages with each package on a new line."
msgstr ""
-"<literal>showauto</literal> wird benutzt, um eine Liste manuell "
+"<literal>showauto</literal> wird benutzt, um eine Liste automatisch "
"installierter Pakete mit einem Paket in jeder neuen Zeile, auszugeben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -5266,14 +5350,6 @@ msgstr "Vertrauenswürdige Archive"
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml:67
-#, fuzzy
-#| msgid ""
-#| "The chain of trust from an apt archive to the end user is made up of "
-#| "different steps. <command>apt-secure</command> is the last step in this "
-#| "chain, trusting an archive does not mean that the packages that you trust "
-#| "it do not contain malicious code but means that you trust the archive "
-#| "maintainer. Its the archive maintainer responsibility to ensure that the "
-#| "archive integrity is correct."
msgid ""
"The chain of trust from an apt archive to the end user is made up of "
"different steps. <command>apt-secure</command> is the last step in this "
@@ -5323,15 +5399,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml:92
-#, fuzzy
-#| msgid ""
-#| "Once the uploaded package is verified and included in the archive, the "
-#| "maintainer signature is stripped off, an MD5 sum of the package is "
-#| "computed and put in the Packages file. The MD5 sum of all of the packages "
-#| "files are then computed and put into the Release file. The Release file "
-#| "is then signed by the archive key (which is created once a year and "
-#| "distributed through the FTP server. This key is also on the Debian "
-#| "keyring."
msgid ""
"Once the uploaded package is verified and included in the archive, the "
"maintainer signature is stripped off, an MD5 sum of the package is computed "
@@ -5465,48 +5532,34 @@ msgstr ""
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#: apt-secure.8.xml:160
-#, fuzzy
-#| msgid ""
-#| "<literal>Create a toplevel Release file</literal>. if it does not exist "
-#| "already. You can do this by running <command>apt-ftparchive release</"
-#| "command> (provided in apt-utils)."
msgid ""
"<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
"already. You can do this by running <command>apt-ftparchive release</"
"command> (provided in apt-utils)."
msgstr ""
-"<literal>Create a toplevel Release file</literal>, wenn es nicht bereits "
-"existiert. Sie können dies tun, indem Sie <command>apt-ftparchive release</"
-"command> (aus apt-utils) ausführen."
+"<emphasis>Erzeugen einer Release-Datei der obersten Stufe</emphasis>, wenn "
+"sie nicht bereits existiert. Sie können dies erledigen, indem Sie "
+"<command>apt-ftparchive release</command> (aus apt-utils) ausführen."
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#: apt-secure.8.xml:165
-#, fuzzy
-#| msgid ""
-#| "<literal>Sign it</literal>. You can do this by running <command>gpg -abs -"
-#| "o Release.gpg Release</command>."
msgid ""
"<emphasis>Sign it</emphasis>. You can do this by running <command>gpg -abs -"
"o Release.gpg Release</command>."
msgstr ""
-"<literal>Sign it</literal>. Sie können dies tun, indem Sie <command>gpg -abs "
-"-o Release.gpg Release</command> ausführen."
+"<emphasis>Es signieren</emphasis>. Sie können dies tun, indem Sie "
+"<command>gpg -abs -o Release.gpg Release</command> ausführen."
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#: apt-secure.8.xml:168
-#, fuzzy
-#| msgid ""
-#| "<literal>Publish the key fingerprint</literal>, that way your users will "
-#| "know what key they need to import in order to authenticate the files in "
-#| "the archive."
msgid ""
"<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
"know what key they need to import in order to authenticate the files in the "
"archive."
msgstr ""
-"<literal>Publish the key fingerprint</literal>, derart, dass Ihre Anwender "
-"wissen, welchen Schlüssel sie importieren müssen, um die Dateien im Archiv "
-"zu authentifizieren."
+"<emphasis>Veröffentlichen Sie den Schlüsselfingerabdruck</emphasis>, damit "
+"Ihre Anwender wissen, welchen Schlüssel sie importieren müssen, um die "
+"Dateien im Archiv zu authentifizieren."
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml:175
@@ -5628,11 +5681,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>18 September 2009</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>18 September 2009</date>"
+"&apt-product; <date>16 January 2010</date>"
msgstr ""
"&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
"firstname> <surname>Burrows</surname> <contrib>Erste Dokumentation von "
@@ -5658,35 +5717,54 @@ msgstr "Konfigurationsdatei für APT"
#: 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 "
-"command line parser to provide a uniform environment. When an APT tool "
-"starts up it will read the configuration specified by the <envar>APT_CONFIG</"
-"envar> environment variable (if any) and then read the files in "
-"<literal>Dir::Etc::Parts</literal> then read the main configuration file "
-"specified by <literal>Dir::Etc::main</literal> then finally apply the "
-"command line options to override the configuration directives, possibly "
-"loading even more config files."
-msgstr ""
-"<filename>apt.conf</filename> ist die Hauptkonfigurationsdatei für die APT-"
-"Werkzeugsammlung. Alle Werkzeuge benutzen die Konfigurationsdatei und einen "
-"gemeinsamen Befehlszeilenauswerter, um eine einheitliche Umgebung "
-"bereitzustellen. Wenn ein APT-Werkzeug startet, liest es die in der "
-"Umgebungsvariablen <envar>APT_CONFIG</envar> (falls vorhanden) angegebene "
-"Konfiguration, dann die Dateien in <literal>Dir::Etc::Parts</literal>, dann "
-"die durch <literal>Dir::Etc::main</literal> angegebene Konfigurationsdatei "
-"und übernimmt am Ende die Befehlszeilenoptionen, um Konfigurationsdirektiven "
-"zu überschreiben und möglicherweise sogar weitere Konfigurationsdateien zu "
-"laden."
+"suite of tools, but by far not the only place changes to options can be "
+"made. All tools therefore share the configuration files and also use a "
+"common command line parser to provide a uniform environment."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><para>
+#: apt.conf.5.xml:45
+msgid ""
+"When an APT tool starts up it will read the configuration files in the "
+"following order:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:47
+msgid ""
+"the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
+"any)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:49
+msgid ""
+"all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
+"order which have no or \"<literal>conf</literal>\" as filename extension and "
+"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
+"characters - otherwise they will be silently ignored."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:54
+msgid ""
+"the main configuration file specified by <literal>Dir::Etc::main</literal>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:56
+msgid ""
+"the command line options are applied to override the configuration "
+"directives or to load even more configuration files."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.conf.5.xml:60
+msgid "Syntax"
+msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:50
-#, fuzzy
-#| msgid ""
-#| "The configuration file is organized in a tree with options organized into "
-#| "functional groups. option specification is given with a double colon "
-#| "notation, for instance <literal>APT::Get::Assume-Yes</literal> is an "
-#| "option within the APT tool group, for the Get tool. options do not "
-#| "inherit from their parent groups."
+#: apt.conf.5.xml:61
msgid ""
"The configuration file is organized in a tree with options organized into "
"functional groups. Option specification is given with a double colon "
@@ -5701,16 +5779,7 @@ msgstr ""
"das Werkzeug Get. Optionen werden nicht von ihren Elterngruppe geerbt."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:56
-#, fuzzy
-#| msgid ""
-#| "Syntactically the configuration language is modeled after what the ISC "
-#| "tools such as bind and dhcp use. Lines starting with <literal>//</"
-#| "literal> are treated as comments (ignored), as well as all text between "
-#| "<literal>/*</literal> and <literal>*/</literal>, just like C/C++ "
-#| "comments. Each line is of the form <literal>APT::Get::Assume-Yes \"true"
-#| "\";</literal> The trailing semicolon is required and the quotes are "
-#| "optional. A new scope can be opened with curly braces, like:"
+#: apt.conf.5.xml:67
msgid ""
"Syntactically the configuration language is modeled after what the ISC tools "
"such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@ -5729,12 +5798,17 @@ msgstr ""
"literal> beginnen, werden als Kommentar betrachtet (und ignoriert), ebenso "
"wie jeglicher Text zwischen <literal>/*</literal> und <literal>*/</literal>, "
"wie bei C/C++-Kommentaren. Jede Zeile hat die Form <literal>APT::Get::Assume-"
-"Yes \"true\";</literal>. Das abschließende Semikolon wird benötigt und "
-"Klammern sind optional. Ein neuer Geltungsbereich kann mit geschweiften "
-"Klammern geöffnet werden, wie:"
+"Yes \"true\";</literal>. Das abschließende Semikolon und die "
+"Anführungszeichen werden benötigt. Der Wert muss in einer Zeile stehen und "
+"es gibt keine Möglichkeit Zeichenketten aneinander zu hängen. Er darf keine "
+"inneren Anführungszeichen enthalten. Das Verhalten des Backslashs »\\« und "
+"maskierter Zeichen innerhalb eines Wertes ist nicht festgelegt und diese "
+"sollten nicht benutzt werden. Ein Optionsname darf alphanumerische Zeichen "
+"und die Zeichen »/-:._+« enthalten. Ein neuer Geltungsbereich kann mit "
+"geschweiften Klammern geöffnet werden, wie:"
#. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:70
+#: apt.conf.5.xml:81
#, no-wrap
msgid ""
"APT {\n"
@@ -5752,7 +5826,7 @@ msgstr ""
"};\n"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:78
+#: apt.conf.5.xml:89
msgid ""
"with newlines placed to make it more readable. Lists can be created by "
"opening a scope and including a single string enclosed in quotes followed by "
@@ -5765,13 +5839,13 @@ msgstr ""
"jeweils getrennt durch ein Semikolon."
#. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:83
+#: apt.conf.5.xml:94
#, no-wrap
msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:86
+#: apt.conf.5.xml:97
msgid ""
"In general the sample configuration file in <filename>&docdir;examples/apt."
"conf</filename> &configureindex; is a good guide for how it should look."
@@ -5781,7 +5855,7 @@ msgstr ""
"aussehen könnte."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:90
+#: apt.conf.5.xml:101
msgid ""
"The names of the configuration items are not case-sensitive. So in the "
"previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
@@ -5791,7 +5865,7 @@ msgstr ""
"<literal>dpkg::pre-install-pkgs</literal> benutzen."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:93
+#: apt.conf.5.xml:104
msgid ""
"Names for the configuration items are optional if a list is defined as it "
"can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. "
@@ -5807,15 +5881,7 @@ msgstr ""
"überschreiben, indem Sie der Option erneut einen neuen Wert zuweisen."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:98
-#, fuzzy
-#| msgid ""
-#| "Two specials are allowed, <literal>#include</literal> and "
-#| "<literal>#clear</literal>: <literal>#include</literal> will include the "
-#| "given file, unless the filename ends in a slash, then the whole directory "
-#| "is included. <literal>#clear</literal> is used to erase a part of the "
-#| "configuration tree. The specified element and all its descendants are "
-#| "erased. (Note that these lines also need to end with a semicolon.)"
+#: apt.conf.5.xml:109
msgid ""
"Two specials are allowed, <literal>#include</literal> (which is deprecated "
"and not supported by alternative implementations) and <literal>#clear</"
@@ -5825,7 +5891,8 @@ msgid ""
"The specified element and all its descendants are erased. (Note that these "
"lines also need to end with a semicolon.)"
msgstr ""
-"Es sind die beiden Spezialfälle <literal>#include</literal> und "
+"Es sind die beiden Spezialfälle <literal>#include</literal> (das missbilligt "
+"ist und von alternativen Implementierungen nicht unterstützt wird) und "
"<literal>#clear</literal> erlaubt: <literal>#include</literal> wird die "
"angegebene Datei einfügen außer, wenn der Dateiname mit einem Schrägstrich "
"endet, dann wird das ganze Verzeichnis eingefügt. <literal>#clear</literal> "
@@ -5834,7 +5901,7 @@ msgstr ""
"(Beachten Sie, dass diese Zeilen auch mit einem Semikolon enden müssen.)"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:106
+#: apt.conf.5.xml:117
msgid ""
"The #clear command is the only way to delete a list or a complete scope. "
"Reopening a scope or the ::-style described below will <emphasis>not</"
@@ -5850,7 +5917,7 @@ msgstr ""
"überschrieben, sondern nur bereinigt werden."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:111
+#: apt.conf.5.xml:122
msgid ""
"All of the APT tools take a -o option which allows an arbitrary "
"configuration directive to be specified on the command line. The syntax is a "
@@ -5869,7 +5936,7 @@ msgstr ""
"Befehlszeile benutzt werden.)"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:118
+#: apt.conf.5.xml:129
msgid ""
"Note that you can use :: only for appending one item per line to a list and "
"that you should not use it in combination with the scope syntax. (The scope "
@@ -5900,12 +5967,12 @@ msgstr ""
"sich APT nicht explizit darüber beklagt."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:130
+#: apt.conf.5.xml:141
msgid "The APT Group"
msgstr "Die APT-Gruppe"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:131
+#: apt.conf.5.xml:142
msgid ""
"This group of options controls general APT behavior as well as holding the "
"options for all of the tools."
@@ -5914,12 +5981,12 @@ msgstr ""
"wie es die Optionen für alle Werkzeuge enthält."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:135
+#: apt.conf.5.xml:146
msgid "Architecture"
msgstr "Architecture"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:136
+#: apt.conf.5.xml:147
msgid ""
"System Architecture; sets the architecture to use when fetching files and "
"parsing package lists. The internal default is the architecture apt was "
@@ -5930,12 +5997,12 @@ msgstr ""
"die Architektur für die APT kompiliert wurde."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:141
+#: apt.conf.5.xml:152
msgid "Default-Release"
msgstr "Default-Release"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:142
+#: apt.conf.5.xml:153
msgid ""
"Default release to install packages from if more than one version available. "
"Contains release name, codename or release version. Examples: 'stable', "
@@ -5948,12 +6015,12 @@ msgstr ""
"auch &apt-preferences;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:146
+#: apt.conf.5.xml:157
msgid "Ignore-Hold"
msgstr "Ignore-Hold"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:147
+#: apt.conf.5.xml:158
msgid ""
"Ignore Held packages; This global option causes the problem resolver to "
"ignore held packages in its decision making."
@@ -5962,12 +6029,12 @@ msgstr ""
"Problemlöser, gehaltene Pakete beim Treffen von Entscheidungen zu ignorieren."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:151
+#: apt.conf.5.xml:162
msgid "Clean-Installed"
msgstr "Clean-Installed"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:152
+#: apt.conf.5.xml:163
msgid ""
"Defaults to on. When turned on the autoclean feature will remove any "
"packages which can no longer be downloaded from the cache. If turned off "
@@ -5982,12 +6049,43 @@ msgstr ""
"Möglichkeiten bereitstellt, um sie erneut zu installieren."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:158
+#: apt.conf.5.xml:169
msgid "Immediate-Configure"
msgstr "Immediate-Configure"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:159
+#: apt.conf.5.xml:170
+#, fuzzy
+#| msgid ""
+#| "Defaults to on which will cause APT to install essential and important "
+#| "packages as fast as possible in the install/upgrade operation. This is "
+#| "done to limit the effect of a failing &dpkg; call: If this option is "
+#| "disabled APT does treat an important package in the same way as an extra "
+#| "package: Between the unpacking of the important package A and his "
+#| "configuration can then be many other unpack or configuration calls, e.g. "
+#| "for package B which has no relation to A, but causes the dpkg call to "
+#| "fail (e.g. because maintainer script of package B generates an error) "
+#| "which results in a system state in which package A is unpacked but "
+#| "unconfigured - each package depending on A is now no longer guaranteed to "
+#| "work as their dependency on A is not longer satisfied. The immediate "
+#| "configuration marker is also applied to all dependencies which can "
+#| "generate a problem if the dependencies e.g. form a circle as a dependency "
+#| "with the immediate flag is comparable with a Pre-Dependency. So in theory "
+#| "it is possible that APT encounters a situation in which it is unable to "
+#| "perform immediate configuration, error out and refers to this option so "
+#| "the user can deactivate the immediate configuration temporary to be able "
+#| "to perform an install/upgrade again. Note the use of the word \"theory\" "
+#| "here as this problem was only encountered by now in real world a few "
+#| "times in non-stable distribution versions and caused by wrong "
+#| "dependencies of the package in question or by a system in an already "
+#| "broken state, so you should not blindly disable this option as the "
+#| "mentioned scenario above is not the only problem immediate configuration "
+#| "can help to prevent in the first place. Before a big operation like "
+#| "<literal>dist-upgrade</literal> is run with this option disabled it "
+#| "should be tried to explicitly <literal>install</literal> the package APT "
+#| "is unable to configure immediately, but please make sure to report your "
+#| "problem also to your distribution and to the APT team with the buglink "
+#| "below so they can work on improving or correcting the upgrade process."
msgid ""
"Defaults to on which will cause APT to install essential and important "
"packages as fast as possible in the install/upgrade operation. This is done "
@@ -6003,13 +6101,13 @@ msgid ""
"dependencies which can generate a problem if the dependencies e.g. form a "
"circle as a dependency with the immediate flag is comparable with a Pre-"
"Dependency. So in theory it is possible that APT encounters a situation in "
-"which it is unable to perform immediate configuration, error out and refers "
+"which it is unable to perform immediate configuration, errors out and refers "
"to this option so the user can deactivate the immediate configuration "
-"temporary to be able to perform an install/upgrade again. Note the use of "
+"temporarily to be able to perform an install/upgrade again. Note the use of "
"the word \"theory\" here as this problem was only encountered by now in real "
-"world a few times in non-stable distribution versions and caused by wrong "
-"dependencies of the package in question or by a system in an already broken "
-"state, so you should not blindly disable this option as the mentioned "
+"world a few times in non-stable distribution versions and was caused by "
+"wrong dependencies of the package in question or by a system in an already "
+"broken state, so you should not blindly disable this option as the mentioned "
"scenario above is not the only problem immediate configuration can help to "
"prevent in the first place. Before a big operation like <literal>dist-"
"upgrade</literal> is run with this option disabled it should be tried to "
@@ -6018,14 +6116,48 @@ msgid ""
"distribution and to the APT team with the buglink below so they can work on "
"improving or correcting the upgrade process."
msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:181
+"Standardmäßig »on«, wodurch APT veranlasst wird, »essential«- oder »important«-"
+"Pakete so schnell wie möglich in der »install«-/»upgrade«-Operation zu "
+"installieren. Dies wird getan, um den Effekt eines gescheiterterten &dpkg;-"
+"Aufrufs zu begrenzen: Wenn diese Option ausgeschaltet ist, behandelt APT ein "
+"»important«-Paket auf die gleiche Weise wie ein »extra«-Paket: Zwischen dem "
+"Entpacken des »important«-Pakets A und seiner Konfiguration können dann viele "
+"andere Entpack- oder Konfigurationsaufrufe liegen, z.B. für Paket B, das "
+"keine Beziehung zu A hat, aber den dpkg-Aufruf zum Scheitern bringt (z.B. "
+"weil das Betreuerskript von Paket B Fehler generiert), die als Ergebnis "
+"einen Systemstatus haben, in dem Paket A entpackt, aber nicht konfiguriert "
+"ist und für kein von A abhängendes Paket länger gewährleistet ist, dass es "
+"funktioniert, weil die Abhängigkeit zu A nicht länger befriedigt wird. Das "
+"unmittelbare Konfigurationskennzeichen wird außerdem auf alle Abhängigkeiten "
+"angewandt, was zu einem Problem führen könnten, falls die Abhängigkeiten z."
+"B. einen Kreis bilden, so dass eine Abhängigkeit mit der "
+"Unmittelbarmarkierung mit einer Vorabhängigkeit vergleichbar ist. So ist es "
+"theoretisch möglich, dass APT einer Situation begegnet, in der keine "
+"unmittelbare Konfiguration durchgeführt, ein Fehler ausgegeben und sich auf "
+"diese Option bezogen werden kann, so dass der Anwender die unmittelbare "
+"Konfiguration zeitweise deaktivieren kann, um in der Lage zu sein, erneut "
+"ein »install«/»upgrade« durchzuführen. Beachten Sie, dass hier das Wort "
+"»theoretisch« benutzt wird, denn dieses Problem ist bis jetzt in der Realität "
+"nur ein paar mal in unstabilen Distributionsversionen aufgetreten und wurde "
+"durch falsche Abhängigkeiten des fraglichen Pakets ausgelöst oder durch ein "
+"System in bereits kaputtem Status, so dass Sie diese Option nicht unbesehen "
+"abschalten sollten, da das oben erwähnte Szenario nicht das einzige "
+"unmittelbare Problem ist, das die Konfiguration überhaupt verhindern sollte. "
+"Bevor eine große Operation wie <literal>dist-upgrade</literal> mit dieser "
+"ausgeschalteten Option ausgeführt wird, sollte explizit versucht werden, "
+"<literal>install</literal> des Pakets durchzuführen. APT ist nicht in der "
+"Lage unmittelbar zu konfigurieren, aber stellen Sie sicher, dass Sie Ihr "
+"Problem außerdem an Ihre Distribution und an das APT-Team berichten mit "
+"nachstehendem Fehlerverweis, so dass es am Verbessern oder Korrigieren des "
+"Upgrade-Prozesses arbeiten kann."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.conf.5.xml:192
msgid "Force-LoopBreak"
msgstr "Force-LoopBreak"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:182
+#: apt.conf.5.xml:193
msgid ""
"Never Enable this option unless you -really- know what you are doing. It "
"permits APT to temporarily remove an essential package to break a Conflicts/"
@@ -6043,12 +6175,12 @@ msgstr ""
"bash oder etwas, was davon abhängt, sind."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:190
+#: apt.conf.5.xml:201
msgid "Cache-Limit"
msgstr "Cache-Limit"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:191
+#: apt.conf.5.xml:202
msgid ""
"APT uses a fixed size memory mapped cache file to store the 'available' "
"information. This sets the size of that cache (in bytes)."
@@ -6058,24 +6190,24 @@ msgstr ""
"(in Bytes)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:195
+#: apt.conf.5.xml:206
msgid "Build-Essential"
msgstr "Build-Essential"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:196
+#: apt.conf.5.xml:207
msgid "Defines which package(s) are considered essential build dependencies."
msgstr ""
"Definiert, welche(s) Paket(e) als essentielle Bauabhängigkeiten betrachtet "
"werde."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:210
msgid "Get"
msgstr "Get"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:200
+#: apt.conf.5.xml:211
msgid ""
"The Get subsection controls the &apt-get; tool, please see its documentation "
"for more information about the options here."
@@ -6085,12 +6217,12 @@ msgstr ""
"erhalten."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:204
+#: apt.conf.5.xml:215
msgid "Cache"
msgstr "Cache"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:205
+#: apt.conf.5.xml:216
msgid ""
"The Cache subsection controls the &apt-cache; tool, please see its "
"documentation for more information about the options here."
@@ -6100,32 +6232,32 @@ msgstr ""
"erhalten."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:209
+#: apt.conf.5.xml:220
msgid "CDROM"
-msgstr "CDROM"
+msgstr "CD-ROM"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:210
+#: apt.conf.5.xml:221
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool, please see its "
"documentation for more information about the options here."
msgstr ""
-"Der CDROM-Unterabschnitt steuert das &apt-cdrom;-Werkzeug. Lesen Sie bitte "
+"Der CD-ROM-Unterabschnitt steuert das &apt-cdrom;-Werkzeug. Lesen Sie bitte "
"dessen Dokumentation, um weitere Informationen über die Optionen hier zu "
"erhalten."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:216
+#: apt.conf.5.xml:227
msgid "The Acquire Group"
msgstr "Die Erwerbgruppe"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:232
msgid "PDiffs"
msgstr "PDiffs"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:222
+#: apt.conf.5.xml:233
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for Packages or "
"Sources files instead of downloading whole ones. True by default."
@@ -6134,13 +6266,24 @@ msgstr ""
"oder Quelldateien herunterzuladen, statt der kompletten Dateien. Vorgabe ist "
"True."
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:236
+msgid ""
+"Two sub-options to limit the use of PDiffs are also available: With "
+"<literal>FileLimit</literal> can be specified how many PDiff files are "
+"downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
+"other hand is the maximum precentage of the size of all patches compared to "
+"the size of the targeted file. If one of these limits is exceeded the "
+"complete file is downloaded instead of the patches."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:227
+#: apt.conf.5.xml:245
msgid "Queue-Mode"
msgstr "Queue-Mode"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:228
+#: apt.conf.5.xml:246
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
"literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -6156,12 +6299,12 @@ msgstr ""
"URI-Art geöffnet wird."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:235
+#: apt.conf.5.xml:253
msgid "Retries"
msgstr "Retries"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:254
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
@@ -6170,12 +6313,12 @@ msgstr ""
"APT fehlgeschlagene Dateien in der angegebenen Zahl erneut versuchen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:240
+#: apt.conf.5.xml:258
msgid "Source-Symlinks"
msgstr "Source-Symlinks"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:241
+#: apt.conf.5.xml:259
msgid ""
"Use symlinks for source archives. If set to true then source archives will "
"be symlinked when possible instead of copying. True is the default."
@@ -6185,12 +6328,12 @@ msgstr ""
"kopiert zu werden. True ist die Vorgabe."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:245 sources.list.5.xml:139
+#: apt.conf.5.xml:263 sources.list.5.xml:139
msgid "http"
msgstr "http"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:246
+#: apt.conf.5.xml:264
msgid ""
"HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
"standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@ -6208,7 +6351,7 @@ msgstr ""
"die Umgebungsvariable <envar>http_proxy</envar> benutzt."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:254
+#: apt.conf.5.xml:272
msgid ""
"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
"caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@ -6234,7 +6377,7 @@ msgstr ""
"unterstützt keine dieser Optionen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:264 apt.conf.5.xml:328
+#: apt.conf.5.xml:282 apt.conf.5.xml:346
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method, this applies to all things including connection timeout and data "
@@ -6245,16 +6388,7 @@ msgstr ""
"Dinge, einschließlich Verbindungs- und Datenzeitüberschreitungen, angewandt."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:267
-#, fuzzy
-#| msgid ""
-#| "One setting is provided to control the pipeline depth in cases where the "
-#| "remote server is not RFC conforming or buggy (such as Squid 2.0.2) "
-#| "<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to "
-#| "5 indicating how many outstanding requests APT should send. A value of "
-#| "zero MUST be specified if the remote host does not properly linger on TCP "
-#| "connections - otherwise data corruption will occur. Hosts which require "
-#| "this are in violation of RFC 2068."
+#: apt.conf.5.xml:285
msgid ""
"One setting is provided to control the pipeline depth in cases where the "
"remote server is not RFC conforming or buggy (such as Squid 2.0.2). "
@@ -6274,7 +6408,7 @@ msgstr ""
"gegen RFC 2068."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:275
+#: apt.conf.5.xml:293
msgid ""
"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
"literal> which accepts integer values in kilobyte. The default value is 0 "
@@ -6290,25 +6424,24 @@ msgstr ""
"deaktiviert.)"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:280
+#: apt.conf.5.xml:298
msgid ""
"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
"User-Agent for the http download method as some proxies allow access for "
"clients only if the client uses a known identifier."
msgstr ""
+"<literal>Acquire::http::User-Agent</literal> kann benutzt werden, um einen "
+"unterschiedlichen User-Agent für die HTTP-Download-Methode zu setzten, da "
+"einige Proxys den Clients nur dann Zugriff gewähren, wenn der Client einen "
+"bekannten Bezeichner verwendet."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:286
+#: apt.conf.5.xml:304
msgid "https"
msgstr "https"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:287
-#, fuzzy
-#| msgid ""
-#| "HTTPS URIs. Cache-control and proxy options are the same as for "
-#| "<literal>http</literal> method. <literal>Pipeline-Depth</literal> option "
-#| "is not supported yet."
+#: apt.conf.5.xml:305
msgid ""
"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
"options are the same as for <literal>http</literal> method and will also "
@@ -6316,12 +6449,14 @@ msgid ""
"not explicitly set for https. <literal>Pipeline-Depth</literal> option is "
"not supported yet."
msgstr ""
-"HTTPS-URIs. Zwischenspeichersteuerung und Proxy-Optionen entsprehen denen "
-"der <literal>http</literal>-Methode. Die Option <literal>Pipeline-Depth</"
-"literal> wird noch nicht unterstützt."
+"HTTPS-URIs. Zwischenspeichersteuerung-, Zeitüberschreitung-, AllowRedirect-, "
+"Dl-Limit- und Proxy-Optionen entsprechen denen der <literal>http</literal>-"
+"Methode und werden auch für die Optionen der Methode <literal>http</literal> "
+"vorgegeben, falls sie nicht explizit für HTTPS gesetzt sind. Die Option "
+"<literal>Pipeline-Depth</literal> wird noch nicht unterstützt."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:311
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -6360,12 +6495,12 @@ msgstr ""
"SslForceVersion</literal> ist die entsprechende per-Host-Option."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:311 sources.list.5.xml:150
+#: apt.conf.5.xml:329 sources.list.5.xml:150
msgid "ftp"
msgstr "ftp"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:312
+#: apt.conf.5.xml:330
msgid ""
"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@ -6400,7 +6535,7 @@ msgstr ""
"entsprechenden URI-Bestandteil genommen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#: apt.conf.5.xml:349
msgid ""
"Several settings are provided to control passive mode. Generally it is safe "
"to leave passive mode on, it works in nearly every environment. However "
@@ -6417,7 +6552,7 @@ msgstr ""
"Beispielskonfiguration, um Beispiele zu erhalten)."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:338
+#: apt.conf.5.xml:356
msgid ""
"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
"envar> environment variable to a http url - see the discussion of the http "
@@ -6431,7 +6566,7 @@ msgstr ""
"Effizienz nicht empfohlen FTP über HTTP zu benutzen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:343
+#: apt.conf.5.xml:361
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -6447,19 +6582,18 @@ msgstr ""
"Server RFC2428 unterstützen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:350 sources.list.5.xml:132
+#: apt.conf.5.xml:368 sources.list.5.xml:132
msgid "cdrom"
msgstr "cdrom"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:356
-#, fuzzy, no-wrap
-#| msgid "\"/cdrom/\"::Mount \"foo\";"
+#: apt.conf.5.xml:374
+#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
-msgstr "\"/cdrom/\"::Mount \"foo\";"
+msgstr "/cdrom/::Mount \"foo\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:369
msgid ""
"CDROM URIs; the only setting for CDROM URIs is the mount point, "
"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@ -6471,22 +6605,22 @@ msgid ""
"can be specified using UMount."
msgstr ""
"CDROM-URIs; Die einzige Einstellung für CDROM-URIs ist der Einhängepunkt "
-"<literal>cdrom::Mount</literal>, der der Einhängepunkt des CDROM-Laufwerks "
+"<literal>cdrom::Mount</literal>, der der Einhängepunkt des CD-ROM-Laufwerks "
"sein muss, wie er in <filename>/etc/fstab</filename> angegeben wurde. Es ist "
"möglich alternative Ein- und Aushängebefehle anzugeben, falls Ihr "
"Einhängepunkt nicht in der fstab aufgelistet werden kann (so wie beim "
"Einhängen per SMB und alten Mount-Paketen). Die Syntax besteht darin, "
-"<placeholder type=\"literallayout\" id=\"0\"/> in den CDROM-Block "
+"<placeholder type=\"literallayout\" id=\"0\"/> in den CD-ROM-Block "
"einzufügen. Der abschließende Schrägstrich ist wichtig. Aushängebefehle "
"können per UMount angegeben werden."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:361
+#: apt.conf.5.xml:379
msgid "gpgv"
msgstr "gpgv"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:362
+#: apt.conf.5.xml:380
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
@@ -6497,18 +6631,18 @@ msgstr ""
"Zusätzliche Parameter werden an gpgv weitergeleitet."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:385
msgid "CompressionTypes"
msgstr "CompressionTypes"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:373
+#: apt.conf.5.xml:391
#, no-wrap
msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
msgstr "Acquire::CompressionTypes::<replaceable>Dateierweiterung</replaceable> \"<replaceable>Methodenname</replaceable>\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:368
+#: apt.conf.5.xml:386
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -6528,19 +6662,19 @@ msgstr ""
"\"synopsis\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:378
+#: apt.conf.5.xml:396
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:381
+#: apt.conf.5.xml:399
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:374
+#: apt.conf.5.xml:392
msgid ""
"Also the <literal>Order</literal> subgroup can be used to define in which "
"order the acquire system will try to download the compressed files. The "
@@ -6571,13 +6705,13 @@ msgstr ""
"explizit zur Liste hinzuzufügen, da es automatisch hinzufügt wird."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:385
+#: apt.conf.5.xml:403
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:383
+#: apt.conf.5.xml:401
msgid ""
"Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
"replaceable></literal> will be checked: If this setting exists the method "
@@ -6603,7 +6737,7 @@ msgstr ""
"diesen Typ nur vor die Liste setzen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:408
msgid ""
"While it is possible to add an empty compression type to the order list, but "
"APT in its current version doesn't understand it correctly and will display "
@@ -6620,36 +6754,75 @@ msgstr ""
"unterstützen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:396
+#: apt.conf.5.xml:414
msgid "Languages"
-msgstr ""
+msgstr "Sprachen"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:397
+#: apt.conf.5.xml:415
+#, fuzzy
+#| msgid ""
+#| "The Languages subsection controls which <filename>Translation</filename> "
+#| "files are downloaded and in which order APT tries to display the "
+#| "Description-Translations. APT will try to display the first available "
+#| "Description for the Language which is listed at first. Languages can be "
+#| "defined with their short or long Languagecodes. Note that not all "
+#| "archives provide <filename>Translation</filename> files for every "
+#| "Language - especially the long Languagecodes are rare, so please inform "
+#| "you which ones are available before you set here impossible values."
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the Description-"
-"Translations. APT will try to display the first available Description for "
-"the Language which is listed at first. Languages can be defined with their "
-"short or long Languagecodes. Note that not all archives provide "
+"Translations. APT will try to display the first available Description in the "
+"Language which is listed at first. Languages can be defined with their short "
+"or long Languagecodes. Note that not all archives provide "
"<filename>Translation</filename> files for every Language - especially the "
"long Languagecodes are rare, so please inform you which ones are available "
"before you set here impossible values."
msgstr ""
+"Der Unterabschnitt Languages steuert welche <filename>Translation</filename>-"
+"Dateien heruntergeladen werden und in welcher Reihenfolge APT versucht, die "
+"Beschreibungsübersetzungen anzuzeigen. APT wird versuchen, die erste "
+"verfügbare Beschreibung für die zuerst aufgelistete Sprache anzuzeigen. "
+"Sprachen können durch ihre kurzen oder langen Sprachcodes definiert sein. "
+"Beachten Sie, dass nicht alle Archive <filename>Translation</filename>-"
+"Dateien für jede Sprache bereitstellen, besonders lange Sprachcodes sind "
+"selten. Informieren Sie sich deshalb bitte welche verfügbar sind, bevor Sie "
+"hier unmögliche Werte einsetzen."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:413
+#: apt.conf.5.xml:431
#, no-wrap
msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
-msgstr ""
+msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:421
+#, fuzzy
+#| msgid ""
+#| "The default list includes \"environment\" and \"en\". "
+#| "\"<literal>environment</literal>\" has a special meaning here: It will be "
+#| "replaced at runtime with the languagecodes extracted from the "
+#| "<literal>LC_MESSAGES</literal> enviroment variable. It will also ensure "
+#| "that these codes are not included twice in the list. If "
+#| "<literal>LC_MESSAGES</literal> is set to \"C\" only the "
+#| "<filename>Translation-en</filename> file (if available) will be used. To "
+#| "force apt to use no Translation file use the setting <literal>Acquire::"
+#| "Languages=none</literal>. \"<literal>none</literal>\" is another special "
+#| "meaning code which will stop the search for a fitting "
+#| "<filename>Translation</filename> file. This can be used by the system "
+#| "administrator to let APT know that it should download also this files "
+#| "without actually use them if not the environment specifies this "
+#| "languages. So the following example configuration will result in the "
+#| "order \"en, de\" in an english and in \"de, en\" in a german "
+#| "localization. Note that \"fr\" is downloaded, but not used if APT is not "
+#| "used in a french localization, in such an environment the order would be "
+#| "\"fr, de, en\". <placeholder type=\"programlisting\" id=\"0\"/>"
msgid ""
"The default list includes \"environment\" and \"en\". "
"\"<literal>environment</literal>\" has a special meaning here: It will be "
"replaced at runtime with the languagecodes extracted from the "
-"<literal>LC_MESSAGES</literal> enviroment variable. It will also ensure "
+"<literal>LC_MESSAGES</literal> environment variable. It will also ensure "
"that these codes are not included twice in the list. If "
"<literal>LC_MESSAGES</literal> is set to \"C\" only the "
"<filename>Translation-en</filename> file (if available) will be used. To "
@@ -6658,16 +6831,35 @@ msgid ""
"meaning code which will stop the search for a fitting <filename>Translation</"
"filename> file. This can be used by the system administrator to let APT "
"know that it should download also this files without actually use them if "
-"not the environment specifies this languages. So the following example "
+"the environment doesn't specify this languages. So the following example "
"configuration will result in the order \"en, de\" in an english and in \"de, "
"en\" in a german localization. Note that \"fr\" is downloaded, but not used "
"if APT is not used in a french localization, in such an environment the "
"order would be \"fr, de, en\". <placeholder type=\"programlisting\" id=\"0"
"\"/>"
msgstr ""
+"Die Standardliste beinhaltet »environment« und »en«. »<literal>environment</"
+"literal>« hat hier eine besondere Bedeutung: Es wird zur Laufzeit durch die "
+"Sprachcodes ersetzt, die aus der Umgebungsvariable <literal>LC_MESSAGES</"
+"literal> extrahiert wurden. Es wird außerdem sicherstellen, dass diese Codes "
+"nicht zweimal in der Liste enthalten sind. Falls <literal>LC_MESSAGES</"
+"literal> auf »C« gesetzt ist, wird nur die Datei <filename>Translation-en</"
+"filename> (falls verfügbar) benutzt. Um APT zu zwingen, keine "
+"Übersetzungsdatei zu benutzen, benutzen Sie die Einstellung "
+"<literal>Acquire::Languages=none</literal>. »<literal>none</literal>« ist ein "
+"weiterer Code mit besonderer Bedeutung, der die Suche nach einer passenden "
+"<filename>Translation</filename>-Datei stoppen wird. Dies kann vom "
+"Systemadministrator benutzt werden, um APT mitzuteilen, dass es auch diese "
+"Dateien herunterladen soll ohne sie aktuell zu benutzen, falls die "
+"Umgebungsvariable diese Sprachen nicht angibt. Daher wird die folgende "
+"Beispielkonfiguration in der Reihenfolge »en,de« zu einer englischen und »de,"
+"en« zu einer deutschen Lokalisierung führen. Beachten Sie, dass »fr« "
+"heruntergeladen, aber nicht benutzt wird, falls APT nicht in einer "
+"französischen Lokalisierung benutzt wird. In einer solchen Umgebung wäre die "
+"Reihenfolge »fr, de, en«. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:217
+#: apt.conf.5.xml:228
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>"
@@ -6677,12 +6869,12 @@ msgstr ""
"id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:438
msgid "Directories"
msgstr "Verzeichnisse"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:422
+#: apt.conf.5.xml:440
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -6702,7 +6894,7 @@ msgstr ""
"filename> oder <filename>./</filename> beginnen."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:429
+#: apt.conf.5.xml:447
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -6725,7 +6917,7 @@ msgstr ""
"<literal>Dir::Cache</literal> enthalten."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:438
+#: apt.conf.5.xml:456
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -6740,7 +6932,7 @@ msgstr ""
"Konfigurationsdatei erfolgt)."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:444
+#: apt.conf.5.xml:462
msgid ""
"The <literal>Dir::Parts</literal> setting reads in all the config fragments "
"in lexical order from the directory specified. After this is done then the "
@@ -6752,7 +6944,7 @@ msgstr ""
"geladen."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:448
+#: apt.conf.5.xml:466
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -6770,7 +6962,7 @@ msgstr ""
"Programms an."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:456
+#: apt.conf.5.xml:474
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -6790,12 +6982,12 @@ msgstr ""
"<filename>/tmp/staging/var/lib/dpkg/status</filename> nachgesehen."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:469
+#: apt.conf.5.xml:487
msgid "APT in DSelect"
msgstr "APT in DSelect"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:471
+#: apt.conf.5.xml:489
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -6806,12 +6998,12 @@ msgstr ""
"<literal>DSelect</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:475
+#: apt.conf.5.xml:493
msgid "Clean"
msgstr "Clean"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:476
+#: apt.conf.5.xml:494
msgid ""
"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
"and never. always and prompt will remove all packages from the cache after "
@@ -6820,16 +7012,16 @@ msgid ""
"for instance). pre-auto performs this action before downloading new "
"packages."
msgstr ""
-"Zwischenspeicherbereinigungsmodus; Dieser Wert kann entweder always, prompt, "
-"auto, pre-auto oder never sein. always und prompt werden, nachdem das "
-"Upgrade durchgeführt wurde, alle Pakete aus dem Zwischenspeicher entfernen, "
-"prompt (die Vorgabe) tut dies bedingt. auto entfernt nur jene Pakete, die "
-"nicht länger heruntergeladen werden können (zum Beispiel, weil sie durch "
-"eine neue Version ersetzt wurden). pre-auto führt diese Aktion vor dem "
-"Herunterladen neuer Pakete durch."
+"Zwischenspeicherbereinigungsmodus; Dieser Wert kann entweder »always«, "
+"»prompt«, »auto«, »pre-auto« oder »never« sein. »always« und »prompt« werden, "
+"nachdem das Upgrade durchgeführt wurde, alle Pakete aus dem Zwischenspeicher "
+"entfernen, »prompt« (die Vorgabe) tut dies bedingt. »auto« entfernt nur jene "
+"Pakete, die nicht länger heruntergeladen werden können (zum Beispiel, weil "
+"sie durch eine neue Version ersetzt wurden). »pre-auto« führt diese Aktion "
+"vor dem Herunterladen neuer Pakete durch."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:485
+#: apt.conf.5.xml:503
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the install phase."
@@ -6838,12 +7030,12 @@ msgstr ""
"übermittelt, wenn es für die Installationsphase durchlaufen wird."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:489
+#: apt.conf.5.xml:507
msgid "Updateoptions"
msgstr "Updateoptions"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:508
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the update phase."
@@ -6852,12 +7044,12 @@ msgstr ""
"übermittelt, wenn es für die Aktualisierungsphase durchlaufen wird."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:494
+#: apt.conf.5.xml:512
msgid "PromptAfterUpdate"
msgstr "PromptAfterUpdate"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:495
+#: apt.conf.5.xml:513
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
@@ -6866,12 +7058,12 @@ msgstr ""
"nachfragen, um fortzufahren. Vorgabe ist es, nur bei Fehlern nachzufragen."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:501
+#: apt.conf.5.xml:519
msgid "How APT calls dpkg"
msgstr "Wie APT Dpkg aufruft"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:520
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
@@ -6880,7 +7072,7 @@ msgstr ""
"stehen im Abschnitt <literal>DPkg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:507
+#: apt.conf.5.xml:525
msgid ""
"This is a list of options to pass to dpkg. The options must be specified "
"using the list notation and each list item is passed as a single argument to "
@@ -6891,17 +7083,17 @@ msgstr ""
"jedes Listenelement wird als einzelnes Argument an &dpkg; übermittelt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:530
msgid "Pre-Invoke"
msgstr "Pre-Invoke"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:530
msgid "Post-Invoke"
msgstr "Post-Invoke"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:513
+#: apt.conf.5.xml:531
msgid ""
"This is a list of shell commands to run before/after invoking &dpkg;. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -6915,12 +7107,12 @@ msgstr ""
"APT abgebrochen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:519
+#: apt.conf.5.xml:537
msgid "Pre-Install-Pkgs"
msgstr "Pre-Install-Pkgs"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:520
+#: apt.conf.5.xml:538
msgid ""
"This is a list of shell commands to run before invoking dpkg. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -6937,7 +7129,7 @@ msgstr ""
"pro Zeile."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:526
+#: apt.conf.5.xml:544
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -6953,12 +7145,12 @@ msgstr ""
"literal> gegeben wird."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:533
+#: apt.conf.5.xml:551
msgid "Run-Directory"
msgstr "Run-Directory"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:534
+#: apt.conf.5.xml:552
msgid ""
"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
"</filename>."
@@ -6967,12 +7159,12 @@ msgstr ""
"die Vorgabe ist <filename>/</filename>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:556
msgid "Build-options"
msgstr "Build-options"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:557
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages, the "
"default is to disable signing and produce all binaries."
@@ -6982,12 +7174,12 @@ msgstr ""
"Programme werden erstellt."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:544
+#: apt.conf.5.xml:562
msgid "dpkg trigger usage (and related options)"
msgstr "Dpkd-Trigger-Benutzung (und zugehöriger Optionen)"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:545
+#: apt.conf.5.xml:563
msgid ""
"APT can call dpkg in a way so it can make aggressive use of triggers over "
"multiply calls of dpkg. Without further options dpkg will use triggers only "
@@ -7013,7 +7205,7 @@ msgstr ""
"Status 100% stehen, während es aktuell alle Pakete konfiguriert."
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:578
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -7027,7 +7219,7 @@ msgstr ""
"DPkg::TriggersPending \"true\";"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:554
+#: apt.conf.5.xml:572
msgid ""
"Note that it is not guaranteed that APT will support these options or that "
"these options will not cause (big) trouble in the future. If you have "
@@ -7052,22 +7244,12 @@ msgstr ""
"wäre <placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:584
msgid "DPkg::NoTriggers"
msgstr "DPkg::NoTriggers"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:567
-#, fuzzy
-#| msgid ""
-#| "Add the no triggers flag to all dpkg calls (expect the ConfigurePending "
-#| "call). See &dpkg; if you are interested in what this actually means. In "
-#| "short: dpkg will not run the triggers then this flag is present unless it "
-#| "is explicit called to do so in an extra call. Note that this option "
-#| "exists (undocumented) also in older apt versions with a slightly "
-#| "different meaning: Previously these option only append --no-triggers to "
-#| "the configure calls to dpkg - now apt will add these flag also to the "
-#| "unpack and remove calls."
+#: apt.conf.5.xml:585
msgid ""
"Add the no triggers flag to all dpkg calls (except the ConfigurePending "
"call). See &dpkg; if you are interested in what this actually means. In "
@@ -7085,29 +7267,15 @@ msgstr ""
"außerdem in älteren APT-Versionen mit einer geringfügig anderen Bedeutung "
"existiert (nicht dokumentiert): Vorher hing diese Option nur --no-triggers "
"an die Konfigurationsaufrufe für Dpkg an – nun wird APT diese Markierung "
-"außerdem an die unpack- und remove-Aufrufe anhängen."
+"außerdem an die »unpack«- und »remove«-Aufrufe anhängen."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:574
+#: apt.conf.5.xml:592
msgid "PackageManager::Configure"
msgstr "PackageManager::Configure"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:575
-#, fuzzy
-#| msgid ""
-#| "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
-#| "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
-#| "value and causes APT to configure all packages explicit. The "
-#| "\"<literal>smart</literal>\" way is it to configure only packages which "
-#| "need to be configured before another package can be unpacked (Pre-"
-#| "Depends) and let the rest configure by dpkg with a call generated by the "
-#| "next option. \"<literal>no</literal>\" on the other hand will not "
-#| "configure anything and totally relay on dpkg for configuration (which "
-#| "will at the moment fail if a Pre-Depends is encountered). Setting this "
-#| "option to another than the all value will implicit activate also the next "
-#| "option per default as otherwise the system could end in an unconfigured "
-#| "status which could be unbootable!"
+#: apt.conf.5.xml:593
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
@@ -7136,20 +7304,12 @@ msgstr ""
"mehr startbar sein könnte."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:603
msgid "DPkg::ConfigurePending"
msgstr "DPkg::ConfigurePending"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:586
-#, fuzzy
-#| msgid ""
-#| "If this option is set apt will call <command>dpkg --configure --pending</"
-#| "command> to let dpkg handle all required configurations and triggers. "
-#| "This option is activated automatic per default if the previous option is "
-#| "not set to <literal>all</literal>, but deactivating could be useful if "
-#| "you want to run APT multiple times in a row - e.g. in an installer. In "
-#| "this sceneries you could deactivate this option in all but the last run."
+#: apt.conf.5.xml:604
msgid ""
"If this option is set apt will call <command>dpkg --configure --pending</"
"command> to let dpkg handle all required configurations and triggers. This "
@@ -7168,12 +7328,12 @@ msgstr ""
"deaktivieren."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:592
+#: apt.conf.5.xml:610
msgid "DPkg::TriggersPending"
msgstr "DPkg::TriggersPending"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:593
+#: apt.conf.5.xml:611
msgid ""
"Useful for <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -7189,12 +7349,12 @@ msgstr ""
"benötigt werden."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:616
msgid "PackageManager::UnpackAll"
msgstr "PackageManager::UnpackAll"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:599
+#: apt.conf.5.xml:617
msgid ""
"As the configuration can be deferred to be done at the end by dpkg it can be "
"tried to order the unpack series only by critical needs, e.g. by Pre-"
@@ -7213,12 +7373,12 @@ msgstr ""
"und weitere Verbesserungen benötigt, bevor sie wirklich nützlich wird."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:606
+#: apt.conf.5.xml:624
msgid "OrderList::Score::Immediate"
msgstr "OrderList::Score::Immediate"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:632
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -7236,7 +7396,7 @@ msgstr ""
"};"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:625
msgid ""
"Essential packages (and there dependencies) should be configured immediately "
"after unpacking. It will be a good idea to do this quite early in the "
@@ -7260,12 +7420,12 @@ msgstr ""
"mit ihren Vorgabewerten. <placeholder type=\"literallayout\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:627
+#: apt.conf.5.xml:645
msgid "Periodic and Archives options"
msgstr "Periodische- und Archivoptionen"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:628
+#: apt.conf.5.xml:646
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -7279,12 +7439,12 @@ msgstr ""
"Dokumentation dieser Optionen zu erhalten."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:636
+#: apt.conf.5.xml:654
msgid "Debug options"
msgstr "Fehlersuchoptionen"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:638
+#: apt.conf.5.xml:656
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -7302,7 +7462,7 @@ msgstr ""
"könnten es sein:"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:667
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -7313,7 +7473,7 @@ msgstr ""
"getroffenen Entscheidungen ein."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:657
+#: apt.conf.5.xml:675
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -7324,7 +7484,7 @@ msgstr ""
"<literal>apt-get -s install</literal>) als nicht root-Anwender auszuführen."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:666
+#: apt.conf.5.xml:684
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -7336,26 +7496,26 @@ msgstr ""
#. motivating example, except I haven't a clue why you'd want
#. to do this.
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:674
+#: apt.conf.5.xml:692
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CDROM IDs."
msgstr ""
"<literal>Debug::IdentCdrom</literal> schaltet das Einbeziehen von statfs-"
-"Daten in CDROM-IDs aus."
+"Daten in CD-ROM-IDs aus."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:702
msgid "A full list of debugging options to apt follows."
msgstr "Eine vollständige Liste der Fehlersuchoptionen von APT folgt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:689
+#: apt.conf.5.xml:707
msgid "<literal>Debug::Acquire::cdrom</literal>"
msgstr "<literal>Debug::Acquire::cdrom</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:711
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
@@ -7363,48 +7523,48 @@ msgstr ""
"literal>-Quellen beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:700
+#: apt.conf.5.xml:718
msgid "<literal>Debug::Acquire::ftp</literal>"
msgstr "<literal>Debug::Acquire::ftp</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:704
+#: apt.conf.5.xml:722
msgid "Print information related to downloading packages using FTP."
msgstr ""
"Gibt Informationen aus, die sich auf das Herunterladen von Paketen per FTP "
"beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:729
msgid "<literal>Debug::Acquire::http</literal>"
msgstr "<literal>Debug::Acquire::http</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:733
msgid "Print information related to downloading packages using HTTP."
msgstr ""
"Gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTP "
"beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:722
+#: apt.conf.5.xml:740
msgid "<literal>Debug::Acquire::https</literal>"
msgstr "<literal>Debug::Acquire::https</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:744
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
"Gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTPS "
"beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:751
msgid "<literal>Debug::Acquire::gpgv</literal>"
msgstr "<literal>Debug::Acquire::gpgv</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:755
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
@@ -7413,12 +7573,12 @@ msgstr ""
"mittels <literal>gpg</literal> beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:744
+#: apt.conf.5.xml:762
msgid "<literal>Debug::aptcdrom</literal>"
msgstr "<literal>Debug::aptcdrom</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:748
+#: apt.conf.5.xml:766
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
@@ -7427,23 +7587,23 @@ msgstr ""
"CD-ROMs gespeichert sind."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:755
+#: apt.conf.5.xml:773
msgid "<literal>Debug::BuildDeps</literal>"
msgstr "<literal>Debug::BuildDeps</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:776
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
"Beschreibt den Prozess der Auflösung von Bauabhängigkeiten in &apt-get;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:783
msgid "<literal>Debug::Hashes</literal>"
msgstr "<literal>Debug::Hashes</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:768
+#: apt.conf.5.xml:786
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
@@ -7452,12 +7612,12 @@ msgstr ""
"Bibliotheken generiert wurde."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:775
+#: apt.conf.5.xml:793
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr "<literal>Debug::IdentCDROM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:778
+#: apt.conf.5.xml:796
msgid ""
"Do not include information from <literal>statfs</literal>, namely the number "
"of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -7468,12 +7628,12 @@ msgstr ""
"ID für eine CD-ROM generiert wird."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:786
+#: apt.conf.5.xml:804
msgid "<literal>Debug::NoLocking</literal>"
msgstr "<literal>Debug::NoLocking</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:807
msgid ""
"Disable all file locking. For instance, this will allow two instances of "
"<quote><literal>apt-get update</literal></quote> to run at the same time."
@@ -7483,24 +7643,24 @@ msgstr ""
"gleichen Zeit laufen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:815
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr "<literal>Debug::pkgAcquire</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:819
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
"Protokollieren, wenn Elemente aus der globalen Warteschlange zum "
"Herunterladen hinzugefügt oder entfernt werden."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:808
+#: apt.conf.5.xml:826
msgid "<literal>Debug::pkgAcquire::Auth</literal>"
msgstr "<literal>Debug::pkgAcquire::Auth</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:811
+#: apt.conf.5.xml:829
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
@@ -7509,12 +7669,12 @@ msgstr ""
"und kryptografischen Signaturen von heruntergeladenen Dateien beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:818
+#: apt.conf.5.xml:836
msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
msgstr "<literal>Debug::pkgAcquire::Diffs</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:821
+#: apt.conf.5.xml:839
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
@@ -7523,12 +7683,12 @@ msgstr ""
"und Fehler, die die Paketindexlisten-Diffs betreffen, ausgeben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:829
+#: apt.conf.5.xml:847
msgid "<literal>Debug::pkgAcquire::RRed</literal>"
msgstr "<literal>Debug::pkgAcquire::RRed</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:833
+#: apt.conf.5.xml:851
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
@@ -7538,12 +7698,12 @@ msgstr ""
"werden."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:840
+#: apt.conf.5.xml:858
msgid "<literal>Debug::pkgAcquire::Worker</literal>"
msgstr "<literal>Debug::pkgAcquire::Worker</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:844
+#: apt.conf.5.xml:862
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
@@ -7551,12 +7711,12 @@ msgstr ""
"durchführen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:851
+#: apt.conf.5.xml:869
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr "<literal>Debug::pkgAutoRemove</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:873
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
@@ -7566,12 +7726,12 @@ msgstr ""
"beziehen."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:862
+#: apt.conf.5.xml:880
msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:883
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -7587,12 +7747,12 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:876
+#: apt.conf.5.xml:894
msgid "<literal>Debug::pkgDepCache::Marker</literal>"
msgstr "<literal>Debug::pkgDepCache::Marker</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:897
msgid ""
"Generate debug messages describing which package is marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -7607,9 +7767,9 @@ 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 ""
-"Generiert Fehlersuchmeldungen, die beschreiben, welches Paket als keep/"
-"install/remove markiert ist, währen der ProblemResolver seine Arbeit "
-"verrichtet. Jedes Hinzufügen oder Löschen kann zusätzliche Aktionen "
+"Generiert Fehlersuchmeldungen, die beschreiben, welches Paket als "
+"»keep«/»install«/»remove« markiert ist, während der ProblemResolver seine "
+"Arbeit verrichtet. Jedes Hinzufügen oder Löschen kann zusätzliche Aktionen "
"auslösen. Sie werden nach zwei eingerückten Leerzeichen unter dem "
"Originaleintrag angezeigt. Jede Zeile hat das Format <literal>MarkKeep</"
"literal>, <literal>MarkDelete</literal> oder <literal>MarkInstall</literal> "
@@ -7624,23 +7784,23 @@ msgstr ""
"erscheint."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:898
+#: apt.conf.5.xml:916
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr "<literal>Debug::pkgInitConfig</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:901
+#: apt.conf.5.xml:919
msgid "Dump the default configuration to standard error on startup."
msgstr ""
"Die Vorgabekonfiguration beim Start auf der Standardfehlerausgabe ausgeben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:908
+#: apt.conf.5.xml:926
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr "<literal>Debug::pkgDPkgPM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:911
+#: apt.conf.5.xml:929
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
@@ -7650,12 +7810,12 @@ msgstr ""
"sind."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:919
+#: apt.conf.5.xml:937
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:922
+#: apt.conf.5.xml:940
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
@@ -7664,12 +7824,12 @@ msgstr ""
"alle während deren Auswertung gefundenen Fehler ausgeben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:947
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr "<literal>Debug::pkgOrderList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:933
+#: apt.conf.5.xml:951
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
@@ -7679,12 +7839,12 @@ msgstr ""
"soll."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:941
+#: apt.conf.5.xml:959
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr "<literal>Debug::pkgPackageManager</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:945
+#: apt.conf.5.xml:963
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
@@ -7692,22 +7852,22 @@ msgstr ""
"von &dpkg; ausgeführt werden."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:952
+#: apt.conf.5.xml:970
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr "<literal>Debug::pkgPolicy</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:974
msgid "Output the priority of each package list on startup."
msgstr "Die Priorität jeder Paketliste beim Start ausgeben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:962
+#: apt.conf.5.xml:980
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr "<literal>Debug::pkgProblemResolver</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:966
+#: apt.conf.5.xml:984
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
@@ -7717,12 +7877,12 @@ msgstr ""
"aufgetreten ist)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:974
+#: apt.conf.5.xml:992
msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:977
+#: apt.conf.5.xml:995
msgid ""
"Display a list of all installed packages with their calculated score used by "
"the pkgProblemResolver. The description of the package is the same as "
@@ -7734,12 +7894,12 @@ msgstr ""
"beschrieben."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:985
+#: apt.conf.5.xml:1003
msgid "<literal>Debug::sourceList</literal>"
msgstr "<literal>Debug::sourceList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:989
+#: apt.conf.5.xml:1007
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
@@ -7748,7 +7908,7 @@ msgstr ""
"gelesenen Anbieter ausgeben."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1012
+#: apt.conf.5.xml:1030
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -7757,13 +7917,13 @@ msgstr ""
"möglichen Optionen zeigen."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1019
+#: apt.conf.5.xml:1037
msgid "&file-aptconf;"
msgstr "&file-aptconf;"
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:1042
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
@@ -7834,25 +7994,36 @@ msgstr ""
"APT-Einstellungsdatei beeinflusst die Wahl der Instanz nicht, nur die Wahl "
"der Version."
-#. type: Content of: <refentry><refsect1><refsect2><title>
+#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:56
+msgid ""
+"Note that the files in the <filename>/etc/apt/preferences.d</filename> "
+"directory are parsed in alphanumeric ascending order and need to obey the "
+"following naming convention: The files have no or \"<literal>pref</literal>"
+"\" as filename extension and which only contain alphanumeric, hyphen (-), "
+"underscore (_) and period (.) characters - otherwise they will be silently "
+"ignored."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt_preferences.5.xml:63
msgid "APT's Default Priority Assignments"
msgstr "APTs Standardprioritätszuweisungen"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:71
+#: apt_preferences.5.xml:78
#, no-wrap
msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
msgstr "<command>apt-get install -t testing <replaceable>irgendein_Paket</replaceable></command>\n"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:74
+#: apt_preferences.5.xml:81
#, 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:58
+#: apt_preferences.5.xml:65
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 "
@@ -7880,22 +8051,22 @@ msgstr ""
"\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:83
+#: apt_preferences.5.xml:90
msgid "priority 100"
msgstr "Priorität 100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:84
+#: apt_preferences.5.xml:91
msgid "to the version that is already installed (if any)."
msgstr "zu der Version, die bereits installiert ist (wenn vorhanden)."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:88
+#: apt_preferences.5.xml:95
msgid "priority 500"
msgstr "Priorität 500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:89
+#: apt_preferences.5.xml:96
msgid ""
"to the versions that are not installed and do not belong to the target "
"release."
@@ -7904,19 +8075,19 @@ msgstr ""
"gehören."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:93
+#: apt_preferences.5.xml:100
msgid "priority 990"
msgstr "Priorität 990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:94
+#: apt_preferences.5.xml:101
msgid ""
"to the versions that are not installed and belong to the target release."
msgstr ""
"zu den Versionen, die nicht installiert sind und zum Ziel-Release gehören."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:78
+#: apt_preferences.5.xml:85
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: "
@@ -7927,7 +8098,7 @@ msgstr ""
"Zuweisung: <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:99
+#: apt_preferences.5.xml:106
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 "
@@ -7938,7 +8109,7 @@ msgstr ""
"installierten Paketversionen eine Priorität von 500 zu."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml:110
msgid ""
"APT then applies the following rules, listed in order of precedence, to "
"determine which version of a package to install."
@@ -7948,7 +8119,7 @@ msgstr ""
"ist."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:106
+#: apt_preferences.5.xml:113
msgid ""
"Never downgrade unless the priority of an available version exceeds 1000. "
"(\"Downgrading\" is installing a less recent version of a package in place "
@@ -7957,19 +8128,19 @@ msgid ""
"Note also that downgrading a package can be risky.)"
msgstr ""
"Führen Sie niemals ein Downgrade durch, außer wenn die Priorität verfügbarer "
-"Pakete 1000 übersteigt. »Downgrading« ist das Installieren einer weniger "
+"Pakete 1000 übersteigt. (»Downgrading« ist das Installieren einer weniger "
"aktuellen Version, an Stelle einer aktuelleren Version. Beachten Sie, dass "
"keine Standardpriorität von APT 1000 übersteigt. So hohe Prioritäten können "
"nur durch die Einstellungsdatei gesetzt werden. Beachten Sie außerdem, dass "
"Downgrading eines Paketes riskant sein kann.)"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:112
+#: apt_preferences.5.xml:119
msgid "Install the highest priority version."
msgstr "Die Version mit der höchsten Priorität installieren."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:113
+#: apt_preferences.5.xml:120
msgid ""
"If two or more versions have the same priority, install the most recent one "
"(that is, the one with the higher version number)."
@@ -7978,7 +8149,7 @@ msgstr ""
"aktuellste installiert (das ist die mit der höheren Versionsnummer)."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:116
+#: apt_preferences.5.xml:123
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</"
@@ -7990,7 +8161,7 @@ msgstr ""
"installierte installiert."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:122
+#: apt_preferences.5.xml:129
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 "
@@ -8006,7 +8177,7 @@ msgstr ""
"upgrade</command> ausgeführt wird."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml:136
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 "
@@ -8020,7 +8191,7 @@ msgstr ""
"upgrade</command> ausgeführt wird."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:141
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 "
@@ -8040,12 +8211,12 @@ msgstr ""
"hat."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:143
+#: apt_preferences.5.xml:150
msgid "The Effect of APT Preferences"
msgstr "Die Auswirkungen von APT-Einstellungen"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:145
+#: apt_preferences.5.xml:152
msgid ""
"The APT preferences file allows the system administrator to control the "
"assignment of priorities. The file consists of one or more multi-line "
@@ -8059,7 +8230,7 @@ msgstr ""
"allgemeine Gestalt."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:151
+#: apt_preferences.5.xml:158
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 "
@@ -8075,7 +8246,7 @@ msgstr ""
"können durch Leerzeichen getrennt werden."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:158
+#: apt_preferences.5.xml:165
#, no-wrap
msgid ""
"Package: perl\n"
@@ -8087,7 +8258,7 @@ msgstr ""
"Pin-Priority: 1001\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:164
+#: apt_preferences.5.xml:171
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 "
@@ -8102,7 +8273,7 @@ msgstr ""
"ausgebildeten Domänennamen identifiziert wird, eine Priorität zu."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:170
+#: apt_preferences.5.xml:177
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 "
@@ -8110,10 +8281,10 @@ msgid ""
msgstr ""
"Dieser Eintrag in allgemeiner Form in der APT-Einstellungsdatei verwendet "
"nur Gruppen von Paketen. Der folgende Eintrag weist zum Beispiel allen "
-"Paketversionen eine hohe Priorität zu, die lokale liegen."
+"Paketversionen eine hohe Priorität zu, die lokal liegen."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:175
+#: apt_preferences.5.xml:182
#, no-wrap
msgid ""
"Package: *\n"
@@ -8125,7 +8296,7 @@ msgstr ""
"Pin-Priority: 999\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:180
+#: apt_preferences.5.xml:187
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 "
@@ -8141,7 +8312,7 @@ msgstr ""
"wie »Debian« oder »Ximian«."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:186
+#: apt_preferences.5.xml:193
msgid ""
"The following record assigns a low priority to all package versions "
"belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -8152,7 +8323,7 @@ msgstr ""
"Priorität zu."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:190
+#: apt_preferences.5.xml:197
#, no-wrap
msgid ""
"Package: *\n"
@@ -8164,7 +8335,7 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:195
+#: apt_preferences.5.xml:202
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is \"<literal>squeeze</literal>"
@@ -8175,7 +8346,7 @@ msgstr ""
"zu."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:199
+#: apt_preferences.5.xml:206
#, no-wrap
msgid ""
"Package: *\n"
@@ -8187,7 +8358,7 @@ msgstr ""
"Pin-Priority: 900\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:204
+#: apt_preferences.5.xml:211
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -8198,7 +8369,7 @@ msgstr ""
"Nummer »<literal>3.0</literal>« ist, eine hohe Priorität zu."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:209
+#: apt_preferences.5.xml:216
#, no-wrap
msgid ""
"Package: *\n"
@@ -8210,17 +8381,17 @@ msgstr ""
"Pin-Priority: 500\n"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:220
+#: apt_preferences.5.xml:227
msgid "How APT Interprets Priorities"
msgstr "Wie APT Prioritäten interpretiert"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:228
+#: apt_preferences.5.xml:235
msgid "P &gt; 1000"
msgstr "P &gt; 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:229
+#: apt_preferences.5.xml:236
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
@@ -8229,12 +8400,12 @@ msgstr ""
"des Pakets durchführt"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:233
+#: apt_preferences.5.xml:240
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:234
+#: apt_preferences.5.xml:241
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
@@ -8243,12 +8414,12 @@ msgstr ""
"Ziel-Release kommt, außer wenn die installierte Version aktueller ist"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:239
+#: apt_preferences.5.xml:246
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:240
+#: apt_preferences.5.xml:247
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"
@@ -8258,12 +8429,12 @@ msgstr ""
"neuer ist"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:245
+#: apt_preferences.5.xml:252
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:246
+#: apt_preferences.5.xml:253
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"
@@ -8273,12 +8444,12 @@ msgstr ""
"installierte Version neuer ist"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:251
+#: apt_preferences.5.xml:258
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:252
+#: apt_preferences.5.xml:259
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
@@ -8287,17 +8458,17 @@ msgstr ""
"installierte Version des Pakets gibt"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:256
+#: apt_preferences.5.xml:263
msgid "P &lt; 0"
msgstr "P &lt; 0"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:257
+#: apt_preferences.5.xml:264
msgid "prevents the version from being installed"
msgstr "verhindert das Installieren der Version"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:223
+#: apt_preferences.5.xml:230
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -8308,7 +8479,7 @@ msgstr ""
"(grob gesagt): <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:262
+#: apt_preferences.5.xml:269
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -8322,7 +8493,7 @@ msgstr ""
"erste dieser Datensätze die Priorität der Paketversion fest."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:268
+#: apt_preferences.5.xml:275
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
@@ -8331,7 +8502,7 @@ msgstr ""
"bereits gezeigten Datensätze:"
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:272
+#: apt_preferences.5.xml:279
#, no-wrap
msgid ""
"Package: perl\n"
@@ -8359,12 +8530,12 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:285
+#: apt_preferences.5.xml:292
msgid "Then:"
msgstr "Dann:"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:294
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 "
@@ -8379,7 +8550,7 @@ msgstr ""
"dann wird von <literal>perl</literal> ein Downgrade durchgeführt."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:292
+#: apt_preferences.5.xml:299
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -8390,7 +8561,7 @@ msgstr ""
"sogar wenn diese Versionen zum Ziel-Release gehören."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:296
+#: apt_preferences.5.xml:303
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</"
@@ -8404,12 +8575,12 @@ msgstr ""
"Pakets installiert ist."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:313
msgid "Determination of Package Version and Distribution Properties"
msgstr "Festlegung von Paketversion und Distributions-Eigenschaften"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:308
+#: apt_preferences.5.xml:315
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -8420,27 +8591,27 @@ msgstr ""
"bereitstellen, um die an diesem Ort verfügbaren Pakete zu beschreiben."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:320
+#: apt_preferences.5.xml:327
msgid "the <literal>Package:</literal> line"
msgstr "die <literal>Package:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:321
+#: apt_preferences.5.xml:328
msgid "gives the package name"
msgstr "gibt den Paketnamen an"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:324 apt_preferences.5.xml:374
+#: apt_preferences.5.xml:331 apt_preferences.5.xml:381
msgid "the <literal>Version:</literal> line"
msgstr "die <literal>Version:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:325
+#: apt_preferences.5.xml:332
msgid "gives the version number for the named package"
msgstr "gibt die Versionsnummer für das genannte Paket an"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:319
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -8461,12 +8632,12 @@ msgstr ""
"Prioritäten relevant: <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:341
+#: apt_preferences.5.xml:348
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr "die <literal>Archive:</literal>- oder <literal>Suite:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:342
+#: apt_preferences.5.xml:349
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -8483,18 +8654,18 @@ msgstr ""
"folgende Zeile benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:352
+#: apt_preferences.5.xml:359
#, 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:358
+#: apt_preferences.5.xml:365
msgid "the <literal>Codename:</literal> line"
msgstr "die <literal>Codename:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:359
+#: apt_preferences.5.xml:366
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 "
@@ -8510,13 +8681,13 @@ msgstr ""
"die folgende Zeile benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:368
+#: apt_preferences.5.xml:375
#, 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:375
+#: apt_preferences.5.xml:382
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 "
@@ -8532,7 +8703,7 @@ msgstr ""
"eine der folgenden Zeilen benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:384
+#: apt_preferences.5.xml:391
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -8544,12 +8715,12 @@ msgstr ""
"Pin: release 3.0\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:393
+#: apt_preferences.5.xml:400
msgid "the <literal>Component:</literal> line"
msgstr "die <literal>Component:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:394
+#: apt_preferences.5.xml:401
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -8567,18 +8738,18 @@ msgstr ""
"Zeilen benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:403
+#: apt_preferences.5.xml:410
#, 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:409
+#: apt_preferences.5.xml:416
msgid "the <literal>Origin:</literal> line"
msgstr "die <literal>Origin:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:410
+#: apt_preferences.5.xml:417
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8590,18 +8761,18 @@ msgstr ""
"in der APT-Einstellungsdatei anzugeben würde die folgende Zeile benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:416
+#: apt_preferences.5.xml:423
#, 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:422
+#: apt_preferences.5.xml:429
msgid "the <literal>Label:</literal> line"
msgstr "die <literal>Label:</literal>-Zeile"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:423
+#: apt_preferences.5.xml:430
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8614,13 +8785,13 @@ msgstr ""
"die folgende Zeile benötigen:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:429
+#: apt_preferences.5.xml:436
#, 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:330
+#: apt_preferences.5.xml:337
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -8642,7 +8813,7 @@ msgstr ""
"relevant: <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:436
+#: apt_preferences.5.xml:443
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -8668,12 +8839,12 @@ msgstr ""
"Distribution heruntergeladen wurde."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:449
+#: apt_preferences.5.xml:456
msgid "Optional Lines in an APT Preferences Record"
msgstr "Optionale Zeilen in einem APT-Einstellungsdatensatz"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:451
+#: apt_preferences.5.xml:458
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -8684,7 +8855,7 @@ msgstr ""
"anfangen. Dieses stellt einen Platz für Kommentare bereit."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:455
+#: apt_preferences.5.xml:462
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 "
@@ -8698,12 +8869,12 @@ msgstr ""
"anfängt."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:471
msgid "Tracking Stable"
msgstr "Stable verfolgen"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:472
+#: apt_preferences.5.xml:479
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -8727,7 +8898,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:466
+#: apt_preferences.5.xml:473
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 "
@@ -8742,8 +8913,8 @@ msgstr ""
"Distribution gehören. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:489 apt_preferences.5.xml:535
-#: apt_preferences.5.xml:593
+#: apt_preferences.5.xml:496 apt_preferences.5.xml:542
+#: apt_preferences.5.xml:600
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -8755,7 +8926,7 @@ msgstr ""
"apt-get dist-upgrade\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:484
+#: apt_preferences.5.xml:491
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 "
@@ -8768,13 +8939,13 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:501
+#: apt_preferences.5.xml:508
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr "apt-get install <replaceable>Paket</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:495
+#: apt_preferences.5.xml:502
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -8788,12 +8959,12 @@ msgstr ""
"\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:507
+#: apt_preferences.5.xml:514
msgid "Tracking Testing or Unstable"
msgstr "Testing oder Unstable verfolgen"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:516
+#: apt_preferences.5.xml:523
#, no-wrap
msgid ""
"Package: *\n"
@@ -8821,7 +8992,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:509
+#: apt_preferences.5.xml:516
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -8838,7 +9009,7 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:530
+#: apt_preferences.5.xml:537
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 "
@@ -8851,13 +9022,13 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:550
+#: apt_preferences.5.xml:557
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr "apt-get install <replaceable>Paket</replaceable>/unstable\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:541
+#: apt_preferences.5.xml:548
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -8877,12 +9048,12 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:564
msgid "Tracking the evolution of a codename release"
msgstr "Die Entwicklung eines Codename-Releases verfolgen"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:571
+#: apt_preferences.5.xml:578
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -8916,7 +9087,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:559
+#: apt_preferences.5.xml:566
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 "
@@ -8942,7 +9113,7 @@ msgstr ""
"benutzen. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:588
+#: apt_preferences.5.xml:595
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 "
@@ -8952,16 +9123,16 @@ msgstr ""
"Mit einer geeigneten &sources-list;-Datei und der obigen Einstellungsdatei "
"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die letzte"
"(n) Version(en) im Release mit Codenamen <literal>squeeze</literal> "
-"durchzuführen.<placeholder type=\"programlisting\" id=\"0\"/>"
+"durchzuführen. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:608
+#: apt_preferences.5.xml:615
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr "apt-get install <replaceable>Paket</replaceable>/sid\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:599
+#: apt_preferences.5.xml:606
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -8981,12 +9152,12 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:617
+#: apt_preferences.5.xml:624
msgid "&file-preferences;"
msgstr "&file-preferences;"
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:623
+#: apt_preferences.5.xml:630
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -9002,12 +9173,6 @@ msgstr "Paketressourcenliste für APT"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:34
-#, fuzzy
-#| msgid ""
-#| "The package resource list is used to locate archives of the package "
-#| "distribution system in use on the system. At this time, this manual page "
-#| "documents only the packaging system used by the Debian GNU/Linux system. "
-#| "This control file is located in <filename>/etc/apt/sources.list</filename>"
msgid ""
"The package resource list is used to locate archives of the package "
"distribution system in use on the system. At this time, this manual page "
@@ -9017,21 +9182,11 @@ msgstr ""
"Die Paketquellenliste wird benutzt, um Archive des Paketverteilungssystems, "
"das auf dem System benutzt wird, zu finden. Momentan dokumentiert diese "
"Handbuchseite nur das vom Debian-GNU/Linux-System benutzte "
-"Paketierungssystem. Die Steuerungsdatei befindet sich in <filename>/etc/apt/"
-"sources.list</filename>."
+"Paketierungssystem. Diese Steuerungsdatei ist <filename>/etc/apt/sources."
+"list</filename>."
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:39
-#, fuzzy
-#| msgid ""
-#| "The source list is designed to support any number of active sources and a "
-#| "variety of source media. The file lists one source per line, with the "
-#| "most preferred source listed first. The format of each line is: "
-#| "<literal>type uri args</literal> The first item, <literal>type</literal> "
-#| "determines the format for <literal>args</literal> <literal>uri</literal> "
-#| "is a Universal Resource Identifier (URI), which is a superset of the more "
-#| "specific and well-known Universal Resource Locator, or URL. The rest of "
-#| "the line can be marked as a comment by using a #."
msgid ""
"The source list is designed to support any number of active sources and a "
"variety of source media. The file lists one source per line, with the most "
@@ -9083,17 +9238,6 @@ msgstr "Die Typen deb und deb-src"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:61
-#, fuzzy
-#| msgid ""
-#| "The <literal>deb</literal> type describes a typical two-level Debian "
-#| "archive, <filename>distribution/component</filename>. Typically, "
-#| "<literal>distribution</literal> is generally one of <literal>stable</"
-#| "literal> <literal>unstable</literal> or <literal>testing</literal> while "
-#| "component is one of <literal>main</literal> <literal>contrib</literal> "
-#| "<literal>non-free</literal> or <literal>non-us</literal> The <literal>deb-"
-#| "src</literal> type describes a debian distribution's source code in the "
-#| "same form as the <literal>deb</literal> type. A <literal>deb-src</"
-#| "literal> line is required to fetch source indexes."
msgid ""
"The <literal>deb</literal> type describes a typical two-level Debian "
"archive, <filename>distribution/component</filename>. Typically, "
@@ -9118,10 +9262,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:73
-#, fuzzy
-#| msgid ""
-#| "The format for a <filename>sources.list</filename> entry using the "
-#| "<literal>deb</literal> and <literal>deb-src</literal> types are:"
msgid ""
"The format for a <filename>sources.list</filename> entry using the "
"<literal>deb</literal> and <literal>deb-src</literal> types is:"
@@ -9137,16 +9277,6 @@ msgstr "deb URI Distribution [Komponente1] [Komponente2] [...]"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:78
-#, fuzzy
-#| msgid ""
-#| "The URI for the <literal>deb</literal> type must specify the base of the "
-#| "Debian distribution, from which APT will find the information it needs. "
-#| "<literal>distribution</literal> can specify an exact path, in which case "
-#| "the components must be omitted and <literal>distribution</literal> must "
-#| "end with a slash (/). This is useful for when only a particular sub-"
-#| "section of the archive denoted by the URI is of interest. If "
-#| "<literal>distribution</literal> does not specify an exact path, at least "
-#| "one <literal>component</literal> must be present."
msgid ""
"The URI for the <literal>deb</literal> type must specify the base of the "
"Debian distribution, from which APT will find the information it needs. "
@@ -9275,14 +9405,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: sources.list.5.xml:141
-#, fuzzy
-#| msgid ""
-#| "The http scheme specifies an HTTP server for the archive. If an "
-#| "environment variable <envar>http_proxy</envar> is set with the format "
-#| "http://server:port/, the proxy server specified in <envar>http_proxy</"
-#| "envar> will be used. Users of authenticated HTTP/1.1 proxies may use a "
-#| "string of the format http://user:pass@server:port/ Note that this is an "
-#| "insecure method of authentication."
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -9363,21 +9485,42 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
#: sources.list.5.xml:178
-msgid "more recongnizable URI types"
-msgstr ""
+#, fuzzy
+#| msgid "more recongnizable URI types"
+msgid "more recognizable URI types"
+msgstr "weitere erkennbare URI-Typen"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: sources.list.5.xml:180
+#, fuzzy
+#| msgid ""
+#| "APT can be extended with more methods shipped in other optional packages "
+#| "which should follow the nameing scheme <literal>apt-transport-"
+#| "<replaceable>method</replaceable></literal>. The APT team e.g. maintain "
+#| "also the <literal>apt-transport-https</literal> package which provides "
+#| "access methods for https-URIs with features similiar to the http method, "
+#| "but other methods for using e.g. debtorrent are also available, see "
+#| "<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</"
+#| "filename></refentrytitle> <manvolnum>1</manvolnum></citerefentry>."
msgid ""
"APT can be extended with more methods shipped in other optional packages "
"which should follow the nameing scheme <literal>apt-transport-"
-"<replaceable>method</replaceable></literal>. The APT team e.g. maintain "
+"<replaceable>method</replaceable></literal>. The APT team e.g. maintains "
"also the <literal>apt-transport-https</literal> package which provides "
-"access methods for https-URIs with features similiar to the http method, but "
+"access methods for https-URIs with features similar to the http method, but "
"other methods for using e.g. debtorrent are also available, see "
"<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></"
"refentrytitle> <manvolnum>1</manvolnum></citerefentry>."
msgstr ""
+"APT kann mit weiteren Methoden, die in anderen optionalen Paketen geliefert "
+"werden, die dem Namensschema <literal>apt-transport-<replaceable>Methode</"
+"replaceable></literal> folgen sollten, erweitert werden. Das APT-Team "
+"betreut z.B. außerdem das Paket <literal>apt-transport-https</literal>, das "
+"Zugriffsmethoden für HTTPS-URIs mit Funktionen bereitstellt, die denen der "
+"HTTP-Methode ähneln, bei der aber andere Methoden für z.B. debtorrent "
+"verfügbar sind, siehe <citerefentry> <refentrytitle><filename>apt-transport-"
+"debtorrent</filename></refentrytitle> <manvolnum>1</manvolnum></"
+"citerefentry>."
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:122
@@ -9385,8 +9528,8 @@ msgid ""
"The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
"rsh. <placeholder type=\"variablelist\" id=\"0\"/>"
msgstr ""
-"Die aktuell erkannten URI-Typen sind cdrom, file, http, ftp, copy, ssh, rsh. "
-"<placeholder type=\"variablelist\" id=\"0\"/>"
+"Die aktuell erkannten URI-Typen sind »cdrom«, »file«, »http«, »ftp«, »copy«, "
+"»ssh«, »rsh«. <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:194
@@ -9407,7 +9550,7 @@ msgstr "deb file:/home/jason/debian stable main contrib non-free"
#: sources.list.5.xml:198
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
-"Wie oben, außer das dies die unstable- (Entwicklungs-) Distribution benutzt."
+"Wie oben, außer das dies die »unstable«- (Entwicklungs-) Distribution benutzt."
#. type: Content of: <refentry><refsect1><literallayout>
#: sources.list.5.xml:199
@@ -9458,12 +9601,6 @@ msgstr "deb ftp://ftp.debian.org/debian stable contrib"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:212
-#, fuzzy
-#| msgid ""
-#| "Uses FTP to access the archive at ftp.debian.org, under the debian "
-#| "directory, and uses only the unstable/contrib area. If this line appears "
-#| "as well as the one in the previous example in <filename>sources.list</"
-#| "filename>. a single FTP session will be used for both resource lines."
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 "
@@ -9519,8 +9656,8 @@ msgstr ""
"<filename>unstable/binary-m68k</filename> auf m68k und so weiter für andere "
"unterstützte Architekturen, gefunden werden. [Beachten Sie, dass dieses "
"Beispiel nur anschaulich macht, wie die Platzhaltervariable benutzt wird. "
-"non-us ist nicht länger so strukturiert] <placeholder type=\"literallayout\" "
-"id=\"0\"/>"
+"»non-us« ist nicht länger so strukturiert] <placeholder type=\"literallayout"
+"\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:234
@@ -9530,28 +9667,30 @@ msgstr "&apt-cache; &apt-conf;"
#. type: <title></title>
#: guide.sgml:4
msgid "APT User's Guide"
-msgstr ""
+msgstr "APT-Benutzerhandbuch"
#. type: <author></author>
#: guide.sgml:6 offline.sgml:6
msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
-msgstr ""
+msgstr "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
#. type: <version></version>
#: guide.sgml:7
msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
-msgstr ""
+msgstr "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
#. type: <abstract></abstract>
#: guide.sgml:11
msgid ""
"This document provides an overview of how to use the the APT package manager."
msgstr ""
+"Dieses Dokument stellt eine Übersicht bereit, wie das APT-"
+"Paketverwaltungsprogramm benutzt wird."
#. type: <copyrightsummary></copyrightsummary>
#: guide.sgml:15
msgid "Copyright &copy; Jason Gunthorpe, 1998."
-msgstr ""
+msgstr "Copyright &copy; Jason Gunthorpe, 1998."
#. type: <p></p>
#: guide.sgml:21 offline.sgml:22
@@ -9561,6 +9700,10 @@ msgid ""
"published by the Free Software Foundation; either version 2 of the License, "
"or (at your option) any later version."
msgstr ""
+"»APT« und dieses Dokument sind freie Software. Sie können sie weitergeben und/"
+"oder verändern unter den Bedingungen der GNU General Public License, wie sie "
+"von der Free Software Foundation veröffentlicht wird; entweder Version 2 der "
+"Lizenz oder (optional) jeder späteren Version."
#. type: <p></p>
#: guide.sgml:24 offline.sgml:25
@@ -9568,13 +9711,13 @@ msgid ""
"For more details, on Debian GNU/Linux systems, see the file /usr/share/"
"common-licenses/GPL for the full license."
msgstr ""
+"Siehe für weitere Details auf Debian-Systemen die Datei /usr/share/common-"
+"licenses/GPL, die die vollständige Lizenz enthält."
#. type: <heading></heading>
#: guide.sgml:32
-#, fuzzy
-#| msgid "generate"
msgid "General"
-msgstr "generate"
+msgstr "Allgemein"
#. type: <p></p>
#: guide.sgml:38
@@ -9584,11 +9727,15 @@ msgid ""
"provide a way to install and remove packages as well as download new "
"packages from the Internet."
msgstr ""
+"Das Paket APT enthält derzeit zwei Abschnitte, die APT-<prgn>dselect</prgn>-"
+"Methode und die Anwenderschnittstelle <prgn>apt-get</prgn> für die "
+"Befehlszeile. Beide stellen eine Möglichkeit bereit, Pakete zu installieren, "
+"zu entfernen, sowie neue Pakete aus dem Internet herunterzuladen."
#. type: <heading></heading>
#: guide.sgml:39
msgid "Anatomy of the Package System"
-msgstr ""
+msgstr "Anatomie des Paketsystems"
#. type: <p></p>
#: guide.sgml:44
@@ -9597,6 +9744,10 @@ msgid ""
"with each package to help assure that it integrates cleanly and easily into "
"the system. The most prominent of its features is the dependency system."
msgstr ""
+"Das Debian-Paketierungssystem besitzt eine große Anzahl von Informationen, "
+"die mit jedem Paket verbunden sind, um zu helfen sicherzustellen, dass es "
+"ordentlich und leicht in das System integriert wird. Das bekannteste seiner "
+"Funktionen ist das Abhängigkeitssystem."
#. type: <p></p>
#: guide.sgml:52
@@ -9607,6 +9758,12 @@ msgid ""
"things the average user is required to install. Also, it allows for choices "
"in mail transport agents, X servers and so on."
msgstr ""
+"Das Abhängigkeitssystem erlaubt individuellen Programmen, Gebrauch von "
+"gemeinsam im System benutzten Elementen, wie Bibliotheken, zu machen. Es "
+"vereinfacht, selten benutze Teile eines Programms in separaten Paketen zu "
+"platzieren, um die Zahl von Dingen zu verringern, die der "
+"Durchschnittsanwender installieren sollte. Außerdem erlaubt es die Auswahl "
+"von Mail-Transport-Agenten, X-Servern und so weiter."
#. type: <p></p>
#: guide.sgml:57
@@ -9616,15 +9773,32 @@ msgid ""
"package requires another package to be installed at the same time to work "
"properly."
msgstr ""
+"Der erste Schritt zum Verständnis des Abhängigkeitssystems besteht darin, "
+"das Konzept einer einfachen Abhängigkeit zu begreifen. Die Bedeutung einer "
+"einfachen Abhängigkeit besteht darin, dass ein Paket ein anderes Paket "
+"benötigt, das zu gleichen Zeit installiert sein muss, um ordentlich zu "
+"funktionieren."
#. type: <p></p>
#: guide.sgml:63
+#, fuzzy
+#| msgid ""
+#| "For instance, mailcrypt is an emacs extension that aids in encrypting "
+#| "email with GPG. Without GPGP installed mail-crypt is useless, so "
+#| "mailcrypt has a simple dependency on GPG. Also, because it is an emacs "
+#| "extension it has a simple dependency on emacs, without emacs it is "
+#| "completely useless."
msgid ""
"For instance, mailcrypt is an emacs extension that aids in encrypting email "
-"with GPG. Without GPGP installed mail-crypt is useless, so mailcrypt has a "
+"with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
"simple dependency on GPG. Also, because it is an emacs extension it has a "
"simple dependency on emacs, without emacs it is completely useless."
msgstr ""
+"Mailcrypt ist zum Beispiel eine Emacs-Erweiterung, die hilft, E-Mails mit "
+"GPG zu verschlüsseln. Ohne installiertes GPG ist Mailcrypt unbrauchbar, "
+"deshalb hat Mailcrypt eine einfache Abhängigkeit von GPG. Da es außerdem "
+"eine Emacs-Erweiterung ist, hat es ebenfalls eine einfache Abhängigkeit von "
+"Emacs. Ohne Emacs ist es komplett unbenutzbar."
#. type: <p></p>
#: guide.sgml:73
@@ -9638,6 +9812,16 @@ msgid ""
"system so all mail transport agents have a conflicting dependency with all "
"other mail transport agents."
msgstr ""
+"Die andere wichtige Abhängigkeit, die es zu verstehen gilt, ist eine in "
+"Konflikt stehende Abhängigkeit. Das bedeutet, dass das Paket, wenn es mit "
+"einem anderen Paket installiert ist, nicht funktioniert und möglicherweise "
+"extrem schädlich für das System sein könnte. Stellen Sie sich als Beispiel "
+"einen Mail-Transport-Agenten wie Sendmail, Exim oder QMail vor. Es ist nicht "
+"möglich, zwei Mail-Transport-Agenten installiert zu haben, da beide im "
+"Netzwerk auf zu empfangende Mails warten. Der Versuch, zwei zu installieren, "
+"würde das System ernsthaft beschädigen, weshalb alle Mail-Transport-Agenten "
+"in Konflikt stehende Abhängigkeiten mit allen anderen Mail-Transport-Agenten "
+"haben."
#. type: <p></p>
#: guide.sgml:83
@@ -9651,6 +9835,15 @@ msgid ""
"depend on mail-transport-agent. This can add a great deal of confusion when "
"trying to manually fix packages."
msgstr ""
+"Als zusätzliche Komplikation besteht die Möglichkeit, dass ein Paket "
+"vortäuscht, ein anderes Paket zu sein. Bedenken Sie, dass Exim und Sendmail "
+"in vieler Hinsicht identisch sind – sie liefern beide E-Mails aus und "
+"verstehen eine gemeinsame Schnittstelle. Daher hat das Paketsystem die "
+"Möglichkeit, beide als Mail-Transport-Agenten zu deklarieren. Deshalb "
+"deklarieren Exim und Sendmail, dass sie einen Mail-Transport-Agenten "
+"bereitstellen und andere Pakete, die einen Mail-Transport-Agenten benötigen, "
+"dass sie von einem Mail-Transport-Agenten abhängen. Die kann zu großer "
+"Verwirrung führen, wenn manuell versucht wird, Pakete zu reparieren."
#. type: <p></p>
#: guide.sgml:88
@@ -9660,6 +9853,11 @@ msgid ""
"issues by providing a number of automatic algorithms that help in selecting "
"packages for installation."
msgstr ""
+"Zu jeder Zeit könnte eine einzelne Abhängigkeit von Paketen vorgefunden "
+"werden, die bereits installiert sind oder nicht. APT versucht beim Auflösen "
+"von Abhängigkeitsproblemen zu helfen, indem es eine Anzahl automatischer "
+"Algorithmen bereitstellt, die bei der Auswahl von Paketen zur Installation "
+"helfen."
#. type: <p></p>
#: guide.sgml:102
@@ -9669,6 +9867,10 @@ msgid ""
"understand .deb files, it works with the package's proper name and can only "
"install .deb archives from a <em>Source</em>."
msgstr ""
+"<prgn>apt-get</prgn> stellt eine einfache Möglichkeit zu Verfügung, Pakete "
+"auf der Befehlszeile zu installieren. Anders als <prgn>dpkg</prgn> versteht "
+"<prgn>apt-get</prgn> keine .deb-Dateien. Es arbeitet mit dem Eigennamen des "
+"Pakets und kann .deb-Archive nur aus einer <em>Quelle</em> installieren."
#. type: <p></p>
#: guide.sgml:109
@@ -9680,6 +9882,12 @@ msgid ""
"packages are available. This is done with <tt>apt-get update</tt>. For "
"instance,"
msgstr ""
+"Das Erste <footnote><p>Falls Sie einen HTTP-Proxy-Server benutzen, müssen "
+"Sie zuerst die Umgebungsvariable »http_proxy« setzen, siehe sources.list(5)</"
+"p></footnote>, das Sie vor der Benutzung von <prgn>apt-get</prgn> tun "
+"sollten, ist es, die Paketlisten von der <em>Quelle</em> herunterzuladen, so "
+"dass es weiß, welche Pakete verfügbar sind. Dies wird mit <tt>apt-get "
+"update</tt> erledigt. Zum Beispiel,"
#. type: <example></example>
#: guide.sgml:116
@@ -9691,11 +9899,16 @@ msgid ""
"Reading Package Lists... Done\n"
"Building Dependency Tree... Done"
msgstr ""
+"# apt-get update\n"
+"OK http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
+"OK http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
+"Paketlisten werden gelesen... Fertig\n"
+"Abhängigkeitsbaum wird aufgebaut... Fertig"
#. type: <p><taglist>
#: guide.sgml:120
msgid "Once updated there are several commands that can be used:"
-msgstr ""
+msgstr "Einmal aktualisiert stehen mehrere Befehl zur Benutzung zur Verfügung:"
#. type: <p></p>
#: guide.sgml:131
@@ -9708,6 +9921,16 @@ msgid ""
"on new packages or conflict with some other package. <prgn>dselect</prgn> or "
"<tt>apt-get install</tt> can be used to force these packages to install."
msgstr ""
+"»Upgrade« wird versuchen, ein behutsames Upgrade des ganzen Systems "
+"durchzuführen. »Upgrade« wird niemals ein neues Paket installieren oder "
+"entfernen, noch wird es jemals ein Upgrade eines Pakets durchführen, das "
+"andere Pakete beschädigen könnte. Dies kann täglich dazu benutzt werden, um "
+"ein relativ sicheres Upgrade des Systems durchzuführen. »Upgrade« wird alle "
+"Pakete auflisten, von denen es kein Upgrade durchführen kann, was "
+"üblicherweise bedeutet, dass sie von neuen Paketen abhängen oder Konflikte "
+"mit anderen Paketen haben. <prgn>dselect</prgn> oder <tt>apt-get install</"
+"tt> können benutzt werden, um die Installation von diesen Paketen zu "
+"erzwingen."
#. type: <p></p>
#: guide.sgml:140
@@ -9720,6 +9943,14 @@ msgid ""
"listed packages and will print a summary and ask for confirmation if "
"anything other than its arguments are changed."
msgstr ""
+"»Install« wird benutzt, um Pakete nach Namen zu installieren. Das Paket wird "
+"automatisch heruntergeladen und installiert. Dies kann nützlich sein, wenn "
+"Sie bereits den Namen des zu installierenden Pakets kennen und keine GUI "
+"aufrufen möchten, um es auszuwählen. Jede Anzahl von Paketen könnte zum "
+"Installieren übergeben werden, sie werden alle heruntergeladen. »Install« "
+"versucht automatisch Abhängigkeitsprobleme mit den aufgelisteten Paketen "
+"aufzulösen, wird eine Zusammenfassung ausgeben und nach einer Bestätigung "
+"fragen, wenn sich etwas anderes als dessen Argumente ändert."
#. type: <p></p>
#: guide.sgml:149
@@ -9732,6 +9963,16 @@ msgid ""
"<prgn>dselect</prgn>. Once dist-upgrade has completed then <prgn>dselect</"
"prgn> can be used to install any packages that may have been left out."
msgstr ""
+"»Dist-upgrade« führt vollständige Upgrades durch. Es wurde entworfen, um "
+"Upgrades zwischen Releases von Debian zu vereinfachen. Es benutzt einen "
+"ausgeklügelten Algorithmus, um die beste Zusammenstellung von Paketen zum "
+"Installieren, für das Upgrade oder zum Entfernen festzulegen, um soviel wie "
+"möglich vom System auf das neuste Release zu bekommen. In einigen "
+"Situationen könnte es eher gewünscht sein, »dist-upgrade« zu benutzen, als "
+"Zeit in das manuelle Auflösen von Abhängigkeiten in <prgn>dselect</prgn> zu "
+"investieren. Ist »Dist-upgrade« erst vollständig, dann kann <prgn>dselect</"
+"prgn> benutzt werden, um einige Pakete zu installieren, die außen vor "
+"geblieben sind."
#. type: <p></p>
#: guide.sgml:152
@@ -9739,6 +9980,8 @@ msgid ""
"It is important to closely look at what dist-upgrade is going to do, its "
"decisions may sometimes be quite surprising."
msgstr ""
+"Es ist wichtig, genau zu schauen, was »Dist-upgrade« tun wird, seine "
+"Entscheidungen können manchmal ziemlich überraschend sein."
#. type: <p></p>
#: guide.sgml:163
@@ -9751,13 +9994,20 @@ msgid ""
"the downloaded archives can be installed by simply running the command that "
"caused them to be downloaded again without <tt>-d</tt>."
msgstr ""
+"<prgn>apt-get</prgn> hat mehrere Befehlszeilenoptionen, die sich detailliert "
+"in dessen Handbuchseite, <manref section=\"8\" name=\"apt-get\"> finden. Die "
+"nützlichste Option ist <tt>-d</tt>, die die heruntergeladenen Dateien nicht "
+"installiert. Falls das System eine große Anzahl Pakete herunterladen soll, "
+"würde es nicht erwünscht sein, wenn die Installation in dem Fall gestartet "
+"würde, wenn etwas schief läuft. Falls <tt>-d</tt> benutzt wird, können die "
+"heruntergeladenen Archive dadurch installiert werden, indem einfach der "
+"Befehl, der das Herunterladen veranlasste, erneut ohne <tt>-d</tt> ausführt "
+"wird."
#. type: <heading></heading>
#: guide.sgml:168
-#, fuzzy
-#| msgid "APT in DSelect"
msgid "DSelect"
-msgstr "APT in DSelect"
+msgstr "DSelect"
#. type: <p></p>
#: guide.sgml:173
@@ -9767,12 +10017,27 @@ msgid ""
"to select the packages to be installed or removed and APT actually installs "
"them."
msgstr ""
+"Die APT-<prgn>dselect</prgn>-Methode stellt das komplette APT-System mit dem "
+"<prgn>dselect</prgn>-Paketauswahl-GUI bereit. <prgn>dselect</prgn> wird "
+"benutzt, um Pakete zum Installieren oder Entfernen auszuwählen und APT "
+"installiert sie tatsächlich."
#. type: <p></p>
#: guide.sgml:184
-msgid ""
-"To enable the APT method you need to to select [A]ccess in <prgn>dselect</"
-"prgn> and then choose the APT method. You will be prompted for a set of "
+#, fuzzy
+#| msgid ""
+#| "To enable the APT method you need to to select [A]ccess in <prgn>dselect</"
+#| "prgn> and then choose the APT method. You will be prompted for a set of "
+#| "<em>Sources</em> which are places to fetch archives from. These can be "
+#| "remote Internet sites, local Debian mirrors or CDROMs. Each source can "
+#| "provide a fragment of the total Debian archive, APT will automatically "
+#| "combine them to form a complete set of packages. If you have a CDROM then "
+#| "it is a good idea to specify it first and then specify a mirror so that "
+#| "you have access to the latest bug fixes. APT will automatically use "
+#| "packages on your CDROM before downloading from the Internet."
+msgid ""
+"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
+"and then choose the APT method. You will be prompted for a set of "
"<em>Sources</em> which are places to fetch archives from. These can be "
"remote Internet sites, local Debian mirrors or CDROMs. Each source can "
"provide a fragment of the total Debian archive, APT will automatically "
@@ -9781,6 +10046,17 @@ msgid ""
"have access to the latest bug fixes. APT will automatically use packages on "
"your CDROM before downloading from the Internet."
msgstr ""
+"Um die APT-Methode einzuschalten, müssen Sie [Z]ugriff in <prgn>dselect</"
+"prgn> auswählen und dann die APT-Methode wählen. Sie werden nach einer "
+"Zusammenstellung von <em>Quellen</em> gefragt. Dies sind Plätze, von denen "
+"Archive heruntergeladen werden. Dies können ferne Internetsites, lokale "
+"Debian-Spiegel oder CD-ROMs sein. Jede Quelle kann einen Ausschnitt des "
+"gesamten Debian-Archives bereitstellen. APT wird sie automatisch "
+"kombinieren, um eine komplette Zusammenstellung von Paketen zu formen. Falls "
+"Sie eine CD-ROM haben, ist es eine gute Idee, sie als erstes und dann den "
+"Spiegel anzugeben, so dass Sie Zugriff auf die neusten Fehlerbehebungen "
+"haben. APT wird automatisch Pakete auf der CD-ROM benutzen, bevor es sie aus "
+"dem Internet herunterlädt."
#. type: <example></example>
#: guide.sgml:198
@@ -9799,6 +10075,18 @@ msgid ""
" \n"
" URL [http://llug.sep.bnl.gov/debian]:"
msgstr ""
+" eine Liste mit Orten von Distributionsquellen einrichten\n"
+"\t \n"
+" Bitte geben Sie die Basis-URL der Debian-Distribution an.\n"
+" Die bekannten Zugriffsschemata dafür sind: http file\n"
+"\t \n"
+" Zum Beispiel:\n"
+" file:/mnt/debian,\n"
+" ftp://ftp.debian.org/debian,\n"
+" http://ftp.de.debian.org/debian,\n"
+" \n"
+" \n"
+" URL [http://llug.sep.bnl.gov/debian]:"
#. type: <p></p>
#: guide.sgml:205
@@ -9807,6 +10095,9 @@ msgid ""
"archive, defaulting to a HTTP mirror. Next it asks for the distribution to "
"get."
msgstr ""
+"Das Einrichten der <em>Quellen</em> beginnt durch das Erfragen der Basis des "
+"Debian-Archives, vorgegeben ist ein HTTP-Spiegel. Als nächstes wird nach der "
+"zu erhaltenden Distribution gefragt."
#. type: <example></example>
#: guide.sgml:212
@@ -9818,6 +10109,9 @@ msgid ""
" \n"
" Distribution [stable]:"
msgstr ""
+" Bitte geben Sie die zu erhaltende Distributionskennzeichnung oder den mit einem / endenden Pfad zum Paket an. Die Distributionskennzeichnungen sind normalerweise etwas wie: stable unstable testing non-US\n"
+" \n"
+" Distribution [stable]:"
#. type: <p></p>
#: guide.sgml:222
@@ -9829,6 +10123,13 @@ msgid ""
"that cannot be exported from the United States. Importing these packages "
"into the US is legal however."
msgstr ""
+"Die Distribution bezieht sich auf die Debian-Version im Archiv, <em>stable</"
+"em> bezieht sich auf die zuletzt veröffentlichte Version und <em>unstable</"
+"em> bezieht sich auf die Entwicklungsversion. <em>non-US</em> ist nur auf "
+"einigen Spiegeln verfügbar und bezieht sich auf Pakete, die "
+"Verschlüsselungstechnologie oder andere Dinge enthalten, die nicht aus den "
+"Vereinigten Staaten exportiert werden können. Diese Pakete in die USA zu "
+"importieren ist jedoch legal."
#. type: <example></example>
#: guide.sgml:228
@@ -9839,6 +10140,10 @@ msgid ""
" \n"
" Components [main contrib non-free]:"
msgstr ""
+" Bitte geben Sie die Komponenten an, die Sie erhalten möchten\n"
+" Die Komponenten sind normalerweise etwas wie: »main« »contrib« »non-free«\n"
+" \n"
+" Komponenten [main contrib non-free]:"
#. type: <p></p>
#: guide.sgml:236
@@ -9848,6 +10153,11 @@ msgid ""
"packages while contrib and non-free contain things that have various "
"restrictions placed on their use and distribution."
msgstr ""
+"Die Komponentenliste bezieht sich auf die Liste von Unter-Distributionen zum "
+"Herunterladen. Die Distribution ist auf Basis von Software-Lizenzen "
+"unterteilt, »Main« besteht aus Paketen die gemäß der DFSG frei sind, während "
+"»Contrib« und »Non-free« Dinge enthalten, die verschiedene Einschränkungen in "
+"ihrer Benutzung und ihren Vertrieb haben."
#. type: <p></p>
#: guide.sgml:240
@@ -9855,16 +10165,32 @@ msgid ""
"Any number of sources can be added, the setup script will continue to prompt "
"until you have specified all that you want."
msgstr ""
+"Jegliche Anzahl von Quellen kann hinzugefügt werden, das Einrichtungsskript "
+"wird mit Nachfragen fortfahren, bis Sie alles angegeben haben, was Sie "
+"möchten."
#. type: <p></p>
#: guide.sgml:247
+#, fuzzy
+#| msgid ""
+#| "Before starting to use <prgn>dselect</prgn> it is necessary to update the "
+#| "available list by selecting [U]pdate from the menu. This is a super-set "
+#| "of <tt>apt-get update</tt> that makes the fetched information available "
+#| "to <prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get "
+#| "update</tt> has been run before."
msgid ""
"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a super-set of "
+"available list by selecting [U]pdate from the menu. This is a superset of "
"<tt>apt-get update</tt> that makes the fetched information available to "
"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
"tt> has been run before."
msgstr ""
+"Bevor sie beginnen, <prgn>dselect</prgn> zu benutzen, ist es notwendig, die "
+"Verfügbarkeitsliste zu aktualisieren, indem sie aus dem Menü [E]rneuern "
+"auswählen. Dies ist eine Obermenge von <tt>apt-get update</tt>, das "
+"<prgn>dselect</prgn> heruntergeladene Informationen zur Verfügung stellt. [E]"
+"rneuern muss auch dann durchgeführt werden, wenn vorher <tt>apt-get update</"
+"tt> ausgeführt wurde."
#. type: <p></p>
#: guide.sgml:253
@@ -9874,6 +10200,10 @@ msgid ""
"[R]emove commands have no meaning, the [I]nstall command performs both of "
"them together."
msgstr ""
+"Sie können dann fortfahren und Ihre Auswahl per [A]uswähle treffen und dann "
+"die Installation mit [I]nstall. vornehmen. Wenn Sie die APT-Methode "
+"benutzen, haben die Befehle Kon[f]ig. und [L]öschen keine Bedeutung, der "
+"Befehl [I]nstall. führt beides gleichermaßen aus."
#. type: <p></p>
#: guide.sgml:258
@@ -9882,11 +10212,14 @@ msgid ""
"have been successfully installed. To change this behavior place <tt>Dselect::"
"clean \"prompt\";</tt> in /etc/apt/apt.conf."
msgstr ""
+"Standardmäßig wird APT automatisch die Paketdateien (.deb) entfernen, sobald "
+"sie erfolgreich installiert sind. Um dieses Verhalten zu ändern, platzieren "
+"Sie <tt>Dselect::clean \"prompt\";</tt> in /etc/apt/apt.conf."
#. type: <heading></heading>
#: guide.sgml:264
msgid "The Interface"
-msgstr ""
+msgstr "Die Schnittstelle"
#. type: <p></p>
#: guide.sgml:278
@@ -9900,11 +10233,20 @@ msgid ""
"then will print out some informative status messages so that you can "
"estimate how far along it is and how much is left to do."
msgstr ""
+"Sowohl die APT-Methode <prgn>dselect</prgn>, als auch <prgn>apt-get</prgn> "
+"teilen sich die gleiche Schnittstelle. Es ist ein einfaches System, das "
+"üblicherweise mitteilt, was es tun wird und es dann tut. <footnote><p>Die "
+"Methode <prgn>dselect</prgn> ist tatsächlich eine Zusammenstellung von "
+"Wrapper-Skripten für <prgn>apt-get</prgn>. Die Methode stellt tatsächlich "
+"mehr Funktionalitäten bereit, als in <prgn>apt-get</prgn> allein vorhanden "
+"sind.</p></footnote> Nach der Ausgabe einer Zusammenfassung was passieren "
+"wird, gibt APT einige informative Statusmeldungen aus, so dass Sie "
+"abschätzen können, wie weit es ist und wieviel noch zu tun ist."
#. type: <heading></heading>
#: guide.sgml:280
msgid "Startup"
-msgstr ""
+msgstr "Anfang"
#. type: <p></p>
#: guide.sgml:284
@@ -9914,6 +10256,10 @@ msgid ""
"At any time these operations can be performed by running <tt>apt-get check</"
"tt>."
msgstr ""
+"Vor allen Operationen, ausgenommen »update«, führt APT eine Reihe von "
+"Aktionen durch, um seinen internen Status vorzubereiten. Es macht außerdem "
+"einige Prüfungen des Systemstatus. Diese Operationen können jederzeit durch "
+"Ausführung von <tt>apt-get check</tt> durchgeführt werden."
#. type: <example></example>
#: guide.sgml:289
@@ -9923,6 +10269,9 @@ msgid ""
"Reading Package Lists... Done\n"
"Building Dependency Tree... Done"
msgstr ""
+"# apt-get check\n"
+"Paketlisten werden gelesen... Fertig\n"
+"Abhängigkeitsbaum wird aufgebaut"
#. type: <p></p>
#: guide.sgml:297
@@ -9932,6 +10281,11 @@ msgid ""
"If some of the package files are not found then they will be ignored and a "
"warning will be printed when apt-get exits."
msgstr ""
+"Das erste was es tut, ist das Einlesen aller Paketdateien in den Speicher. "
+"APT benutzt ein Zwischenspeicherschema, so dass diese Operation beim zweiten "
+"Ausführen schneller laufen wird. Falls einige der Paketdateien nicht "
+"gefunden werden, werden sie ignoriert und beim Beenden von Apt-get wird eine "
+"Warnung ausgegeben."
#. type: <p></p>
#: guide.sgml:303
@@ -9941,6 +10295,11 @@ msgid ""
"package and considers if it is OK. Should this find a problem then a report "
"will be printed out and <prgn>apt-get</prgn> will refuse to run."
msgstr ""
+"Die letzte Operation führt eine detaillierte Analyse der Abhängigkeiten des "
+"Systems durch. Sie prüft jede Abhängigkeit jedes installierten oder "
+"entpackten Pakets und berücksichtigt, ob es in Ordnung ist. Sollte sie ein "
+"Problem finden, dann wird eine Meldung ausgegeben und <prgn>apt-get</prgn> "
+"wird die Ausführung verweigern."
#. type: <example></example>
#: guide.sgml:320
@@ -9962,6 +10321,22 @@ msgid ""
" Depends: xlib6g (>= 3.3-5) but it is not installed\n"
" libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
msgstr ""
+"# apt-get check\n"
+"Paketlisten werden gelesen... Fertig\n"
+"Abhängigkeitsbaum wird aufgebaut\n"
+"Status-Informationen einlesen... Fertig\n"
+"Probieren Sie „apt-get -f install“, um diese zu korrigieren:\n"
+"Die folgenden Pakete haben nichterfüllte Abhängigkeiten:\n"
+" 9fonts: Hängt ab: xlib6g ist aber nicht installiert\n"
+" uucp: Hängt ab: mailx ist aber nicht installiert\n"
+" blast: Hängt ab: xlib6g (>= 3.3-5) ist aber nicht installiert\n"
+" adduser: Hängt ab: perl-base ist aber nicht installiert\n"
+" aumix: Hängt ab: libgpmg1 ist aber nicht installiert\n"
+" debiandoc-sgml: Hängt ab: sgml-base ist aber nicht installiert\n"
+" bash-builtins: Hängt ab: bash (>= 2.01) but 2.0-3 ist installiert\n"
+" cthugha: Hängt ab: svgalibg1 ist aber nicht installiert\n"
+" Hängt ab: xlib6g (>= 3.3-5) ist aber nicht installiert\n"
+" libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
#. type: <p></p>
#: guide.sgml:329
@@ -9972,6 +10347,11 @@ msgid ""
"that are unmet. A short explanation of why the package has a dependency "
"problem is also included."
msgstr ""
+"In diesem Beispiel hat das System viele Probleme, einschließlich eines "
+"ernsten Problems mit libreadlineg2. Für jedes Paket, das nichterfüllte "
+"Abhängigkeiten hat, wird eine Zeile ausgegeben, die das Paket mit dem "
+"Problem anzeigt und die Abhängigkeiten, die nicht erfüllt sind. Eine kurze "
+"Erklärung, warum das Paket ein Abhängigkeitsproblem hat, ist inbegriffen."
#. type: <p></p>
#: guide.sgml:337
@@ -9984,6 +10364,14 @@ msgid ""
"situation a package may have been unpacked without its dependents being "
"installed."
msgstr ""
+"Es gibt zwei Möglichkeiten, wie ein System in einen kaputten Status wie "
+"diesen kommen kann. Die erste wird dadurch verursacht, dass <prgn>dpkg</"
+"prgn> einige feine Beziehungen zwischen Paketen übersieht, wenn Upgrades "
+"durchgeführt werden. <footnote><p>APT berücksichtigt jedoch alle bekannten "
+"Abhängigkeiten und versucht, kaputte Pakete zu vermeiden</p></footnote>. Die "
+"zweite tritt auf, falls eine Paketinstallation während der Ausführung "
+"fehlschlägt. In dieser Situation könnte ein Paket entpackt worden sein, ohne "
+"dass die von ihm Abhängigen installiert sind."
#. type: <p></p>
#: guide.sgml:345
@@ -9995,6 +10383,12 @@ msgid ""
"<prgn>dselect</prgn> method always supplies the <tt>-f</tt> option to allow "
"for easy continuation of failed maintainer scripts."
msgstr ""
+"Die zweite Situation ist weit weniger ernst als die erste, weil APT "
+"bestimmte Beschränkungen in der Reihenfolge setzt, in der Pakete installiert "
+"werden. In beiden Fällen veranlasst die Option <tt>-f</tt> <prgn>apt-get</"
+"prgn>, eine mögliche Lösung für das Problem zu folgern und dann "
+"fortzufahren. Die APT-Methode <prgn>dselect</prgn> liefert immer die Option "
+"<tt>-f</tt>, zum einfachen Fortfahren von gescheiterten Betreuerskripten."
#. type: <p></p>
#: guide.sgml:351
@@ -10005,11 +10399,17 @@ msgid ""
"necessary to manually use dpkg (possibly with forcing options) to correct "
"the situation enough to allow APT to proceed."
msgstr ""
+"Falls jedoch die Option <tt>-f</tt> benutzt wird, um ein ernsthaft kaputtes "
+"System zu korrigieren, das vom ersten Fall verursacht wurde, dann ist es "
+"möglich, dass es entweder sofort fehlschlägt oder die Installationsabfolge "
+"fehlschlagen wird. In beiden Fällen ist es nötig, Dpkg (möglicherweise mit "
+"erzwingenden Optionen) manuell zu benutzen, um die Situation ausreichend zu "
+"korrigieren, so dass es APT ermöglicht wird, fortzufahren."
#. type: <heading></heading>
#: guide.sgml:356
msgid "The Status Report"
-msgstr ""
+msgstr "Der Statusbericht"
#. type: <p></p>
#: guide.sgml:363
@@ -10020,11 +10420,17 @@ msgid ""
"final state of things, taking into account the <tt>-f</tt> option and any "
"other relevant activities to the command being executed."
msgstr ""
+"Bevor es fortfährt, wird <prgn>apt-get</prgn> einen Bericht darüber "
+"präsentieren, was geschehen wird. Im Allgemeinen spiegelt der Bericht den "
+"Typ der Operation, die ausgeführt wird, wider, aber es gibt auch mehrere "
+"geläufige Elemente. Auf jeden Fall spiegelt die Liste den Endstatus der "
+"Dinge wider, bezieht die Option <tt>-f</tt> in Betracht und alle andere "
+"relevante Aktivitäten zum Befehl, der ausgeführt wird."
#. type: <heading></heading>
#: guide.sgml:364
msgid "The Extra Package list"
-msgstr ""
+msgstr "Die zusätzliche Paketliste"
#. type: <example></example>
#: guide.sgml:372
@@ -10037,6 +10443,12 @@ msgid ""
" squake pgp-i python-base debmake ldso perl libreadlineg2\n"
" ssh"
msgstr ""
+"Die folgenden Pakete werden zusätzlich installiert:\n"
+" libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n"
+" mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
+" bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
+" squake pgp-i python-base debmake ldso perl libreadlineg2\n"
+" ssh"
#. type: <p></p>
#: guide.sgml:379
@@ -10046,11 +10458,16 @@ msgid ""
"generated for an <tt>install</tt> command. The listed packages are often the "
"result of an Auto Install."
msgstr ""
+"Die zusätzliche Paketliste zeigt alle Pakete, die installiert werden oder "
+"von denen ein Upgrade durchgeführt wird, zusätzlich zu den auf der "
+"Befehlszeile angegebenen. Sie wird nur für einen <tt>install</tt>-Befehl "
+"generiert. Die aufgelisteten Pakete sind häufig das Ergebnis einer "
+"automatischen Installation."
#. type: <heading></heading>
#: guide.sgml:382
msgid "The Packages to Remove"
-msgstr ""
+msgstr "Die zu entfernenden Pakete"
#. type: <example></example>
#: guide.sgml:389
@@ -10062,6 +10479,11 @@ msgid ""
" xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
" nas xpilot xfig"
msgstr ""
+"Die folgenden Pakete werden ENTFERNT:\n"
+" xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
+" xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
+" xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
+" nas xpilot xfig"
#. type: <p></p>
#: guide.sgml:399
@@ -10074,11 +10496,19 @@ msgid ""
"that are going to be removed because they are only partially installed, "
"possibly due to an aborted installation."
msgstr ""
+"Die Liste der zu entfernenden Pakete zeigt all die Pakete, die vom System "
+"entfernt werden. Sie kann für jede der Operationen angezeigt werden und "
+"sollte einer sorgfältige Überprüfung unterzogen werden, um sicherzustellen, "
+"dass nichts Wichtiges weggenommen wird. Die Option <tt>-f</tt> ist "
+"insbesondere gut darin, Pakete zum Entfernen vorzumerken, so dass in diesem "
+"Fall mit extremer Vorsicht vorgegangen werden sollte. Die Liste könnte "
+"Pakete enthalten, die entfernt werden, weil sie nur teilweise installiert "
+"sind, möglicherweise aufgrund einer abgebrochenen Installation."
#. type: <heading></heading>
#: guide.sgml:402
msgid "The New Packages list"
-msgstr ""
+msgstr "Die Liste neuer Pakete"
#. type: <example></example>
#: guide.sgml:406
@@ -10087,6 +10517,8 @@ msgid ""
"The following NEW packages will installed:\n"
" zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
msgstr ""
+"Die folgenden NEUEN Pakete werden zusätzlich installiert:\n"
+" zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
#. type: <p></p>
#: guide.sgml:411
@@ -10095,11 +10527,14 @@ msgid ""
"listed are not presently installed in the system but will be when APT is "
"done."
msgstr ""
+"Die Liste neuer Pakete ist einfache eine Erinnerung, was geschehen wird. Die "
+"aufgelisteten Pakete sind zurzeit nicht auf dem System installiert, werden "
+"es aber sein, wenn APT fertig ist."
#. type: <heading></heading>
#: guide.sgml:414
msgid "The Kept Back list"
-msgstr ""
+msgstr "Die Liste zurückgehaltener Pakete"
#. type: <example></example>
#: guide.sgml:419
@@ -10109,6 +10544,9 @@ msgid ""
" compface man-db tetex-base msql libpaper svgalib1\n"
" gs snmp arena lynx xpat2 groff xscreensaver"
msgstr ""
+"Die folgenden Pakete werden zurückgehalten:\n"
+" compface man-db tetex-base msql libpaper svgalib1\n"
+" gs snmp arena lynx xpat2 groff xscreensaver"
#. type: <p></p>
#: guide.sgml:428
@@ -10120,11 +10558,18 @@ msgid ""
"to install is with <tt>apt-get install</tt> or by using <prgn>dselect</prgn> "
"to resolve their problems."
msgstr ""
+"Jedesmal, wenn ein Upgrade des ganzen Systems durchgeführt wird, besteht die "
+"Möglichkeit, dass neue Versionen von Paketen nicht installiert werden "
+"können, weil sie neue Dinge benötigen oder einen Konflikt mit bereits "
+"installierten Dingen haben. In diesem Fall wird das Paket auf der Liste "
+"zurückgehaltener Pakete erscheinen. Der beste Weg dort aufgeführte Pakete "
+"zur Installation zu bewegen, ist per <tt>apt-get install</tt> oder indem "
+"<prgn>dselect</prgn> zum Lösen ihrer Probleme benutzt wird."
#. type: <heading></heading>
#: guide.sgml:431
msgid "Held Packages warning"
-msgstr ""
+msgstr "Warnung wegen zurückgehaltener Pakete"
#. type: <example></example>
#: guide.sgml:435
@@ -10133,6 +10578,8 @@ msgid ""
"The following held packages will be changed:\n"
" cvs"
msgstr ""
+"Die folgenden zurückgehaltenen Pakete werden geändert:\n"
+" cvs"
#. type: <p></p>
#: guide.sgml:441
@@ -10141,17 +10588,23 @@ msgid ""
"case it prints out a warning that the held package is going to be changed. "
"This should only happen during dist-upgrade or install."
msgstr ""
+"Manchmal können Sie APT bitten, ein auf »zurückgehalten« gesetztes Paket zu "
+"installieren. In einem solchen Fall gibt es eine Warnung aus, dass das "
+"zurückgehaltene Paket geändert wird. Dies sollte nur während »Dist-upgrade« "
+"oder »Install« vorkommen."
#. type: <heading></heading>
#: guide.sgml:444
msgid "Final summary"
-msgstr ""
+msgstr "Abschließende Zusammenfassung"
#. type: <p></p>
#: guide.sgml:447
msgid ""
"Finally, APT will print out a summary of all the changes that will occur."
msgstr ""
+"Abschließend wird APT eine Zusammenfassung aller Änderungen ausgeben, die "
+"auftreten werden."
#. type: <example></example>
#: guide.sgml:452
@@ -10161,6 +10614,9 @@ msgid ""
"12 packages not fully installed or removed.\n"
"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
msgstr ""
+"206 Pakete aktualisiert, 8 zusätzlich installiert, 23 werden entfernt und 51 nicht aktualisiert.\n"
+"12 Pakete nicht vollständig installiert oder entfernt.\n"
+"Muss 65,7MB/66,7MB an Archiven herunterladen. Nach dem Entpacken werden 26,5MB zusätzlich belegt sein."
#. type: <p></p>
#: guide.sgml:470
@@ -10179,6 +10635,19 @@ msgid ""
"If a large number of packages are being removed then the value may indicate "
"the amount of space that will be freed."
msgstr ""
+"Die erste Zeile der Zusammenfassung ist bloß eine Zusammenfassung von all "
+"den Listen und umfasst die Anzahl der Upgrades – das sind bereits "
+"installierte Pakete, für die neue Versionen verfügbar sind. Die zweite Zeile "
+"zeigt die Anzahl von schlecht konfigurierten Paketen, die möglicherweise das "
+"Ergebnis einer abgebrochenen Installation sind. Die letzt Zeile zeigt den "
+"Speicherbedarf, den die Installation benötigt. Das erste Zahlenpaar bezieht "
+"sich auf die Größe der Archivdateien. Die erste Zahl zeigt die Anzahl der "
+"Bytes an, die von fernen Orten heruntergeladen werden müssen und die zweite "
+"zeigt die gesamte Größe aller benötigten Archive an. Die nächste Zahl zeigt "
+"den Größenunterschied zwischen den derzeit installierten Paketen und den neu "
+"installierten Paketen. Es entspricht ungefähr dem in /usr benötigten "
+"Speicher nachdem alles erledigt ist. Wenn eine große Anzahl Pakete entfernt "
+"wird, dann kann der Wert den Betrag des freiwerdenden Speichers anzeigen."
#. type: <p></p>
#: guide.sgml:473
@@ -10186,11 +10655,14 @@ msgid ""
"Some other reports can be generated by using the -u option to show packages "
"to upgrade, they are similar to the previous examples."
msgstr ""
+"Einige andere Berichte können durch Benutzung der Option »-u« generiert "
+"werden, um Pakete anzuzeigen, von denen ein Upgrade durchgeführt werden "
+"soll. Dies ist den vorherigen Beispielen ähnlich."
#. type: <heading></heading>
#: guide.sgml:477
msgid "The Status Display"
-msgstr ""
+msgstr "Der Anzeigestatus"
#. type: <p></p>
#: guide.sgml:481
@@ -10198,6 +10670,8 @@ msgid ""
"During the download of archives and package files APT prints out a series of "
"status messages."
msgstr ""
+"Während des Herunterladens von Archiven und Paketdateien gibt APT eine Reihe "
+"von Statusmeldungen aus."
#. type: <example></example>
#: guide.sgml:490
@@ -10211,6 +10685,13 @@ msgid ""
"Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
msgstr ""
+"# apt-get update\n"
+"Hole:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"
+"Hole:2 http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
+"Treffer http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
+"Hole:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
+"Hole:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
+"11% [5 testing/non-free 'Warte auf Datei' 0/32.1k 0%] 2203b/s 1m52s"
#. type: <p></p>
#: guide.sgml:500
@@ -10222,6 +10703,13 @@ msgid ""
"<tt>apt-get update</tt> estimates the percent done which causes some "
"inaccuracies."
msgstr ""
+"Die Zeilen, die mit <em>Hole</em> beginnen, werden ausgegeben, wenn APT "
+"anfängt, eine Datei herunterzuladen, während die letzte Zeile den "
+"Fortschritt des Herunterladens anzeigt. Die erste Prozentzahl der "
+"Fortschrittszeile zeigt die gesamt erledigte Prozentzahl aller Dateien an. "
+"Unglücklicherweise schätzt <tt>apt-get update</tt> die erledigte "
+"Prozentzahl, da die Größe der Pakete unbekannt ist, was einige "
+"Ungenauigkeiten bewirkt."
#. type: <p></p>
#: guide.sgml:509
@@ -10234,6 +10722,14 @@ msgid ""
"The next word is the short form name of the object being downloaded. For "
"archives it will contain the name of the package that is being fetched."
msgstr ""
+"Der nächste Abschnitt der Statuszeile wird für jeden Download-Thread "
+"wiederholt und zeigt die durchgeführte Operation, sowie einige nützliche "
+"Informationen darüber an was geschieht. Manchmal wird dieser Abschnitt "
+"einfach nur <em>Forking</em> darstellen, was bedeutet, dass das "
+"Betriebssystem das Download-Modul am Laden ist. Das erste Wort nach dem »[« "
+"ist die Ladenummer, wie sie auf den Verlaufszeilen angezeigt wird. Das "
+"nächste Wort ist Name in Kurzform des Ojektes, das heruntergeladen wird. Für "
+"Archive wird es den Namen des Paketes enthalten, das heruntergeladen wird."
#. type: <p></p>
#: guide.sgml:524
@@ -10252,6 +10748,21 @@ msgid ""
"regularly and reflects the time to complete everything at the shown transfer "
"rate."
msgstr ""
+"Innerhalb von einzelnen Anführungszeichen folgt eine informative "
+"Zeichenkette, die den Fortschritt der Übertragungsphase des Downloads "
+"anzeigt. Normalerweise schreitet sie fort von <em>Verbinde</em> zu <em>Warte "
+"auf Datei</em> zu <em>Lade herunter</em> oder <em>Nehme wieder auf</em>. Der "
+"letzte Wert ist die Anzahl der von der fernen Site heruntergeladenen Bytes. "
+"Sobald der Download beginnt, zeigt sich dies wie <tt>102/10.2k</tt> was "
+"anzeigt, dass 102 Bytes heruntergeladen und 10,2 Kilobytes erwartet werden. "
+"Die Gesamtgröße wird immer in vierstelliger Schreibweise dargestellt, um "
+"Platz zu sparen. Nach der Größenanzeige ist eine Prozentangabe für die Datei "
+"selbst. Das zweitletzte Element ist die augenblickliche "
+"Fortschrittsgeschwindigkeit. Dieser Wert wird alle fünf Sekunden "
+"aktualisiert und spiegelt die Datenübertragungsgeschwindigkeit in dieser "
+"Periode wider. Am Ende wird die geschätzte Übertragungszeit angezeigt. Dies "
+"wird regelmäßig aktualisiert und spiegelt die Zeit zum Vervollständigen bei "
+"der angezeigten Datenübertragungsgeschwindigkeit wider."
#. type: <p></p>
#: guide.sgml:530
@@ -10262,11 +10773,17 @@ msgid ""
"for logging to a file, use the <tt>-q</tt> option to remove the status "
"display."
msgstr ""
+"Die Statusanzeige aktualisiert sich alle halbe Sekunde, um eine gleichmäßige "
+"Rückmeldung über den Download-Fortschritt bereitzustellen, während die »Hole«-"
+"Zeilen bei jeder gestarteten neuen Datei zurückscrollen. Da die "
+"Statusanzeige ständig aktualisiert wird, ist sie für die Protokollierung in "
+"eine Datei ungeeignet. Benutzen Sie die Option <tt>-q</tt>, um die "
+"Statusanzeige zu entfernen."
#. type: <heading></heading>
#: guide.sgml:535
msgid "Dpkg"
-msgstr ""
+msgstr "Dpkg"
#. type: <p></p>
#: guide.sgml:542
@@ -10278,16 +10795,23 @@ msgid ""
"each question there is usually a description of what it is asking and the "
"questions are too varied to discuss completely here."
msgstr ""
+"APT benutzt <prgn>dpkg</prgn>, um die Archive zu installieren und wird zu "
+"der <prgn>dpkg</prgn>-Schnittstelle herüberschalten, sobald der Download "
+"vollständig ist. <prgn>dpkg</prgn> wird außerdem eine Reihe von Fragen "
+"stellen, während es die Pakete abarbeitet und die Pakete können auch mehrere "
+"Fragen stellen . Vor jeder Frage ist üblicherweise eine Beschreibung des "
+"Gefragten und die Fragen sind zu vielfältig, um sie vollständig hier zu "
+"besprechen."
#. type: <title></title>
#: offline.sgml:4
msgid "Using APT Offline"
-msgstr ""
+msgstr "APT offline verwenden"
#. type: <version></version>
#: offline.sgml:7
msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-msgstr ""
+msgstr "$Id: offline.sgml,v 1.8 12.02.2003 15:06:41 doogie Exp $"
#. type: <abstract></abstract>
#: offline.sgml:12
@@ -10295,23 +10819,24 @@ msgid ""
"This document describes how to use APT in a non-networked environment, "
"specifically a 'sneaker-net' approach for performing upgrades."
msgstr ""
+"Dieses Dokument beschreibt, wie APT in einer Umgebung ohne Netzwerk, "
+"speziell einem »Turnschuhnetzwerk«, an die Durchführung von Upgrades "
+"herangeht."
#. type: <copyrightsummary></copyrightsummary>
#: offline.sgml:16
msgid "Copyright &copy; Jason Gunthorpe, 1999."
-msgstr ""
+msgstr "Copyright &copy; Jason Gunthorpe, 1999."
#. type: <heading></heading>
#: offline.sgml:32
msgid "Introduction"
-msgstr ""
+msgstr "Einleitung"
#. type: <heading></heading>
#: offline.sgml:34 offline.sgml:65 offline.sgml:180
-#, fuzzy
-#| msgid "OverrideDir"
msgid "Overview"
-msgstr "OverrideDir"
+msgstr "Übersicht"
#. type: <p></p>
#: offline.sgml:40
@@ -10321,6 +10846,11 @@ msgid ""
"machine is on a slow link, such as a modem and another machine has a very "
"fast connection but they are physically distant."
msgstr ""
+"Normalerweise benötigt APT direkten Zugang zu einem Debian-Archiv, entweder "
+"von einem lokalen Medium oder über ein Netz. Eine andere häufige "
+"Beanstandung ist, dass eine Debian-Maschine an einer langsamen Anbindung, "
+"wie einem Modem, hängt und eine andere Maschine eine sehr schnelle "
+"Verbindung hat, sie jedoch physisch fern sind."
#. type: <p></p>
#: offline.sgml:51
@@ -10335,20 +10865,42 @@ msgid ""
"the machine downloading the packages, and <em>target host</em> the one with "
"bad or no connection."
msgstr ""
+"Die Lösung dazu besteht darin, große Wechselmedien, wie eine Zip-Platte oder "
+"eine SuperDisk zu benutzen. Diese Platten sind nicht groß genug, um ein "
+"ganzes Debian-Archiv zu speichern, können aber leicht eine Untermenge "
+"aufnehmen, die für die meisten Anwender groß genug ist. Die Idee besteht "
+"darin, APT zu benutzen, um eine Liste benötigter Pakete zu generieren und "
+"diese dann mit einer anderen Maschine mit guter Verbindung auf die Platte "
+"herunterzuladen. Es ist sogar möglich, eine andere Debian-Maschine mit APT "
+"oder ein komplett unterschiedliches Betriebssystem und ein Download-Werkzeug "
+"wie Wget zu benutzen. Nennen wir die Maschine, die die Pakete herunterlädt "
+"<em>ferner Rechner</em> und die mit der schlechten oder fehlenden Verbindung "
+"<em>Zielrechner</em>."
#. type: <p></p>
#: offline.sgml:57
+#, fuzzy
+#| msgid ""
+#| "This is achieved by creatively manipulating the APT configuration file. "
+#| "The essential premis to tell APT to look on a disc for it's archive "
+#| "files. Note that the disc should be formated with a filesystem that can "
+#| "handle long file names such as ext2, fat32 or vfat."
msgid ""
"This is achieved by creatively manipulating the APT configuration file. The "
-"essential premis to tell APT to look on a disc for it's archive files. Note "
+"essential premise to tell APT to look on a disc for it's archive files. Note "
"that the disc should be formated with a filesystem that can handle long file "
"names such as ext2, fat32 or vfat."
msgstr ""
+"Dies wird durch kreatives Manipulieren der APT-Konfigurationsdatei erreicht. "
+"Die wesentliche Voraussetzung besteht darin, APT mitzuteilen, dass es für "
+"seine Archivdateien auf einer Platte nachsieht. Beachten Sie, dass diese "
+"Platte mit einem Dateisystem formatiert sein sollte, das mit langen "
+"Dateinamen umgehen kann, so wie ext2, fat32 oder vfat."
#. type: <heading></heading>
#: offline.sgml:63
msgid "Using APT on both machines"
-msgstr ""
+msgstr "APT auf beiden Maschinen benutzen"
#. type: <p><example>
#: offline.sgml:71
@@ -10358,6 +10910,11 @@ msgid ""
"remote machine to fetch the latest package files and decide which packages "
"to download. The disk directory structure should look like:"
msgstr ""
+"Ein verfügbares APT auf beiden Maschinen stellt die einfachste Konfiguration "
+"dar. Die Grundidee besteht darin, eine Kopie der Statusdatei auf der Platte "
+"zu platzieren und die ferne Maschine zu benutzen, um die neusten "
+"Paketdateien herunterzuladen und zu entscheiden, welche Pakete "
+"heruntergeladen werden. Die Plattenverzeichnisstruktur sollte so aussehen:"
#. type: <example></example>
#: offline.sgml:80
@@ -10372,13 +10929,19 @@ msgid ""
" sources.list\n"
" apt.conf"
msgstr ""
+" /Platte/\n"
+" Archive/\n"
+" partial/\n"
+" lists/\n"
+" partial/\n"
+" status\n"
+" sources.list\n"
+" apt.conf"
#. type: <heading></heading>
#: offline.sgml:88
-#, fuzzy
-#| msgid "User configuration"
msgid "The configuration file"
-msgstr "Benutzerkonfiguration"
+msgstr "Die Konfigurationsdatei"
#. type: <p></p>
#: offline.sgml:96
@@ -10390,6 +10953,13 @@ msgid ""
"<em>target host</em>. Please note, if you are using a local archive you must "
"use copy URIs, the syntax is identical to file URIs."
msgstr ""
+"Die Konfigurationsdatei sollte APT mitteilen, dass es seine Dateien auf der "
+"Platte speichert und obendrein die Konfigurationsdateien auf der Platte "
+"benutzt. Die »sources.list« sollte genau die Sites enthalten, die Sie auf der "
+"fernen Maschine benutzen möchten und die Statusdatei sollte eine Kopie von "
+"<em>/var/lib/dpkg/status</em> vom <em>Zielrechner</em> sein. Bitte beachten "
+"Sie, falls Sie lokale Archive benutzen, dass Sie »copy«-URIs benutzen müssen. "
+"Die Syntax entspricht der von »file«-URIs."
#. type: <p><example>
#: offline.sgml:100
@@ -10397,6 +10967,8 @@ msgid ""
"<em>apt.conf</em> must contain the necessary information to make APT use the "
"disc:"
msgstr ""
+"<em>apt.conf</em> muss die nötigen Informationen enthalten, damit APT die "
+"Platte benutzt:"
#. type: <example></example>
#: offline.sgml:124
@@ -10426,6 +10998,29 @@ msgid ""
" Etc \"/disc/\";\n"
" };"
msgstr ""
+" APT\n"
+" {\n"
+" /* Dies ist nicht nötig, falls die beiden Maschinen die gleiche\n"
+" Architektur haben. Es teilt dem fernen APT mit, welche Architektur die Zielmaschine hat */\n"
+" Architecture \"i386\";\n"
+" \n"
+" Get::Download-Only \"true\";\n"
+" };\n"
+" \n"
+" Dir\n"
+" {\n"
+" /* Die Platte für Statusinformationen benutzen und die Statusdatei\n"
+" umleiten von /var/lib/dpkg default */\n"
+" State \"/disc/\";\n"
+" State::status \"status\";\n"
+"\n"
+" // Programmzwischenspeicher werden lokal gespeichert\n"
+" Cache::archives \"/disc/archives/\";\n"
+" Cache \"/tmp/\";\n"
+" \n"
+" // Ort der Quellenliste.\n"
+" Etc \"/disc/\";\n"
+" };"
#. type: </example></p>
#: offline.sgml:129
@@ -10433,20 +11028,41 @@ msgid ""
"More details can be seen by examining the apt.conf man page and the sample "
"configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>."
msgstr ""
+"Weitere Details finden sich in der apt.conf-Handbuchseite und der "
+"Musterkonfigurationsdatei in <em>/usr/share/doc/apt/examples/apt.conf</em>."
#. type: <p><example>
#: offline.sgml:136
+#, fuzzy
+#| msgid ""
+#| "On the target machine the first thing to do is mount the disc and copy "
+#| "<em>/var/lib/dpkg/status</em> to it. You will also need to create the "
+#| "directories outlined in the Overview, <em>archives/partial/</em> and "
+#| "<em>lists/partial/</em> Then take the disc to the remote machine and "
+#| "configure the sources.list. On the remote machine execute the following:"
msgid ""
"On the target machine the first thing to do is mount the disc and copy <em>/"
"var/lib/dpkg/status</em> to it. You will also need to create the directories "
"outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
-"em> Then take the disc to the remote machine and configure the sources.list. "
-"On the remote machine execute the following:"
+"em>. Then take the disc to the remote machine and configure the sources."
+"list. On the remote machine execute the following:"
msgstr ""
+"Das Erste, was auf der Zielmaschine getan werden muss, ist das Einhängen der "
+"Platte und das Kopieren von <em>/var/lib/dpkg/status</em> dorthin. Sie "
+"werden außerdem die in der Übersicht umrissenen Verzeichnisse <em>archives/"
+"partial/</em> und <em>lists/partial/</em> erstellen müssen. Dann bringen Sie "
+"die Platte zu der fernen Maschine und konfigurieren Sie die »sources.list«. "
+"Führen Sie das folgende aus:"
#. type: <example></example>
#: offline.sgml:142
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " # export APT_CONFIG=\"/disc/apt.conf\"\n"
+#| " # apt-get update\n"
+#| " [ APT fetches the package files ]\n"
+#| " apt-get dist-upgrade\n"
+#| " [ APT fetches all the packages needed to upgrade the target machine ]"
msgid ""
" # export APT_CONFIG=\"/disc/apt.conf\"\n"
" # apt-get update\n"
@@ -10454,15 +11070,31 @@ msgid ""
" # apt-get dist-upgrade\n"
" [ APT fetches all the packages needed to upgrade the target machine ]"
msgstr ""
+" # export APT_CONFIG=\"/disc/apt.conf\"\n"
+" # apt-get update\n"
+" [ APT lädt die Paketdateien herunter ]\n"
+" # apt-get dist-upgrade\n"
+" [ APT lädt all die Pakete herunter, die die Zielmaschine benötigt, um ein\n"
+" Upgrade durchzuführen ]"
#. type: </example></p>
#: offline.sgml:149
+#, fuzzy
+#| msgid ""
+#| "The dist-upgrade command can be replaced with any-other standard APT "
+#| "commands, particularly dselect-upgrade. You can even use an APT front end "
+#| "such as <em>dselect</em> However this presents a problem in communicating "
+#| "your selections back to the local computer."
msgid ""
-"The dist-upgrade command can be replaced with any-other standard APT "
+"The dist-upgrade command can be replaced with any other standard APT "
"commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em> However this presents a problem in communicating "
+"such as <em>dselect</em>. However this presents a problem in communicating "
"your selections back to the local computer."
msgstr ""
+"Der Befehl »dist-upgrade« kann durch alle anderen Standard-APT-Befehle "
+"ersetzt werden, insbesondere »dselect-upgrade«. Sie können sogar eine APT-"
+"Oberfläche, wie <em>dselect</em>, benutzen. Jedoch stellt dies ein Problem "
+"dar, Ihre Auswahl zurück an den lokalen Rechner zu kommunizieren."
#. type: <p><example>
#: offline.sgml:153
@@ -10470,6 +11102,9 @@ msgid ""
"Now the disc contains all of the index files and archives needed to upgrade "
"the target machine. Take the disc back and run:"
msgstr ""
+"Nun enthält die Platte alle Indexdateien und Archive, die nötig sind, um ein "
+"Upgrade der Zielmaschine druchzuführen. Bringen Sie die Platte zurück und "
+"starten Sie:"
#. type: <example></example>
#: offline.sgml:159
@@ -10481,6 +11116,11 @@ msgid ""
" # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
" [ Or any other APT command ]"
msgstr ""
+" # export APT_CONFIG=\"/disc/apt.conf\"\n"
+" # apt-get check\n"
+" [ APT generiert eine lokale Kopie der Zwischenspeicherdateien ]\n"
+" # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
+" [ Oder irgendeinen anderen APT-Befehl ]"
#. type: <p></p>
#: offline.sgml:165
@@ -10488,6 +11128,8 @@ msgid ""
"It is necessary for proper function to re-specify the status file to be the "
"local one. This is very important!"
msgstr ""
+"Es ist für ordentliches Funktionieren notwendig, die Statusdatei erneut als "
+"die lokale anzugeben. Dies ist sehr wichtig!"
#. type: <p></p>
#: offline.sgml:172
@@ -10498,11 +11140,18 @@ msgid ""
"the local machine - but this may not always be possible. DO NOT copy the "
"status file if dpkg or APT have been run in the mean time!!"
msgstr ""
+"Wenn Sie Dselect benutzen, können Sie die sehr riskante Operation "
+"durchführen, disc/status auf /var/lib/dpkg/status zu kopieren, so dass die "
+"von Ihnen gemachte Auswahl auf der fernen Maschine aktualisiert wird. Es "
+"wird in höchstem Maße empfohlen, dass Leute nur auf der lokalen Maschine "
+"Auswahlen treffen – aber dies könnte manchmal unmöglich sein. Kopieren Sie "
+"die Statusdatei NICHT, falls Dpkg oder APT in der Zwischenzeit benutzt "
+"wurden!"
#. type: <heading></heading>
#: offline.sgml:178
msgid "Using APT and wget"
-msgstr ""
+msgstr "APT und Wget benutzen"
#. type: <p></p>
#: offline.sgml:185
@@ -10511,6 +11160,9 @@ msgid ""
"any machine. Unlike the method above this requires that the Debian machine "
"already has a list of available packages."
msgstr ""
+"<em>wget</em> ist eine populäres und portierbares Download-Werkzeug, das auf "
+"nahezu jeder Maschine laufen kann. Anders als die Methode oben wird hierfür "
+"benötigt, dass die Debian-Maschine bereits eine Liste verfügbarer Pakete hat."
#. type: <p></p>
#: offline.sgml:190
@@ -10520,13 +11172,15 @@ msgid ""
"option to apt-get and then preparing a wget script to actually fetch the "
"packages."
msgstr ""
+"Die Grundidee besteht darin, eine Platte zu erzeugen, die nur die "
+"heruntergeladenen Archivdateien von der fernen Site enthält. Die wird durch "
+"Benutzen der apt-get-Option »--print-uris« und dem anschließenden Vorbereiten "
+"eines Wget-Skripts getan, um die eigentlichen Pakete herunterzuladen."
#. type: <heading></heading>
#: offline.sgml:196
-#, fuzzy
-#| msgid "Options"
msgid "Operation"
-msgstr "Optionen"
+msgstr "Betrieb"
#. type: <p><example>
#: offline.sgml:200
@@ -10534,6 +11188,9 @@ msgid ""
"Unlike the previous technique no special configuration files are required. "
"We merely use the standard APT commands to generate the file list."
msgstr ""
+"Anders als bei der vorherigen Technik werden keine speziellen "
+"Konfigurationsdateien benötigt. Es werden lediglich die Standard-APT-Befehle "
+"benutzt, um die Dateiliste zu erstellen."
#. type: <example></example>
#: offline.sgml:205
@@ -10544,6 +11201,11 @@ msgid ""
" # apt-get -qq --print-uris dist-upgrade > uris\n"
" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
msgstr ""
+" # apt-get dist-upgrade \n"
+" [ Antworten Sie »nein« auf gestellte Fragen, wenn Sie mit den Aktionen\n"
+" zufrieden sind ]\n"
+" # apt-get -qq --print-uris dist-upgrade > uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /Platte/wget-script"
#. type: </example></p>
#: offline.sgml:210
@@ -10551,6 +11213,8 @@ msgid ""
"Any command other than dist-upgrade could be used here, including dselect-"
"upgrade."
msgstr ""
+"Jeder andere Befehl als »dist-upgrade« könnte hier benutzt werden, "
+"einschließlich »upgrade«."
#. type: <p></p>
#: offline.sgml:216
@@ -10560,11 +11224,15 @@ msgid ""
"with the current directory as the disc's mount point so as to save the "
"output on the disc."
msgstr ""
+"Die Datei /Platte/wget-script wird nun eine Liste der Wget-Befehle "
+"enthalten, um die erforderlichen Archive herunterzuladen. Dieses Skript "
+"sollte mit dem aktuellen Verzeichnis als Platteneinhängepunkt ausgeführt "
+"werden, so dass die Ausgabe auf die Platte gespeichert wird."
#. type: <p><example>
#: offline.sgml:219
msgid "The remote machine would do something like"
-msgstr ""
+msgstr "Die ferne Maschine würde etwas wie das folgende tun"
#. type: <example></example>
#: offline.sgml:223
@@ -10574,6 +11242,9 @@ msgid ""
" # sh -x ./wget-script\n"
" [ wait.. ]"
msgstr ""
+" # cd /Platte\n"
+" # sh -x ./wget-script\n"
+" [ warten ... ]"
#. type: </example><example>
#: offline.sgml:228
@@ -10581,28 +11252,46 @@ msgid ""
"Once the archives are downloaded and the disc returned to the Debian machine "
"installation can proceed using,"
msgstr ""
+"Sobald die Archive heruntergeladen und die Platte zur Debian-Maschine "
+"zurückgekehrt ist, kann die Installation fortfahren durch Benutzung von "
#. type: <example></example>
#: offline.sgml:230
#, no-wrap
msgid " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
-msgstr ""
+msgstr " # apt-get -o dir::cache::archives=\"/Platte/\" dist-upgrade"
#. type: </example></p>
#: offline.sgml:234
msgid "Which will use the already fetched archives on the disc."
-msgstr ""
+msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen."
#~ msgid ""
-#~ "Disable Immediate Configuration; This dangerous option disables some of "
-#~ "APT's ordering code to cause it to make fewer dpkg calls. Doing so may be "
-#~ "necessary on some extremely slow single user systems but is very "
-#~ "dangerous and may cause package install scripts to fail or worse. Use at "
-#~ "your own risk."
+#~ "<filename>apt.conf</filename> is the main configuration file for the APT "
+#~ "suite of tools, all tools make use of the configuration file and a common "
+#~ "command line parser to provide a uniform environment. When an APT tool "
+#~ "starts up it will read the configuration specified by the "
+#~ "<envar>APT_CONFIG</envar> environment variable (if any) and then read the "
+#~ "files in <literal>Dir::Etc::Parts</literal> then read the main "
+#~ "configuration file specified by <literal>Dir::Etc::main</literal> then "
+#~ "finally apply the command line options to override the configuration "
+#~ "directives, possibly loading even more config files."
+#~ msgstr ""
+#~ "<filename>apt.conf</filename> ist die Hauptkonfigurationsdatei für die "
+#~ "APT-Werkzeugsammlung. Alle Werkzeuge benutzen die Konfigurationsdatei und "
+#~ "einen gemeinsamen Befehlszeilenauswerter, um eine einheitliche Umgebung "
+#~ "bereitzustellen. Wenn ein APT-Werkzeug startet, liest es die in der "
+#~ "Umgebungsvariablen <envar>APT_CONFIG</envar> (falls vorhanden) angegebene "
+#~ "Konfiguration, dann die Dateien in <literal>Dir::Etc::Parts</literal>, "
+#~ "dann die durch <literal>Dir::Etc::main</literal> angegebene "
+#~ "Konfigurationsdatei und übernimmt am Ende die Befehlszeilenoptionen, um "
+#~ "Konfigurationsdirektiven zu überschreiben und möglicherweise sogar "
+#~ "weitere Konfigurationsdateien zu laden."
+
+#~ msgid "<filename>/etc/apt/trusted.gpg</filename>"
+#~ msgstr "<filename>/etc/apt/trusted.gpg</filename>"
+
+#~ msgid "Keyring of local trusted keys, new keys will be added here."
#~ msgstr ""
-#~ "Sofortkonfiguration ausschalten; Diese gefährliche Option schaltet "
-#~ "einigen Befehlscode von APT aus, um es zu veranlassen, Dpkg seltener "
-#~ "aufzurufen. Dies zu tun, könnte auf besonders langsamen "
-#~ "Einzelbenutzersystemen nötig sein, ist aber gefährlich und könnte "
-#~ "Paketinstallationsskripte zum Scheitern oder schlimmeren veranlassen. "
-#~ "Benutzen Sie es auf eigene Gefahr."
+#~ "Schlüsselring der lokalen vertrauenswürdigen Schlüssel, neue Schlüssel "
+#~ "werden hier hinzugefügt."
diff --git a/doc/po/es.po b/doc/po/es.po
index 266f69c02..533978695 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -14,7 +14,7 @@
msgid ""
msgstr ""
"Project-Id-Version: apt\n"
-"POT-Creation-Date: 2009-11-27 00:05+0100\n"
+"POT-Creation-Date: 2010-01-20 12:18+0100\n"
"PO-Revision-Date: 2004-09-20 17:05+0000\n"
"Last-Translator: Rubén Porras Campo <nahoo@inicia.es>\n"
"Language-Team: <debian-l10n-spanish@lists.debian.org>\n"
@@ -789,7 +789,7 @@ msgstr ""
"Directorio donde se almacena información de estado por cada sitio especificado en &sources-list; Opción de Configuración: <literal>Dir::State::Lists</literal>."
#. type: Plain text
-#: apt.ent:355
+#: apt.ent:356
#, fuzzy, no-wrap
msgid ""
" <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
@@ -811,6 +811,93 @@ msgstr ""
"#-#-#-#-# apt-cdrom.es.8.sgml:1136 apt-cache.es.8.sgml:1136 apt-get.es.8.sgml:1136 #-#-#-#-#\n"
"Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: <literal>Dir::State::Lists</literal> (Implica partial)."
+#. type: Plain text
+#: apt.ent:362
+#, fuzzy, no-wrap
+msgid ""
+"<!ENTITY file-trustedgpg \"\n"
+" <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n"
+" <listitem><para>Keyring of local trusted keys, new keys will be added here.\n"
+" Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+msgstr ""
+"#-#-#-#-# apt-cdrom.es.8.sgml:565 apt-cache.es.8.sgml:565 apt-get.es.8.sgml:565 #-#-#-#-#\n"
+"Directorio donde se almacena la información del estado de cada paquete fuente por cada sitio especificado &sources-list; Opción de configuración: <literal>Dir::State::Lists</literal>.\n"
+"#-#-#-#-# apt-cdrom.es.8.sgml:1130 apt-cache.es.8.sgml:1130 apt-get.es.8.sgml:1130 #-#-#-#-#\n"
+"Directorio donde se almacena información de estado por cada sitio especificado en &sources-list; Opción de Configuración: <literal>Dir::State::Lists</literal>.\n"
+"#-#-#-#-# apt-cdrom.es.8.sgml:565 apt-cache.es.8.sgml:565 apt-get.es.8.sgml:565 #-#-#-#-#\n"
+"Directorio donde se almacena la información del estado de cada paquete fuente por cada sitio especificado &sources-list; Opción de configuración: <literal>Dir::State::Lists</literal>.\n"
+"#-#-#-#-# apt-cdrom.es.8.sgml:1130 apt-cache.es.8.sgml:1130 apt-get.es.8.sgml:1130 #-#-#-#-#\n"
+"Directorio donde se almacena información de estado por cada sitio especificado en &sources-list; Opción de Configuración: <literal>Dir::State::Lists</literal>.\n"
+"#-#-#-#-# apt-cdrom.es.8.sgml:565 apt-cache.es.8.sgml:565 apt-get.es.8.sgml:565 #-#-#-#-#\n"
+"Directorio donde se almacena la información del estado de cada paquete fuente por cada sitio especificado &sources-list; Opción de configuración: <literal>Dir::State::Lists</literal>.\n"
+"#-#-#-#-# apt-cdrom.es.8.sgml:1130 apt-cache.es.8.sgml:1130 apt-get.es.8.sgml:1130 #-#-#-#-#\n"
+"Directorio donde se almacena información de estado por cada sitio especificado en &sources-list; Opción de Configuración: <literal>Dir::State::Lists</literal>."
+
+#. type: Plain text
+#: apt.ent:369
+#, fuzzy, no-wrap
+msgid ""
+" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
+" <listitem><para>File fragments for the trusted keys, additional keyrings can\n"
+" be stored here (by other packages or the administrator).\n"
+" Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+"\">\n"
+msgstr ""
+"#-#-#-#-# apt-cdrom.es.8.sgml:572 apt-cache.es.8.sgml:572 apt-get.es.8.sgml:572 #-#-#-#-#\n"
+"Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: <literal>Dir::State::Lists</literal> (lo que implica que no estarán completos).\n"
+"#-#-#-#-# apt-cdrom.es.8.sgml:1136 apt-cache.es.8.sgml:1136 apt-get.es.8.sgml:1136 #-#-#-#-#\n"
+"Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: <literal>Dir::State::Lists</literal> (Implica partial).\n"
+"#-#-#-#-# apt-cdrom.es.8.sgml:572 apt-cache.es.8.sgml:572 apt-get.es.8.sgml:572 #-#-#-#-#\n"
+"Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: <literal>Dir::State::Lists</literal> (lo que implica que no estarán completos).\n"
+"#-#-#-#-# apt-cdrom.es.8.sgml:1136 apt-cache.es.8.sgml:1136 apt-get.es.8.sgml:1136 #-#-#-#-#\n"
+"Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: <literal>Dir::State::Lists</literal> (Implica partial).\n"
+"#-#-#-#-# apt-cdrom.es.8.sgml:572 apt-cache.es.8.sgml:572 apt-get.es.8.sgml:572 #-#-#-#-#\n"
+"Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: <literal>Dir::State::Lists</literal> (lo que implica que no estarán completos).\n"
+"#-#-#-#-# apt-cdrom.es.8.sgml:1136 apt-cache.es.8.sgml:1136 apt-get.es.8.sgml:1136 #-#-#-#-#\n"
+"Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: <literal>Dir::State::Lists</literal> (Implica partial)."
+
+#. type: Plain text
+#: apt.ent:371
+msgid "<!ENTITY translation-title \"TRANSLATION\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:380
+#, no-wrap, fuzzy
+msgid ""
+"<!-- TRANSLATOR: This is a placeholder. You should write here who has constributed\n"
+" to the translation in the past, who is responsible now and maybe further information\n"
+" specially related to your translation. -->\n"
+"<!ENTITY translation-holder \"\n"
+" The english translation was done by John Doe <email>john@doe.org</email> in 2009,\n"
+" 2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together with the\n"
+" Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>.\n"
+"\">\n"
+msgstr ""
+"<!ENTITY translation-holder \"\n"
+" The spanish translation was written 2003 and 2004 by Ismael Fanlo (2003), Carlos Mestre (2003),\n"
+" Rudy Godoy <email>rudy@kernel-panik.org</email> (2003),\n"
+" Gustavo Saldumbide <email>gsal@adinet.com.uy</email> (2003),\n"
+" Javier Fernández-Sanguino <email>jfs@computer.org</email> (2003)\n"
+" and Rubén Porras Campo <email>nahoo@inicia.es</email> (2003, 2004)\n"
+" under the aegis of the debian spanish-l10n-team <email>debian-l10n-spanish@lists.debian.org</email>.\n"
+"\">\n"
+
+#. type: Plain text
+#: apt.ent:387
+#, no-wrap
+msgid ""
+"<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
+" in a shipped manpage will maybe appear english parts. -->\n"
+"<!ENTITY translation-english \"\n"
+" Note that this translated document may contain untranslated parts.\n"
+" This is done on purpose, to avoid losing content when the\n"
+" translation is lagging behind the original content.\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
@@ -903,7 +990,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: 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-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40
#: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33
#: sources.list.5.xml:33
#, fuzzy
@@ -1494,7 +1581,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89
-#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:484 apt.conf.5.xml:506
+#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524
#, fuzzy
msgid "options"
msgstr "Opciones"
@@ -1759,7 +1846,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:556 apt-get.8.xml:554
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554
#: apt-sortpkgs.1.xml:64
#, fuzzy
msgid "&apt-commonoptions;"
@@ -1769,8 +1856,8 @@ msgstr ""
" "
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122
-#: apt.conf.5.xml:1017 apt_preferences.5.xml:615
+#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122
+#: apt.conf.5.xml:1035 apt_preferences.5.xml:622
#, fuzzy
msgid "Files"
msgstr "Ficheros"
@@ -1782,9 +1869,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569
-#: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569
+#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629
#: sources.list.5.xml:233
#, fuzzy
msgid "See Also"
@@ -1831,7 +1918,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:576 apt-get.8.xml:575
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575
#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
#, fuzzy
msgid "Diagnostics"
@@ -1975,7 +2062,7 @@ msgstr ""
"option> una de las siguientes órdenes deben de estar presentes."
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:91
+#: apt-cdrom.8.xml:91 apt-key.8.xml:139
#, fuzzy
msgid "Options"
msgstr "Opciones"
@@ -2257,7 +2344,7 @@ msgid "Just show the contents of the configuration space."
msgstr "Sólo muestra el contenido del espacio de configuración."
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585
#: apt-sortpkgs.1.xml:70
#, fuzzy
msgid "&apt-conf;"
@@ -2821,7 +2908,7 @@ msgstr "Source-Symlinks"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:288
msgid ""
-"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
+"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
"source/Sources</filename>"
msgstr ""
@@ -2936,20 +3023,22 @@ msgid ""
"variables."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: 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>
+#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt-ftparchive.1.xml:354
#, no-wrap
msgid ""
"for i in Sections do \n"
" for j in Architectures do\n"
" Generate for DIST=scope SECTION=i ARCH=j\n"
+" "
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-ftparchive.1.xml:351
+msgid ""
+"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
+"command> performs an operation similar to: <placeholder type=\"programlisting"
+"\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
@@ -3270,12 +3359,32 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:547
#, fuzzy
-msgid "<option>APT::FTPArchive::LongDescription</option>"
+msgid "<option>APT::FTPArchive::AlwaysStat</option>"
msgstr "<option>--all-versions</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:549
msgid ""
+"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If "
+"packages are recompiled and/or republished with the same version again, this "
+"will lead to problems as the now outdated cached metadata like size and "
+"checksums will be used. With this option enabled this will no longer happen "
+"as it will be checked if the file was changed. Note that this option is set "
+"to \"<literal>false</literal>\" by default as it is not recommend to upload "
+"multiply versions/builds of a package with the same versionnumber, so in "
+"theory nobody will have these problems and therefore all these extra checks "
+"are useless."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:559
+#, fuzzy
+msgid "<option>APT::FTPArchive::LongDescription</option>"
+msgstr "<option>--all-versions</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:561
+msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
"only be set to <literal>\"false\"</literal> if the Archive generated with "
"&apt-ftparchive; also provides <filename>Translation</filename> files. Note "
@@ -3284,27 +3393,27 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462
+#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469
#: sources.list.5.xml:193
#, fuzzy
msgid "Examples"
msgstr "Ejemplos"
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:567
+#: apt-ftparchive.1.xml:579
#, no-wrap
msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:563
+#: apt-ftparchive.1.xml:575
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:577
+#: apt-ftparchive.1.xml:589
#, fuzzy
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
@@ -3386,7 +3495,7 @@ msgstr ""
"dselect(8), aptitude, synaptic, gnome-apt and wajig."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:135 apt-key.8.xml:123
+#: apt-get.8.xml:135 apt-key.8.xml:124
#, fuzzy
msgid "update"
msgstr "update"
@@ -3872,15 +3981,15 @@ msgstr "<option>--fix-broken</option>"
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
-"to deduce a likely solution. Any Package that are specified must completely "
-"correct the problem. The option is sometimes necessary when running APT for "
-"the first time; APT itself does not allow broken package dependencies to "
-"exist on a system. It is possible that a system's dependency structure can "
-"be so corrupt as to require manual intervention (which usually means using "
-"&dselect; or <command>dpkg --remove</command> to eliminate some of the "
-"offending packages). Use of this option together with <option>-m</option> "
-"may produce an error in some situations. Configuration Item: <literal>APT::"
-"Get::Fix-Broken</literal>."
+"to deduce a likely solution. If packages are specified, these have to "
+"completely correct the problem. The option is sometimes necessary when "
+"running APT for the first time; APT itself does not allow broken package "
+"dependencies to exist on a system. It is possible that a system's dependency "
+"structure can be so corrupt as to require manual intervention (which usually "
+"means using &dselect; or <command>dpkg --remove</command> to eliminate some "
+"of the offending packages). Use of this option together with <option>-m</"
+"option> may produce an error in some situations. Configuration Item: "
+"<literal>APT::Get::Fix-Broken</literal>."
msgstr ""
"Intenta arreglar un sistema con dependencias actualmente rotas. Esta opción "
"usada conjuntamente con install/remove, puede omitir cualquier paquete para "
@@ -4246,7 +4355,7 @@ msgstr "<option>--purge</option>"
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> "
+"<option>remove --purge</option> is equivalent to the <option>purge</option> "
"command. Configuration Item: <literal>APT::Get::Purge</literal>."
msgstr ""
"Borra los archivos de configuración de todos los paquetes que sean "
@@ -4540,14 +4649,25 @@ msgstr "utilidad APT para administración del CDROM"
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-key.8.xml:28
+#, fuzzy
msgid ""
-"<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> "
+"<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
+"replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
"<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></"
"arg>"
msgstr ""
+"<cmdsynopsis sepchar=\" \">\n"
+"<command>apt-cdrom</command>\n"
+"<arg rep=\"norepeat\" choice=\"opt\"><option>-hvrmfan</option></arg>\n"
+"<arg rep=\"norepeat\" choice=\"opt\"><option>-d=<replaceable>cdrom "
+"punto_de_montaje</replaceable></option></arg>\n"
+"<arg rep=\"norepeat\" choice=\"opt\"><option>-o=<replaceable>cadena de "
+"configuración</replaceable></option></arg>\n"
+"<arg rep=\"norepeat\" choice=\"opt\"><option>-c=<replaceable>fichero</"
+"replaceable></option></arg>"
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:36
+#: apt-key.8.xml:37
msgid ""
"<command>apt-key</command> is used to manage the list of keys used by apt to "
"authenticate packages. Packages which have been authenticated using these "
@@ -4555,18 +4675,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:42
+#: apt-key.8.xml:43
msgid "Commands"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:44
+#: apt-key.8.xml:45
#, fuzzy
msgid "add <replaceable>filename</replaceable>"
msgstr "add <replaceable>fichero(s)</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:48
+#: apt-key.8.xml:49
msgid ""
"Add a new key to the list of trusted keys. The key is read from "
"<replaceable>filename</replaceable>, or standard input if "
@@ -4574,123 +4694,141 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:56
+#: apt-key.8.xml:57
#, fuzzy
msgid "del <replaceable>keyid</replaceable>"
msgstr "add <replaceable>fichero(s)</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:60
+#: apt-key.8.xml:61
msgid "Remove a key from the list of trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:67
+#: apt-key.8.xml:68
#, fuzzy
msgid "export <replaceable>keyid</replaceable>"
msgstr "dotty <replaceable>paquete(s)</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:71
+#: apt-key.8.xml:72
#, fuzzy
msgid "Output the key <replaceable>keyid</replaceable> to standard output."
msgstr "dotty <replaceable>paquete(s)</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:78
+#: apt-key.8.xml:79
msgid "exportall"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:82
+#: apt-key.8.xml:83
msgid "Output all trusted keys to standard output."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:89
+#: apt-key.8.xml:90
msgid "list"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:93
+#: apt-key.8.xml:94
msgid "List trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:100
+#: apt-key.8.xml:101
msgid "finger"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:104
+#: apt-key.8.xml:105
msgid "List fingerprints of trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:111
+#: apt-key.8.xml:112
#, fuzzy
msgid "adv"
msgstr "add"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:115
+#: apt-key.8.xml:116
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:127
+#: apt-key.8.xml:128
msgid ""
"Update the local keyring with the keyring of Debian archive keys and removes "
"from the keyring the archive keys which are no longer valid."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><para>
#: apt-key.8.xml:140
+msgid ""
+"Note that options need to be defined before the commands described in the "
+"previous section."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml:142
#, fuzzy
-msgid "<filename>/etc/apt/trusted.gpg</filename>"
-msgstr "<filename>/etc/apt/apt.conf</filename>"
+msgid "--keyring <replaceable>filename</replaceable>"
+msgstr "add <replaceable>fichero(s)</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:141
-msgid "Keyring of local trusted keys, new keys will be added here."
+#: apt-key.8.xml:143
+msgid ""
+"With this option it is possible to specify a specific keyring file the "
+"command should operate on. The default is that a command is executed on the "
+"<filename>trusted.gpg</filename> file as well as on all parts in the "
+"<filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</"
+"filename> is the primary keyring which means that e.g. new keys are added to "
+"this one."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist>
+#: apt-key.8.xml:156
+msgid "&file-trustedgpg;"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:144
+#: apt-key.8.xml:158
#, fuzzy
msgid "<filename>/etc/apt/trustdb.gpg</filename>"
msgstr "<filename>/etc/apt/apt.conf</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:145
+#: apt-key.8.xml:159
msgid "Local trust database of archive keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:148
+#: apt-key.8.xml:162
msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:149
+#: apt-key.8.xml:163
msgid "Keyring of Debian archive trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:152
+#: apt-key.8.xml:166
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:153
+#: apt-key.8.xml:167
msgid "Keyring of Debian archive removed trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:164
+#: apt-key.8.xml:176
#, fuzzy
msgid "&apt-get;, &apt-secure;"
msgstr "&apt-conf;, &apt-get;, &sources-list;"
@@ -5168,7 +5306,7 @@ 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>18 September 2009</date>"
+"&apt-product; <date>16 January 2010</date>"
msgstr ""
#. type: Content of: <refentry><refnamediv><refname>
@@ -5190,32 +5328,59 @@ msgstr "Programa para la consulta de configuración de APT"
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:40
-#, fuzzy
msgid ""
"<filename>apt.conf</filename> is the main configuration file for the APT "
-"suite of tools, all tools make use of the configuration file and a common "
-"command line parser to provide a uniform environment. When an APT tool "
-"starts up it will read the configuration specified by the <envar>APT_CONFIG</"
-"envar> environment variable (if any) and then read the files in "
-"<literal>Dir::Etc::Parts</literal> then read the main configuration file "
-"specified by <literal>Dir::Etc::main</literal> then finally apply the "
-"command line options to override the configuration directives, possibly "
-"loading even more config files."
-msgstr ""
-"<filename>apt.conf</filename> es el fichero principal de configuración del "
-"conjunto de herramientas APT, todas las herramientas hacen uso del fichero "
-"de configuración y un analizador común de sintaxis de la línea de órdenes "
-"para proporcionar un entorno uniforme. Cuando se inicia una utilidad APT, "
-"este leerá la configuración especificada en la variable de entorno "
-"<envar>APT_CONFIG</envar> (si existe), luego leerá los ficheos en "
-"<literal>Dir::Etc::Parts</literal>, entonces leerá el fichero de "
-"configuración principal especificado por <literal>Dir::Etc::main</literal>, "
-"finalmente aplicará las opciones de la línea de órdenes para reescribir la "
-"directrices de la configuración, posiblemente cargando incluso más ficheros "
-"de configuración."
+"suite of tools, but by far not the only place changes to options can be "
+"made. All tools therefore share the configuration files and also use a "
+"common command line parser to provide a uniform environment."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><para>
+#: apt.conf.5.xml:45
+msgid ""
+"When an APT tool starts up it will read the configuration files in the "
+"following order:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:47
+msgid ""
+"the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
+"any)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:49
+msgid ""
+"all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
+"order which have no or \"<literal>conf</literal>\" as filename extension and "
+"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
+"characters - otherwise they will be silently ignored."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:54
+#, fuzzy
+msgid ""
+"the main configuration file specified by <literal>Dir::Etc::main</literal>"
+msgstr ""
+"Fichero de configuración de APT. Opción de Configuración: <literal>Dir::Etc::"
+"Main</literal>."
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:56
+msgid ""
+"the command line options are applied to override the configuration "
+"directives or to load even more configuration files."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.conf.5.xml:60
+msgid "Syntax"
+msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:50
+#: apt.conf.5.xml:61
#, fuzzy
msgid ""
"The configuration file is organized in a tree with options organized into "
@@ -5231,7 +5396,7 @@ msgstr ""
"Las opciones no son heredadas de sus grupos padres."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:56
+#: apt.conf.5.xml:67
msgid ""
"Syntactically the configuration language is modeled after what the ISC tools "
"such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@ -5247,7 +5412,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:70
+#: apt.conf.5.xml:81
#, fuzzy, no-wrap
msgid ""
"APT {\n"
@@ -5267,7 +5432,7 @@ msgstr ""
"};\n"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:78
+#: apt.conf.5.xml:89
#, fuzzy
msgid ""
"with newlines placed to make it more readable. Lists can be created by "
@@ -5281,7 +5446,7 @@ msgstr ""
"punto y coma. <informalexample>"
#. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:83
+#: apt.conf.5.xml:94
#, fuzzy, no-wrap
msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
msgstr ""
@@ -5290,7 +5455,7 @@ msgstr ""
"DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:86
+#: apt.conf.5.xml:97
#, fuzzy
msgid ""
"In general the sample configuration file in <filename>&docdir;examples/apt."
@@ -5301,14 +5466,14 @@ msgstr ""
"entender su aspecto."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:90
+#: apt.conf.5.xml:101
msgid ""
"The names of the configuration items are not case-sensitive. So in the "
"previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:93
+#: apt.conf.5.xml:104
msgid ""
"Names for the configuration items are optional if a list is defined as it "
"can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. "
@@ -5318,7 +5483,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:98
+#: apt.conf.5.xml:109
#, fuzzy
msgid ""
"Two specials are allowed, <literal>#include</literal> (which is deprecated "
@@ -5336,7 +5501,7 @@ msgstr ""
"para suprimir la lista de nombres."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:106
+#: apt.conf.5.xml:117
msgid ""
"The #clear command is the only way to delete a list or a complete scope. "
"Reopening a scope or the ::-style described below will <emphasis>not</"
@@ -5346,7 +5511,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:111
+#: apt.conf.5.xml:122
#, fuzzy
msgid ""
"All of the APT tools take a -o option which allows an arbitrary "
@@ -5364,7 +5529,7 @@ msgstr ""
"lista."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:118
+#: apt.conf.5.xml:129
msgid ""
"Note that you can use :: only for appending one item per line to a list and "
"that you should not use it in combination with the scope syntax. (The scope "
@@ -5381,13 +5546,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:130
+#: apt.conf.5.xml:141
#, fuzzy
msgid "The APT Group"
msgstr "El grupo APT"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:131
+#: apt.conf.5.xml:142
#, fuzzy
msgid ""
"This group of options controls general APT behavior as well as holding the "
@@ -5397,13 +5562,13 @@ msgstr ""
"mantenimiento de las opciones para todas las utilidades."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:135
+#: apt.conf.5.xml:146
#, fuzzy
msgid "Architecture"
msgstr "Arquitectura"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:136
+#: apt.conf.5.xml:147
#, fuzzy
msgid ""
"System Architecture; sets the architecture to use when fetching files and "
@@ -5415,12 +5580,12 @@ msgstr ""
"la arquitectura para la que ha sido compilado apt."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:141
+#: apt.conf.5.xml:152
msgid "Default-Release"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:142
+#: apt.conf.5.xml:153
msgid ""
"Default release to install packages from if more than one version available. "
"Contains release name, codename or release version. Examples: 'stable', "
@@ -5429,13 +5594,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:146
+#: apt.conf.5.xml:157
#, fuzzy
msgid "Ignore-Hold"
msgstr "Ignore-Hold"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:147
+#: apt.conf.5.xml:158
#, fuzzy
msgid ""
"Ignore Held packages; This global option causes the problem resolver to "
@@ -5445,13 +5610,13 @@ msgstr ""
"problemas ignore paquetes retenidos cuando tome decisiones."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:151
+#: apt.conf.5.xml:162
#, fuzzy
msgid "Clean-Installed"
msgstr "Clean-Installed"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:152
+#: apt.conf.5.xml:163
#, fuzzy
msgid ""
"Defaults to on. When turned on the autoclean feature will remove any "
@@ -5466,13 +5631,13 @@ msgstr ""
"para reinstalarlos."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:158
+#: apt.conf.5.xml:169
#, fuzzy
msgid "Immediate-Configure"
msgstr "Immediate-Configure"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:159
+#: apt.conf.5.xml:170
msgid ""
"Defaults to on which will cause APT to install essential and important "
"packages as fast as possible in the install/upgrade operation. This is done "
@@ -5488,13 +5653,13 @@ msgid ""
"dependencies which can generate a problem if the dependencies e.g. form a "
"circle as a dependency with the immediate flag is comparable with a Pre-"
"Dependency. So in theory it is possible that APT encounters a situation in "
-"which it is unable to perform immediate configuration, error out and refers "
+"which it is unable to perform immediate configuration, errors out and refers "
"to this option so the user can deactivate the immediate configuration "
-"temporary to be able to perform an install/upgrade again. Note the use of "
+"temporarily to be able to perform an install/upgrade again. Note the use of "
"the word \"theory\" here as this problem was only encountered by now in real "
-"world a few times in non-stable distribution versions and caused by wrong "
-"dependencies of the package in question or by a system in an already broken "
-"state, so you should not blindly disable this option as the mentioned "
+"world a few times in non-stable distribution versions and was caused by "
+"wrong dependencies of the package in question or by a system in an already "
+"broken state, so you should not blindly disable this option as the mentioned "
"scenario above is not the only problem immediate configuration can help to "
"prevent in the first place. Before a big operation like <literal>dist-"
"upgrade</literal> is run with this option disabled it should be tried to "
@@ -5505,13 +5670,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:181
+#: apt.conf.5.xml:192
#, fuzzy
msgid "Force-LoopBreak"
msgstr "Force-LoopBreak"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:182
+#: apt.conf.5.xml:193
#, fuzzy
msgid ""
"Never Enable this option unless you -really- know what you are doing. It "
@@ -5529,13 +5694,13 @@ msgstr ""
"bash o cualquier otro del que dependan estos paquetes."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:190
+#: apt.conf.5.xml:201
#, fuzzy
msgid "Cache-Limit"
msgstr "Cache-Limit"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:191
+#: apt.conf.5.xml:202
#, fuzzy
msgid ""
"APT uses a fixed size memory mapped cache file to store the 'available' "
@@ -5545,13 +5710,13 @@ msgstr ""
"la información disponible. Esto fija el tamaño de esa caché."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:195
+#: apt.conf.5.xml:206
#, fuzzy
msgid "Build-Essential"
msgstr "Build-Essential"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:196
+#: apt.conf.5.xml:207
#, fuzzy
msgid "Defines which package(s) are considered essential build dependencies."
msgstr ""
@@ -5559,13 +5724,13 @@ msgstr ""
"esenciales."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:210
#, fuzzy
msgid "Get"
msgstr "Get"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:200
+#: apt.conf.5.xml:211
#, fuzzy
msgid ""
"The Get subsection controls the &apt-get; tool, please see its documentation "
@@ -5575,13 +5740,13 @@ msgstr ""
"documentación para más información sobre esta opción."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:204
+#: apt.conf.5.xml:215
#, fuzzy
msgid "Cache"
msgstr "check"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:205
+#: apt.conf.5.xml:216
#, fuzzy
msgid ""
"The Cache subsection controls the &apt-cache; tool, please see its "
@@ -5591,13 +5756,13 @@ msgstr ""
"documentación para más información sobre esta opción."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:209
+#: apt.conf.5.xml:220
#, fuzzy
msgid "CDROM"
msgstr "CDROM"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:210
+#: apt.conf.5.xml:221
#, fuzzy
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool, please see its "
@@ -5607,31 +5772,42 @@ msgstr ""
"documentación para más información sobre esta opción."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:216
+#: apt.conf.5.xml:227
#, fuzzy
msgid "The Acquire Group"
msgstr "El grupo Acquire"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:232
msgid "PDiffs"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:222
+#: apt.conf.5.xml:233
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for Packages or "
"Sources files instead of downloading whole ones. True by default."
msgstr ""
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:236
+msgid ""
+"Two sub-options to limit the use of PDiffs are also available: With "
+"<literal>FileLimit</literal> can be specified how many PDiff files are "
+"downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
+"other hand is the maximum precentage of the size of all patches compared to "
+"the size of the targeted file. If one of these limits is exceeded the "
+"complete file is downloaded instead of the patches."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:227
+#: apt.conf.5.xml:245
#, fuzzy
msgid "Queue-Mode"
msgstr "Queue-Mode"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:228
+#: apt.conf.5.xml:246
#, fuzzy
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
@@ -5647,13 +5823,13 @@ msgstr ""
"será abierta una conexión por cada tipo de URI."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:235
+#: apt.conf.5.xml:253
#, fuzzy
msgid "Retries"
msgstr "Retries"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:254
#, fuzzy
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
@@ -5663,13 +5839,13 @@ msgstr ""
"los ficheros fallidos el número de veces dado."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:240
+#: apt.conf.5.xml:258
#, fuzzy
msgid "Source-Symlinks"
msgstr "Source-Symlinks"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:241
+#: apt.conf.5.xml:259
#, fuzzy
msgid ""
"Use symlinks for source archives. If set to true then source archives will "
@@ -5679,13 +5855,13 @@ msgstr ""
"fuente se enlazarán a ser posible, en vez de copiarse. Por omisión es true."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:245 sources.list.5.xml:139
+#: apt.conf.5.xml:263 sources.list.5.xml:139
#, fuzzy
msgid "http"
msgstr "http"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:246
+#: apt.conf.5.xml:264
#, fuzzy
msgid ""
"HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
@@ -5703,7 +5879,7 @@ msgstr ""
"de entorno <envar>http_proxy</envar> modifica todas las preferencias."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:254
+#: apt.conf.5.xml:272
#, fuzzy
msgid ""
"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
@@ -5728,7 +5904,7 @@ msgstr ""
"Nota: Squid 2.0.2 no soporta ninguna de estas opciones."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:264 apt.conf.5.xml:328
+#: apt.conf.5.xml:282 apt.conf.5.xml:346
#, fuzzy
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
@@ -5740,7 +5916,7 @@ msgstr ""
"realizar la conexión y para recibir datos."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:267
+#: apt.conf.5.xml:285
#, fuzzy
msgid ""
"One setting is provided to control the pipeline depth in cases where the "
@@ -5760,7 +5936,7 @@ msgstr ""
"necesiten esto violan el RFC 2068."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:275
+#: apt.conf.5.xml:293
msgid ""
"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
"literal> which accepts integer values in kilobyte. The default value is 0 "
@@ -5770,7 +5946,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:280
+#: apt.conf.5.xml:298
msgid ""
"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
"User-Agent for the http download method as some proxies allow access for "
@@ -5778,13 +5954,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:286
+#: apt.conf.5.xml:304
#, fuzzy
msgid "https"
msgstr "http"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:287
+#: apt.conf.5.xml:305
msgid ""
"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
"options are the same as for <literal>http</literal> method and will also "
@@ -5794,7 +5970,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:311
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -5815,13 +5991,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:311 sources.list.5.xml:150
+#: apt.conf.5.xml:329 sources.list.5.xml:150
#, fuzzy
msgid "ftp"
msgstr "ftp"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:312
+#: apt.conf.5.xml:330
#, fuzzy
msgid ""
"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
@@ -5853,7 +6029,7 @@ msgstr ""
"de la URI correspondiente."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#: apt.conf.5.xml:349
#, fuzzy
msgid ""
"Several settings are provided to control passive mode. Generally it is safe "
@@ -5870,7 +6046,7 @@ msgstr ""
"fichero de configuración de muestra para ver ejemplos)."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:338
+#: apt.conf.5.xml:356
#, fuzzy
msgid ""
"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
@@ -5885,7 +6061,7 @@ msgstr ""
"eficiencia."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:343
+#: apt.conf.5.xml:361
#, fuzzy
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
@@ -5901,19 +6077,19 @@ msgstr ""
"la mayoría de los servidores FTP no soportan RFC2428."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:350 sources.list.5.xml:132
+#: apt.conf.5.xml:368 sources.list.5.xml:132
#, fuzzy
msgid "cdrom"
msgstr "apt-cdrom"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:356
+#: apt.conf.5.xml:374
#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:369
#, fuzzy
msgid ""
"CDROM URIs; the only setting for CDROM URIs is the mount point, "
@@ -5933,12 +6109,12 @@ msgstr ""
"antiguas). Respecto a la sintaxis se pone"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:361
+#: apt.conf.5.xml:379
msgid "gpgv"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:362
+#: apt.conf.5.xml:380
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
@@ -5946,18 +6122,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:385
msgid "CompressionTypes"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:373
+#: apt.conf.5.xml:391
#, no-wrap
msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:368
+#: apt.conf.5.xml:386
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -5969,19 +6145,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:378
+#: apt.conf.5.xml:396
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:381
+#: apt.conf.5.xml:399
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:374
+#: apt.conf.5.xml:392
msgid ""
"Also the <literal>Order</literal> subgroup can be used to define in which "
"order the acquire system will try to download the compressed files. The "
@@ -5998,13 +6174,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:385
+#: apt.conf.5.xml:403
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:383
+#: apt.conf.5.xml:401
msgid ""
"Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
"replaceable></literal> will be checked: If this setting exists the method "
@@ -6019,7 +6195,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:408
msgid ""
"While it is possible to add an empty compression type to the order list, but "
"APT in its current version doesn't understand it correctly and will display "
@@ -6029,36 +6205,36 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:396
+#: apt.conf.5.xml:414
msgid "Languages"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:397
+#: apt.conf.5.xml:415
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the Description-"
-"Translations. APT will try to display the first available Description for "
-"the Language which is listed at first. Languages can be defined with their "
-"short or long Languagecodes. Note that not all archives provide "
+"Translations. APT will try to display the first available Description in the "
+"Language which is listed at first. Languages can be defined with their short "
+"or long Languagecodes. Note that not all archives provide "
"<filename>Translation</filename> files for every Language - especially the "
"long Languagecodes are rare, so please inform you which ones are available "
"before you set here impossible values."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:413
+#: apt.conf.5.xml:431
#, no-wrap
msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:421
msgid ""
"The default list includes \"environment\" and \"en\". "
"\"<literal>environment</literal>\" has a special meaning here: It will be "
"replaced at runtime with the languagecodes extracted from the "
-"<literal>LC_MESSAGES</literal> enviroment variable. It will also ensure "
+"<literal>LC_MESSAGES</literal> environment variable. It will also ensure "
"that these codes are not included twice in the list. If "
"<literal>LC_MESSAGES</literal> is set to \"C\" only the "
"<filename>Translation-en</filename> file (if available) will be used. To "
@@ -6067,7 +6243,7 @@ msgid ""
"meaning code which will stop the search for a fitting <filename>Translation</"
"filename> file. This can be used by the system administrator to let APT "
"know that it should download also this files without actually use them if "
-"not the environment specifies this languages. So the following example "
+"the environment doesn't specify this languages. So the following example "
"configuration will result in the order \"en, de\" in an english and in \"de, "
"en\" in a german localization. Note that \"fr\" is downloaded, but not used "
"if APT is not used in a french localization, in such an environment the "
@@ -6076,7 +6252,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:217
+#: apt.conf.5.xml:228
#, fuzzy
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
@@ -6086,13 +6262,13 @@ msgstr ""
"paquetes y los manejadores de URI."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:438
#, fuzzy
msgid "Directories"
msgstr "Directorios"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:422
+#: apt.conf.5.xml:440
#, fuzzy
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
@@ -6113,7 +6289,7 @@ msgstr ""
"filename> o <filename>./</filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:429
+#: apt.conf.5.xml:447
#, fuzzy
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
@@ -6135,7 +6311,7 @@ msgstr ""
"literal> el directorio predeterminado está en <literal>Dir::Cache</literal>"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:438
+#: apt.conf.5.xml:456
#, fuzzy
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
@@ -6152,7 +6328,7 @@ msgstr ""
"envar>)."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:444
+#: apt.conf.5.xml:462
#, fuzzy
msgid ""
"The <literal>Dir::Parts</literal> setting reads in all the config fragments "
@@ -6164,7 +6340,7 @@ msgstr ""
"esto se carga el fichero principal de configuración."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:448
+#: apt.conf.5.xml:466
#, fuzzy
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
@@ -6182,7 +6358,7 @@ msgstr ""
"respectivos programas."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:456
+#: apt.conf.5.xml:474
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -6195,13 +6371,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:469
+#: apt.conf.5.xml:487
#, fuzzy
msgid "APT in DSelect"
msgstr "APT con DSelect"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:471
+#: apt.conf.5.xml:489
#, fuzzy
msgid ""
"When APT is used as a &dselect; method several configuration directives "
@@ -6213,13 +6389,13 @@ msgstr ""
"la sección <literal>DSelect</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:475
+#: apt.conf.5.xml:493
#, fuzzy
msgid "Clean"
msgstr "clean"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:476
+#: apt.conf.5.xml:494
#, fuzzy
msgid ""
"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
@@ -6237,7 +6413,7 @@ msgstr ""
"descargar los paquetes nuevos."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:485
+#: apt.conf.5.xml:503
#, fuzzy
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
@@ -6247,13 +6423,13 @@ msgstr ""
"ordenes cuando se ejecuta en la fase de instalación."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:489
+#: apt.conf.5.xml:507
#, fuzzy
msgid "Updateoptions"
msgstr "Opciones"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:508
#, fuzzy
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
@@ -6263,13 +6439,13 @@ msgstr ""
"ordenes cuando se ejecuta en la fase de actualización."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:494
+#: apt.conf.5.xml:512
#, fuzzy
msgid "PromptAfterUpdate"
msgstr "PromptAfterUpdate"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:495
+#: apt.conf.5.xml:513
#, fuzzy
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
@@ -6279,13 +6455,13 @@ msgstr ""
"continuar. Por omisión sólo pregunta en caso de error."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:501
+#: apt.conf.5.xml:519
#, fuzzy
msgid "How APT calls dpkg"
msgstr "Como APT llama a dpkg"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:520
#, fuzzy
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
@@ -6295,7 +6471,7 @@ msgstr ""
"encuentran en la sección <literal>DPkg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:507
+#: apt.conf.5.xml:525
#, fuzzy
msgid ""
"This is a list of options to pass to dpkg. The options must be specified "
@@ -6307,19 +6483,19 @@ msgstr ""
"como un sólo argumento."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:530
#, fuzzy
msgid "Pre-Invoke"
msgstr "Pre-Invoke"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:530
#, fuzzy
msgid "Post-Invoke"
msgstr "Post-Invoke"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:513
+#: apt.conf.5.xml:531
#, fuzzy
msgid ""
"This is a list of shell commands to run before/after invoking &dpkg;. Like "
@@ -6333,13 +6509,13 @@ msgstr ""
"si alguna falla APT abortará."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:519
+#: apt.conf.5.xml:537
#, fuzzy
msgid "Pre-Install-Pkgs"
msgstr "Pre-Install-Pkgs"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:520
+#: apt.conf.5.xml:538
#, fuzzy
msgid ""
"This is a list of shell commands to run before invoking dpkg. Like "
@@ -6355,7 +6531,7 @@ msgstr ""
"todos los .deb que va ha instalar por la entrada estándar, uno por línea."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:526
+#: apt.conf.5.xml:544
#, fuzzy
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
@@ -6371,13 +6547,13 @@ msgstr ""
"dada a <literal>Pre-Install-Pkgs</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:533
+#: apt.conf.5.xml:551
#, fuzzy
msgid "Run-Directory"
msgstr "Run-Directory"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:534
+#: apt.conf.5.xml:552
#, fuzzy
msgid ""
"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
@@ -6387,13 +6563,13 @@ msgstr ""
"omisión es <filename>/</filename>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:556
#, fuzzy
msgid "Build-options"
msgstr "Opciones"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:557
#, fuzzy
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages, the "
@@ -6404,12 +6580,12 @@ msgstr ""
"binarios."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:544
+#: apt.conf.5.xml:562
msgid "dpkg trigger usage (and related options)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:545
+#: apt.conf.5.xml:563
msgid ""
"APT can call dpkg in a way so it can make aggressive use of triggers over "
"multiply calls of dpkg. Without further options dpkg will use triggers only "
@@ -6424,7 +6600,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:578
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -6434,7 +6610,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:554
+#: apt.conf.5.xml:572
msgid ""
"Note that it is not guaranteed that APT will support these options or that "
"these options will not cause (big) trouble in the future. If you have "
@@ -6448,12 +6624,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:584
msgid "DPkg::NoTriggers"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:567
+#: apt.conf.5.xml:585
msgid ""
"Add the no triggers flag to all dpkg calls (except the ConfigurePending "
"call). See &dpkg; if you are interested in what this actually means. In "
@@ -6465,12 +6641,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:574
+#: apt.conf.5.xml:592
msgid "PackageManager::Configure"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:575
+#: apt.conf.5.xml:593
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
@@ -6486,12 +6662,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:603
msgid "DPkg::ConfigurePending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:586
+#: apt.conf.5.xml:604
msgid ""
"If this option is set apt will call <command>dpkg --configure --pending</"
"command> to let dpkg handle all required configurations and triggers. This "
@@ -6502,12 +6678,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:592
+#: apt.conf.5.xml:610
msgid "DPkg::TriggersPending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:593
+#: apt.conf.5.xml:611
msgid ""
"Useful for <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -6517,12 +6693,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:616
msgid "PackageManager::UnpackAll"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:599
+#: apt.conf.5.xml:617
msgid ""
"As the configuration can be deferred to be done at the end by dpkg it can be "
"tried to order the unpack series only by critical needs, e.g. by Pre-"
@@ -6534,12 +6710,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:606
+#: apt.conf.5.xml:624
msgid "OrderList::Score::Immediate"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:632
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -6551,7 +6727,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:625
msgid ""
"Essential packages (and there dependencies) should be configured immediately "
"after unpacking. It will be a good idea to do this quite early in the "
@@ -6565,12 +6741,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:627
+#: apt.conf.5.xml:645
msgid "Periodic and Archives options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:628
+#: apt.conf.5.xml:646
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -6579,13 +6755,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:636
+#: apt.conf.5.xml:654
#, fuzzy
msgid "Debug options"
msgstr "Opciones"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:638
+#: apt.conf.5.xml:656
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -6596,7 +6772,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:667
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -6604,7 +6780,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:657
+#: apt.conf.5.xml:675
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -6612,7 +6788,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:666
+#: apt.conf.5.xml:684
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -6622,120 +6798,120 @@ msgstr ""
#. motivating example, except I haven't a clue why you'd want
#. to do this.
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:674
+#: apt.conf.5.xml:692
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CDROM IDs."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:702
msgid "A full list of debugging options to apt follows."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:689
+#: apt.conf.5.xml:707
#, fuzzy
msgid "<literal>Debug::Acquire::cdrom</literal>"
msgstr "La línea <literal>Archive:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:711
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:700
+#: apt.conf.5.xml:718
#, fuzzy
msgid "<literal>Debug::Acquire::ftp</literal>"
msgstr "La línea <literal>Archive:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:704
+#: apt.conf.5.xml:722
msgid "Print information related to downloading packages using FTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:729
#, fuzzy
msgid "<literal>Debug::Acquire::http</literal>"
msgstr "La línea <literal>Archive:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:733
msgid "Print information related to downloading packages using HTTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:722
+#: apt.conf.5.xml:740
#, fuzzy
msgid "<literal>Debug::Acquire::https</literal>"
msgstr "La línea <literal>Archive:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:744
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:751
#, fuzzy
msgid "<literal>Debug::Acquire::gpgv</literal>"
msgstr "La línea <literal>Archive:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:755
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:744
+#: apt.conf.5.xml:762
#, fuzzy
msgid "<literal>Debug::aptcdrom</literal>"
msgstr "La línea <literal>Version:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:748
+#: apt.conf.5.xml:766
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:755
+#: apt.conf.5.xml:773
#, fuzzy
msgid "<literal>Debug::BuildDeps</literal>"
msgstr "La línea <literal>Label:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:776
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:783
#, fuzzy
msgid "<literal>Debug::Hashes</literal>"
msgstr "La línea <literal>Label:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:768
+#: apt.conf.5.xml:786
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:775
+#: apt.conf.5.xml:793
#, fuzzy
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr "La línea <literal>Label:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:778
+#: apt.conf.5.xml:796
msgid ""
"Do not include information from <literal>statfs</literal>, namely the number "
"of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -6743,99 +6919,99 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:786
+#: apt.conf.5.xml:804
#, fuzzy
msgid "<literal>Debug::NoLocking</literal>"
msgstr "La línea <literal>Origin:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:807
msgid ""
"Disable all file locking. For instance, this will allow two instances of "
"<quote><literal>apt-get update</literal></quote> to run at the same time."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:815
#, fuzzy
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr "La línea <literal>Archive:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:819
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:808
+#: apt.conf.5.xml:826
#, fuzzy
msgid "<literal>Debug::pkgAcquire::Auth</literal>"
msgstr "La línea <literal>Archive:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:811
+#: apt.conf.5.xml:829
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:818
+#: apt.conf.5.xml:836
#, fuzzy
msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
msgstr "La línea <literal>Archive:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:821
+#: apt.conf.5.xml:839
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:829
+#: apt.conf.5.xml:847
#, fuzzy
msgid "<literal>Debug::pkgAcquire::RRed</literal>"
msgstr "La línea <literal>Archive:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:833
+#: apt.conf.5.xml:851
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:840
+#: apt.conf.5.xml:858
#, fuzzy
msgid "<literal>Debug::pkgAcquire::Worker</literal>"
msgstr "La línea <literal>Archive:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:844
+#: apt.conf.5.xml:862
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:851
+#: apt.conf.5.xml:869
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:873
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:862
+#: apt.conf.5.xml:880
msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:883
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -6845,12 +7021,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:876
+#: apt.conf.5.xml:894
msgid "<literal>Debug::pkgDepCache::Marker</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:897
msgid ""
"Generate debug messages describing which package is marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -6867,96 +7043,96 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:898
+#: apt.conf.5.xml:916
#, fuzzy
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr "La línea <literal>Version:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:901
+#: apt.conf.5.xml:919
msgid "Dump the default configuration to standard error on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:908
+#: apt.conf.5.xml:926
#, fuzzy
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr "La línea <literal>Package:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:911
+#: apt.conf.5.xml:929
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:919
+#: apt.conf.5.xml:937
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:922
+#: apt.conf.5.xml:940
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:947
#, fuzzy
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr "La línea <literal>Origin:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:933
+#: apt.conf.5.xml:951
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:941
+#: apt.conf.5.xml:959
#, fuzzy
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr "La línea <literal>Package:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:945
+#: apt.conf.5.xml:963
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:952
+#: apt.conf.5.xml:970
#, fuzzy
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr "La línea <literal>Label:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:974
msgid "Output the priority of each package list on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:962
+#: apt.conf.5.xml:980
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:966
+#: apt.conf.5.xml:984
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:974
+#: apt.conf.5.xml:992
msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:977
+#: apt.conf.5.xml:995
msgid ""
"Display a list of all installed packages with their calculated score used by "
"the pkgProblemResolver. The description of the package is the same as "
@@ -6964,20 +7140,20 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:985
+#: apt.conf.5.xml:1003
#, fuzzy
msgid "<literal>Debug::sourceList</literal>"
msgstr "La línea <literal>Version:</literal> "
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:989
+#: apt.conf.5.xml:1007
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1012
+#: apt.conf.5.xml:1030
#, fuzzy
msgid ""
"&configureindex; is a configuration file showing example values for all "
@@ -6987,14 +7163,14 @@ msgstr ""
"los valores predeterminados para todas las opciones posibles."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1019
+#: apt.conf.5.xml:1037
#, fuzzy
msgid "&file-aptconf;"
msgstr "apt-cdrom"
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:1042
#, fuzzy
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache; &apt-conf;"
@@ -7066,14 +7242,25 @@ msgstr ""
"listado primero en el fichero &sources-list;. El fichero de preferencias de "
"APT no modifica la elección del ejemplar, sólo la elección de la versión."
-#. type: Content of: <refentry><refsect1><refsect2><title>
+#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:56
+msgid ""
+"Note that the files in the <filename>/etc/apt/preferences.d</filename> "
+"directory are parsed in alphanumeric ascending order and need to obey the "
+"following naming convention: The files have no or \"<literal>pref</literal>"
+"\" as filename extension and which only contain alphanumeric, hyphen (-), "
+"underscore (_) and period (.) characters - otherwise they will be silently "
+"ignored."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt_preferences.5.xml:63
#, fuzzy
msgid "APT's Default Priority Assignments"
msgstr "¿Cómo asigna APT las prioridades?"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:71
+#: apt_preferences.5.xml:78
#, fuzzy, no-wrap
msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
msgstr ""
@@ -7081,7 +7268,7 @@ msgstr ""
"<command>apt-get install -t testing <replaceable>paquete</replaceable></command>\n"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:74
+#: apt_preferences.5.xml:81
#, fuzzy, no-wrap
msgid "APT::Default-Release \"stable\";\n"
msgstr ""
@@ -7089,7 +7276,7 @@ msgstr ""
"APT::Default-Release \"stable\";\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:58
+#: apt_preferences.5.xml:65
#, fuzzy
msgid ""
"If there is no preferences file or if there is no entry in the file that "
@@ -7114,25 +7301,25 @@ msgstr ""
"(<filename>/etc/apt/apt.conf</filename>). Por ejemplo,"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:83
+#: apt_preferences.5.xml:90
#, fuzzy
msgid "priority 100"
msgstr "prioridad 100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:84
+#: apt_preferences.5.xml:91
#, fuzzy
msgid "to the version that is already installed (if any)."
msgstr "a la versión instalada (si existe)."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:88
+#: apt_preferences.5.xml:95
#, fuzzy
msgid "priority 500"
msgstr "prioridad 500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:89
+#: apt_preferences.5.xml:96
#, fuzzy
msgid ""
"to the versions that are not installed and do not belong to the target "
@@ -7141,13 +7328,13 @@ msgstr ""
"a la versión que ni está instalada ni pertenece a la distribución objetivo."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:93
+#: apt_preferences.5.xml:100
#, fuzzy
msgid "priority 990"
msgstr "prioridad 990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:94
+#: apt_preferences.5.xml:101
#, fuzzy
msgid ""
"to the versions that are not installed and belong to the target release."
@@ -7156,7 +7343,7 @@ msgstr ""
"distribución objetivo."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:78
+#: apt_preferences.5.xml:85
#, fuzzy
msgid ""
"If the target release has been specified then APT uses the following "
@@ -7168,7 +7355,7 @@ msgstr ""
"Asigna:"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:99
+#: apt_preferences.5.xml:106
#, fuzzy
msgid ""
"If the target release has not been specified then APT simply assigns "
@@ -7179,7 +7366,7 @@ msgstr ""
"todas las versiones de los paquetes instalados y 500 al resto."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml:110
#, fuzzy
msgid ""
"APT then applies the following rules, listed in order of precedence, to "
@@ -7189,7 +7376,7 @@ msgstr ""
"determinar qué versión del paquete debe instalar."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:106
+#: apt_preferences.5.xml:113
#, fuzzy
msgid ""
"Never downgrade unless the priority of an available version exceeds 1000. "
@@ -7206,13 +7393,13 @@ msgstr ""
"ser peligroso)."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:112
+#: apt_preferences.5.xml:119
#, fuzzy
msgid "Install the highest priority version."
msgstr "Instalar la versión de mayor prioridad."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:113
+#: apt_preferences.5.xml:120
#, fuzzy
msgid ""
"If two or more versions have the same priority, install the most recent one "
@@ -7222,7 +7409,7 @@ msgstr ""
"(esto es, la que tiene un número de versión mayor)."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:116
+#: apt_preferences.5.xml:123
#, fuzzy
msgid ""
"If two or more versions have the same priority and version number but either "
@@ -7234,7 +7421,7 @@ msgstr ""
"<literal>--reinstall</literal> se instala la que no está instalada."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:122
+#: apt_preferences.5.xml:129
#, fuzzy
msgid ""
"In a typical situation, the installed version of a package (priority 100) "
@@ -7250,7 +7437,7 @@ msgstr ""
"get upgrade</command>."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml:136
#, fuzzy
msgid ""
"More rarely, the installed version of a package is <emphasis>more</emphasis> "
@@ -7265,7 +7452,7 @@ msgstr ""
"get upgrade</command>."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:141
#, fuzzy
msgid ""
"Sometimes the installed version of a package is more recent than the version "
@@ -7285,13 +7472,13 @@ msgstr ""
"mayor que la versión instalada."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:143
+#: apt_preferences.5.xml:150
#, fuzzy
msgid "The Effect of APT Preferences"
msgstr "El efecto de las preferencias sobre APT"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:145
+#: apt_preferences.5.xml:152
#, fuzzy
msgid ""
"The APT preferences file allows the system administrator to control the "
@@ -7305,7 +7492,7 @@ msgstr ""
"registros pueden tener una o dos formas: una específica y otra general."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:151
+#: apt_preferences.5.xml:158
#, fuzzy
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
@@ -7321,7 +7508,7 @@ msgstr ""
"\"<literal>5.8</literal>\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:158
+#: apt_preferences.5.xml:165
#, fuzzy, no-wrap
msgid ""
"Package: perl\n"
@@ -7334,7 +7521,7 @@ msgstr ""
"Pin-Priority: 1001\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:164
+#: apt_preferences.5.xml:171
#, fuzzy
msgid ""
"The general form assigns a priority to all of the package versions in a "
@@ -7350,7 +7537,7 @@ msgstr ""
"nombre de dominio."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:170
+#: apt_preferences.5.xml:177
#, fuzzy
msgid ""
"This general-form entry in the APT preferences file applies only to groups "
@@ -7362,7 +7549,7 @@ msgstr ""
"prioridad alta a todas las versiones disponibles desde un sitio local."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:175
+#: apt_preferences.5.xml:182
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -7375,7 +7562,7 @@ msgstr ""
"Pin-Priority: 999\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:180
+#: apt_preferences.5.xml:187
#, fuzzy
msgid ""
"A note of caution: the keyword used here is \"<literal>origin</literal>\". "
@@ -7392,7 +7579,7 @@ msgstr ""
"\"Debian\" o \"Ximian\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:186
+#: apt_preferences.5.xml:193
#, fuzzy
msgid ""
"The following record assigns a low priority to all package versions "
@@ -7404,7 +7591,7 @@ msgstr ""
"Archivo \"<literal>unstable</literal>\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:190
+#: apt_preferences.5.xml:197
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -7417,7 +7604,7 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:195
+#: apt_preferences.5.xml:202
#, fuzzy
msgid ""
"The following record assigns a high priority to all package versions "
@@ -7429,7 +7616,7 @@ msgstr ""
"Archivo \"<literal>unstable</literal>\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:199
+#: apt_preferences.5.xml:206
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -7442,7 +7629,7 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:204
+#: apt_preferences.5.xml:211
#, fuzzy
msgid ""
"The following record assigns a high priority to all package versions "
@@ -7455,7 +7642,7 @@ msgstr ""
"literal>\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:209
+#: apt_preferences.5.xml:216
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -7468,19 +7655,19 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:220
+#: apt_preferences.5.xml:227
#, fuzzy
msgid "How APT Interprets Priorities"
msgstr "¿Cómo interpreta APT las prioridades?"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:228
+#: apt_preferences.5.xml:235
#, fuzzy
msgid "P &gt; 1000"
msgstr "P &gt; 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:229
+#: apt_preferences.5.xml:236
#, fuzzy
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
@@ -7490,13 +7677,13 @@ msgstr ""
"el sistema."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:233
+#: apt_preferences.5.xml:240
#, fuzzy
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:234
+#: apt_preferences.5.xml:241
#, fuzzy
msgid ""
"causes a version to be installed even if it does not come from the target "
@@ -7506,13 +7693,13 @@ msgstr ""
"que la versión instalada sea más reciente."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:239
+#: apt_preferences.5.xml:246
#, fuzzy
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:240
+#: apt_preferences.5.xml:247
#, fuzzy
msgid ""
"causes a version to be installed unless there is a version available "
@@ -7523,13 +7710,13 @@ msgstr ""
"reciente."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:245
+#: apt_preferences.5.xml:252
#, fuzzy
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:246
+#: apt_preferences.5.xml:253
#, fuzzy
msgid ""
"causes a version to be installed unless there is a version available "
@@ -7539,13 +7726,13 @@ msgstr ""
"distribución o la versión instalada sea más reciente."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:251
+#: apt_preferences.5.xml:258
#, fuzzy
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:252
+#: apt_preferences.5.xml:259
#, fuzzy
msgid ""
"causes a version to be installed only if there is no installed version of "
@@ -7554,19 +7741,19 @@ msgstr ""
"la versión sólo se instala si no hay ninguna versión del paquete instalado."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:256
+#: apt_preferences.5.xml:263
#, fuzzy
msgid "P &lt; 0"
msgstr "P &lt; 0"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:257
+#: apt_preferences.5.xml:264
#, fuzzy
msgid "prevents the version from being installed"
msgstr "la versión nunca se instala."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:223
+#: apt_preferences.5.xml:230
#, fuzzy
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
@@ -7577,7 +7764,7 @@ msgstr ""
"números enteros. Se interpretan (en general) del siguiente modo:"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:262
+#: apt_preferences.5.xml:269
#, fuzzy
msgid ""
"If any specific-form records match an available package version then the "
@@ -7592,7 +7779,7 @@ msgstr ""
"prioridad de la versión del paquete."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:268
+#: apt_preferences.5.xml:275
#, fuzzy
msgid ""
"For example, suppose the APT preferences file contains the three records "
@@ -7602,7 +7789,7 @@ msgstr ""
"registros antes mencionados:"
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:272
+#: apt_preferences.5.xml:279
#, fuzzy, no-wrap
msgid ""
"Package: perl\n"
@@ -7631,12 +7818,12 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:285
+#: apt_preferences.5.xml:292
msgid "Then:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:294
#, fuzzy
msgid ""
"The most recent available version of the <literal>perl</literal> package "
@@ -7652,7 +7839,7 @@ msgstr ""
"entonces se instala la versión5.8*."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:292
+#: apt_preferences.5.xml:299
#, fuzzy
msgid ""
"A version of any package other than <literal>perl</literal> that is "
@@ -7664,7 +7851,7 @@ msgstr ""
"versiones, incluso sobre los pertenecientes a la distribución objetivo."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:296
+#: apt_preferences.5.xml:303
#, fuzzy
msgid ""
"A version of a package whose origin is not the local system but some other "
@@ -7678,7 +7865,7 @@ msgstr ""
"versión del paquete instalado."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:313
#, fuzzy
msgid "Determination of Package Version and Distribution Properties"
msgstr ""
@@ -7686,7 +7873,7 @@ msgstr ""
"distribución"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:308
+#: apt_preferences.5.xml:315
#, fuzzy
msgid ""
"The locations listed in the &sources-list; file should provide "
@@ -7698,31 +7885,31 @@ msgstr ""
"describen los paquetes disponibles en cada uno de los sitios."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:320
+#: apt_preferences.5.xml:327
#, fuzzy
msgid "the <literal>Package:</literal> line"
msgstr "La línea <literal>Package:</literal> "
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:321
+#: apt_preferences.5.xml:328
#, fuzzy
msgid "gives the package name"
msgstr "Indica el nombre del paquete"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:324 apt_preferences.5.xml:374
+#: apt_preferences.5.xml:331 apt_preferences.5.xml:381
#, fuzzy
msgid "the <literal>Version:</literal> line"
msgstr "La línea <literal>Version:</literal> "
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:325
+#: apt_preferences.5.xml:332
#, fuzzy
msgid "gives the version number for the named package"
msgstr "Indica el número de versión del paquete"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:319
#, fuzzy
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
@@ -7744,13 +7931,13 @@ msgstr ""
"cada registro:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:341
+#: apt_preferences.5.xml:348
#, fuzzy
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr "La línea <literal>Archive:</literal> "
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:342
+#: apt_preferences.5.xml:349
#, fuzzy
msgid ""
"names the archive to which all the packages in the directory tree belong. "
@@ -7769,7 +7956,7 @@ msgstr ""
"preferencias de APT:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:352
+#: apt_preferences.5.xml:359
#, fuzzy, no-wrap
msgid "Pin: release a=stable\n"
msgstr ""
@@ -7777,13 +7964,13 @@ msgstr ""
"Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:358
+#: apt_preferences.5.xml:365
#, fuzzy
msgid "the <literal>Codename:</literal> line"
msgstr "La línea <literal>Component:</literal> "
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:359
+#: apt_preferences.5.xml:366
#, fuzzy
msgid ""
"names the codename to which all the packages in the directory tree belong. "
@@ -7801,13 +7988,13 @@ msgstr ""
"preferencias de APT:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:368
+#: apt_preferences.5.xml:375
#, no-wrap
msgid "Pin: release n=squeeze\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:375
+#: apt_preferences.5.xml:382
#, fuzzy
msgid ""
"names the release version. For example, the packages in the tree might "
@@ -7824,7 +8011,7 @@ msgstr ""
"siguientes línea en el fichero de preferencias de APT:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:384
+#: apt_preferences.5.xml:391
#, fuzzy, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -7837,13 +8024,13 @@ msgstr ""
"Pin: release 3.0\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:393
+#: apt_preferences.5.xml:400
#, fuzzy
msgid "the <literal>Component:</literal> line"
msgstr "La línea <literal>Component:</literal> "
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:394
+#: apt_preferences.5.xml:401
#, fuzzy
msgid ""
"names the licensing component associated with the packages in the directory "
@@ -7862,7 +8049,7 @@ msgstr ""
"de APT:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:403
+#: apt_preferences.5.xml:410
#, fuzzy, no-wrap
msgid "Pin: release c=main\n"
msgstr ""
@@ -7870,13 +8057,13 @@ msgstr ""
"Pin: release c=main\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:416
#, fuzzy
msgid "the <literal>Origin:</literal> line"
msgstr "La línea <literal>Origin:</literal> "
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:410
+#: apt_preferences.5.xml:417
#, fuzzy
msgid ""
"names the originator of the packages in the directory tree of the "
@@ -7890,7 +8077,7 @@ msgstr ""
"tendrá que poner la siguiente línea en el fichero de preferencias de APT:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:416
+#: apt_preferences.5.xml:423
#, fuzzy, no-wrap
msgid "Pin: release o=Debian\n"
msgstr ""
@@ -7898,13 +8085,13 @@ msgstr ""
"Pin: release o=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:422
+#: apt_preferences.5.xml:429
#, fuzzy
msgid "the <literal>Label:</literal> line"
msgstr "La línea <literal>Label:</literal> "
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:423
+#: apt_preferences.5.xml:430
#, fuzzy
msgid ""
"names the label of the packages in the directory tree of the "
@@ -7918,7 +8105,7 @@ msgstr ""
"la siguiente línea en el fichero de preferencias de APT:"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:429
+#: apt_preferences.5.xml:436
#, fuzzy, no-wrap
msgid "Pin: release l=Debian\n"
msgstr ""
@@ -7926,7 +8113,7 @@ msgstr ""
"Pin: release l=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:330
+#: apt_preferences.5.xml:337
#, fuzzy
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
@@ -7948,7 +8135,7 @@ msgstr ""
"<filename>Release</filename> son relevantes para las prioridades de APT:"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:436
+#: apt_preferences.5.xml:443
#, fuzzy
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
@@ -7974,13 +8161,13 @@ msgstr ""
"la distribución <literal>inestable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:449
+#: apt_preferences.5.xml:456
#, fuzzy
msgid "Optional Lines in an APT Preferences Record"
msgstr "Líneas opcionales en un registro de preferencias de APT"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:451
+#: apt_preferences.5.xml:458
#, fuzzy
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
@@ -7992,7 +8179,7 @@ msgstr ""
"Útil para comentarios."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:455
+#: apt_preferences.5.xml:462
#, fuzzy
msgid ""
"The <literal>Pin-Priority:</literal> line in each APT preferences record is "
@@ -8005,13 +8192,13 @@ msgstr ""
"una línea que empieze con <literal>Pin-Priority: release ...</literal>."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:471
#, fuzzy
msgid "Tracking Stable"
msgstr "Siguiendo la distribución estable"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:472
+#: apt_preferences.5.xml:479
#, fuzzy, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -8036,7 +8223,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:466
+#: apt_preferences.5.xml:473
#, fuzzy
msgid ""
"The following APT preferences file will cause APT to assign a priority "
@@ -8051,8 +8238,8 @@ msgstr ""
"de las distribuciones <literal>Debian</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:489 apt_preferences.5.xml:535
-#: apt_preferences.5.xml:593
+#: apt_preferences.5.xml:496 apt_preferences.5.xml:542
+#: apt_preferences.5.xml:600
#, fuzzy, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -8065,7 +8252,7 @@ msgstr ""
"apt-get dist-upgrade\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:484
+#: apt_preferences.5.xml:491
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -8079,13 +8266,13 @@ msgstr ""
"última versión <literal>estable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:501
+#: apt_preferences.5.xml:508
#, fuzzy, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr "rdepends <replaceable>paquetes(s)</replaceable>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:495
+#: apt_preferences.5.xml:502
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -8098,13 +8285,13 @@ msgstr ""
"de nuevo amenos que se ejecute de nuevo la orden."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:507
+#: apt_preferences.5.xml:514
#, fuzzy
msgid "Tracking Testing or Unstable"
msgstr "Siguiendo la distribución de pruebas o inestable"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:516
+#: apt_preferences.5.xml:523
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -8133,7 +8320,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:509
+#: apt_preferences.5.xml:516
#, fuzzy
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
@@ -8150,7 +8337,7 @@ msgstr ""
"de <literal>Debian</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:530
+#: apt_preferences.5.xml:537
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -8164,13 +8351,13 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:550
+#: apt_preferences.5.xml:557
#, fuzzy, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr "rdepends <replaceable>paquetes(s)</replaceable>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:541
+#: apt_preferences.5.xml:548
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -8190,12 +8377,12 @@ msgstr ""
"versión instalada."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:564
msgid "Tracking the evolution of a codename release"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:571
+#: apt_preferences.5.xml:578
#, fuzzy, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -8225,7 +8412,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:559
+#: apt_preferences.5.xml:566
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 "
@@ -8240,7 +8427,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:588
+#: apt_preferences.5.xml:595
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -8254,13 +8441,13 @@ msgstr ""
"última versión <literal>estable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:608
+#: apt_preferences.5.xml:615
#, fuzzy, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr "rdepends <replaceable>paquetes(s)</replaceable>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:599
+#: apt_preferences.5.xml:606
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -8280,13 +8467,13 @@ msgstr ""
"versión instalada."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:617
+#: apt_preferences.5.xml:624
#, fuzzy
msgid "&file-preferences;"
msgstr "apt_preferences"
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:623
+#: apt_preferences.5.xml:630
#, fuzzy
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-conf;, &apt-get;, &sources-list;"
@@ -8630,7 +8817,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
#: sources.list.5.xml:178
-msgid "more recongnizable URI types"
+msgid "more recognizable URI types"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
@@ -8638,9 +8825,9 @@ msgstr ""
msgid ""
"APT can be extended with more methods shipped in other optional packages "
"which should follow the nameing scheme <literal>apt-transport-"
-"<replaceable>method</replaceable></literal>. The APT team e.g. maintain "
+"<replaceable>method</replaceable></literal>. The APT team e.g. maintains "
"also the <literal>apt-transport-https</literal> package which provides "
-"access methods for https-URIs with features similiar to the http method, but "
+"access methods for https-URIs with features similar to the http method, but "
"other methods for using e.g. debtorrent are also available, see "
"<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></"
"refentrytitle> <manvolnum>1</manvolnum></citerefentry>."
@@ -8899,7 +9086,7 @@ msgstr ""
#: guide.sgml:63
msgid ""
"For instance, mailcrypt is an emacs extension that aids in encrypting email "
-"with GPG. Without GPGP installed mail-crypt is useless, so mailcrypt has a "
+"with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
"simple dependency on GPG. Also, because it is an emacs extension it has a "
"simple dependency on emacs, without emacs it is completely useless."
msgstr ""
@@ -9048,8 +9235,8 @@ msgstr ""
#. type: <p></p>
#: guide.sgml:184
msgid ""
-"To enable the APT method you need to to select [A]ccess in <prgn>dselect</"
-"prgn> and then choose the APT method. You will be prompted for a set of "
+"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
+"and then choose the APT method. You will be prompted for a set of "
"<em>Sources</em> which are places to fetch archives from. These can be "
"remote Internet sites, local Debian mirrors or CDROMs. Each source can "
"provide a fragment of the total Debian archive, APT will automatically "
@@ -9137,7 +9324,7 @@ msgstr ""
#: guide.sgml:247
msgid ""
"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a super-set of "
+"available list by selecting [U]pdate from the menu. This is a superset of "
"<tt>apt-get update</tt> that makes the fetched information available to "
"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
"tt> has been run before."
@@ -9615,7 +9802,7 @@ msgstr ""
#: offline.sgml:57
msgid ""
"This is achieved by creatively manipulating the APT configuration file. The "
-"essential premis to tell APT to look on a disc for it's archive files. Note "
+"essential premise to tell APT to look on a disc for it's archive files. Note "
"that the disc should be formated with a filesystem that can handle long file "
"names such as ext2, fat32 or vfat."
msgstr ""
@@ -9714,8 +9901,8 @@ msgid ""
"On the target machine the first thing to do is mount the disc and copy <em>/"
"var/lib/dpkg/status</em> to it. You will also need to create the directories "
"outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
-"em> Then take the disc to the remote machine and configure the sources.list. "
-"On the remote machine execute the following:"
+"em>. Then take the disc to the remote machine and configure the sources."
+"list. On the remote machine execute the following:"
msgstr ""
#. type: <example></example>
@@ -9732,9 +9919,9 @@ msgstr ""
#. type: </example></p>
#: offline.sgml:149
msgid ""
-"The dist-upgrade command can be replaced with any-other standard APT "
+"The dist-upgrade command can be replaced with any other standard APT "
"commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em> However this presents a problem in communicating "
+"such as <em>dselect</em>. However this presents a problem in communicating "
"your selections back to the local computer."
msgstr ""
@@ -9867,6 +10054,34 @@ msgid "Which will use the already fetched archives on the disc."
msgstr ""
#, fuzzy
+#~ msgid ""
+#~ "<filename>apt.conf</filename> is the main configuration file for the APT "
+#~ "suite of tools, all tools make use of the configuration file and a common "
+#~ "command line parser to provide a uniform environment. When an APT tool "
+#~ "starts up it will read the configuration specified by the "
+#~ "<envar>APT_CONFIG</envar> environment variable (if any) and then read the "
+#~ "files in <literal>Dir::Etc::Parts</literal> then read the main "
+#~ "configuration file specified by <literal>Dir::Etc::main</literal> then "
+#~ "finally apply the command line options to override the configuration "
+#~ "directives, possibly loading even more config files."
+#~ msgstr ""
+#~ "<filename>apt.conf</filename> es el fichero principal de configuración "
+#~ "del conjunto de herramientas APT, todas las herramientas hacen uso del "
+#~ "fichero de configuración y un analizador común de sintaxis de la línea de "
+#~ "órdenes para proporcionar un entorno uniforme. Cuando se inicia una "
+#~ "utilidad APT, este leerá la configuración especificada en la variable de "
+#~ "entorno <envar>APT_CONFIG</envar> (si existe), luego leerá los ficheos en "
+#~ "<literal>Dir::Etc::Parts</literal>, entonces leerá el fichero de "
+#~ "configuración principal especificado por <literal>Dir::Etc::main</"
+#~ "literal>, finalmente aplicará las opciones de la línea de órdenes para "
+#~ "reescribir la directrices de la configuración, posiblemente cargando "
+#~ "incluso más ficheros de configuración."
+
+#, fuzzy
+#~ msgid "<filename>/etc/apt/trusted.gpg</filename>"
+#~ msgstr "<filename>/etc/apt/apt.conf</filename>"
+
+#, fuzzy
#~ msgid "/usr/share/doc/apt/"
#~ msgstr "/usr/share/doc/apt/"
@@ -10138,14 +10353,6 @@ msgstr ""
#~ "<arg rep=\"norepeat\" choice=\"opt\">autoclean</arg>"
#, fuzzy
-#~ msgid ""
-#~ "APT configuration file. Configuration Item: <literal>Dir::Etc::Main</"
-#~ "literal>."
-#~ msgstr ""
-#~ "Fichero de configuración de APT. Opción de Configuración: <literal>Dir::"
-#~ "Etc::Main</literal>."
-
-#, fuzzy
#~ msgid "<filename>/etc/apt/apt.conf.d/</filename>"
#~ msgstr "<filename>/etc/apt/apt.conf.d/</filename>"
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 49dc38f7f..a6d12364e 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -5,12 +5,12 @@
# Translators:
# Jérôme Marant, 2000.
# Philippe Batailler, 2005.
-# Christian Perrier <bubulle@debian.org>, 2009.
+# Christian Perrier <bubulle@debian.org>, 2009, 2010.
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2009-11-27 00:05+0100\n"
-"PO-Revision-Date: 2009-09-26 19:25+0200\n"
+"POT-Creation-Date: 2010-01-20 12:18+0100\n"
+"PO-Revision-Date: 2010-01-29 19:58+0100\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
"MIME-Version: 1.0\n"
@@ -74,8 +74,8 @@ msgid ""
"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 "
+"quotidien des paquets, il existe plusieurs frontaux comme B<aptitude>(9) en "
+"ligne de commande ou B<synaptic>(8) pour X Window. Cependant, certaines "
"options ne sont disponibles que dans B<apt-get>(8)."
#. type: SH
@@ -114,14 +114,14 @@ msgstr ""
#: apt.8:42
#, no-wrap
msgid "DIAGNOSTICS"
-msgstr "DIAGNOSTIQUE"
+msgstr "DIAGNOSTICS"
#. type: Plain text
#: 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 renvoie zéro après une opération normale et la valeur décimale 100 en "
+"cas d'erreur."
#. type: SH
#: apt.8:44
@@ -141,7 +141,7 @@ 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 "
+"Voir E<lt>http://bugs.debian.org/aptE<gt>. Si vous souhaitez signaler un "
"bogue dans B<apt>, veuillez lire I</usr/share/doc/debian/bug-reporting.txt> "
"ou utiliser la commande B<reportbug>(1)."
@@ -358,13 +358,7 @@ msgstr ""
#. type: Plain text
#: apt.ent:84
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY dpkg \"<citerefentry>\n"
-#| " <refentrytitle><command>dpkg</command></refentrytitle>\n"
-#| " <manvolnum>8</manvolnum>\n"
-#| " </citerefentry>\"\n"
-#| ">\n"
+#, no-wrap
msgid ""
"<!ENTITY dpkg \"<citerefentry>\n"
" <refentrytitle><command>dpkg</command></refentrytitle>\n"
@@ -374,7 +368,7 @@ msgid ""
msgstr ""
"<!ENTITY dpkg \"<citerefentry>\n"
" <refentrytitle><command>dpkg</command></refentrytitle>\n"
-" <manvolnum>8</manvolnum>\n"
+" <manvolnum>1</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
@@ -412,13 +406,7 @@ msgstr ""
#. type: Plain text
#: apt.ent:102
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY dpkg-scanpackages \"<citerefentry>\n"
-#| " <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n"
-#| " <manvolnum>8</manvolnum>\n"
-#| " </citerefentry>\"\n"
-#| ">\n"
+#, no-wrap
msgid ""
"<!ENTITY dpkg-scanpackages \"<citerefentry>\n"
" <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n"
@@ -428,19 +416,13 @@ msgid ""
msgstr ""
"<!ENTITY dpkg-scanpackages \"<citerefentry>\n"
" <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n"
-" <manvolnum>8</manvolnum>\n"
+" <manvolnum>1</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
#. type: Plain text
#: apt.ent:108
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY dpkg-scansources \"<citerefentry>\n"
-#| " <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n"
-#| " <manvolnum>8</manvolnum>\n"
-#| " </citerefentry>\"\n"
-#| ">\n"
+#, no-wrap
msgid ""
"<!ENTITY dpkg-scansources \"<citerefentry>\n"
" <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n"
@@ -450,19 +432,13 @@ msgid ""
msgstr ""
"<!ENTITY dpkg-scansources \"<citerefentry>\n"
" <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n"
-" <manvolnum>8</manvolnum>\n"
+" <manvolnum>1</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
#. type: Plain text
#: apt.ent:114
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY dselect \"<citerefentry>\n"
-#| " <refentrytitle><command>dselect</command></refentrytitle>\n"
-#| " <manvolnum>8</manvolnum>\n"
-#| " </citerefentry>\"\n"
-#| ">\n"
+#, no-wrap
msgid ""
"<!ENTITY dselect \"<citerefentry>\n"
" <refentrytitle><command>dselect</command></refentrytitle>\n"
@@ -472,7 +448,7 @@ msgid ""
msgstr ""
"<!ENTITY dselect \"<citerefentry>\n"
" <refentrytitle><command>dselect</command></refentrytitle>\n"
-" <manvolnum>8</manvolnum>\n"
+" <manvolnum>1</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
@@ -765,7 +741,7 @@ msgstr ""
"<!ENTITY manbugs \"\n"
" <refsect1><title>Bogues</title>\n"
" <para><ulink url='http://bugs.debian.org/src:apt'>Page des bogues d'APT</ulink>. \n"
-" Si vous souhaitez remonter un bogue à propos d'APT, veuillez lire\n"
+" Si vous souhaitez signaler un bogue à propos d'APT, veuillez lire\n"
" <filename>/usr/share/doc/debian/bug-reporting.txt</filename> ou utiliser\n"
" la commande &reportbug;.\n"
" </para>\n"
@@ -854,7 +830,7 @@ msgstr ""
" <term><option>-c</option></term>\n"
" <term><option>--config-file</option></term>\n"
" <listitem><para>Fichier de configuration ; indique le fichier de configuration à utiliser. \n"
-" Les programme lira le fichier de configuration par défaut puis le fichier indiqué ici. \n"
+" Le programme lira le fichier de configuration par défaut puis le fichier indiqué ici. \n"
" Veuillez consulter &apt-conf; pour des informations sur la syntaxe d'utilisation. \n"
" </para>\n"
" </listitem>\n"
@@ -942,7 +918,7 @@ msgid ""
msgstr ""
" <varlistentry><term><filename>/etc/apt/apt.conf.D/</filename></term>\n"
" <listitem><para>Fragments du fichier de configuration d'APT.\n"
-" Élément de configuration : <literal>Dir::Etc::Partsn</literal>.</para></listitem>\n"
+" Élément de configuration : <literal>Dir::Etc::Parts</literal>.</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
@@ -1011,7 +987,7 @@ msgid ""
msgstr ""
" <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
" <listitem><para>Fragments de fichiers pour la préférence des versions.\n"
-" Élémet de configuration: <literal>Dir::Etc::PreferencesParts</literal>.</para></listitem>\n"
+" Élément de configuration : <literal>Dir::Etc::PreferencesParts</literal>.</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
@@ -1028,7 +1004,7 @@ msgstr ""
"<!ENTITY file-sourceslist \"\n"
" <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n"
" <listitem><para>Emplacement pour la récupération des paquets.\n"
-" Élément de configuration: <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n"
+" Élément de configuration : <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n"
" </varlistentry>\n"
#. type: Plain text
@@ -1061,11 +1037,11 @@ msgstr ""
"<!ENTITY file-statelists \"\n"
" <varlistentry><term><filename>&statedir;/lists/</filename></term>\n"
" <listitem><para>Zone de stockage pour les informations qui concernent chaque ressource de paquet spécifiée dans &sources-list;\n"
-" Élément de configuration: <literal>Dir::State::Lists</literal>.</para></listitem>\n"
+" Élément de configuration : <literal>Dir::State::Lists</literal>.</para></listitem>\n"
" </varlistentry>\n"
#. type: Plain text
-#: apt.ent:355
+#: apt.ent:356
#, no-wrap
msgid ""
" <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
@@ -1076,11 +1052,97 @@ msgid ""
msgstr ""
" <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
" <listitem><para>Zone de stockage pour les informations en transit.\n"
-" Élément de configuration : <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>\n"
+" Élément de configuration : <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>\n"
+" </varlistentry>\n"
+"\">\n"
+
+#. type: Plain text
+#: apt.ent:362
+#, 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"
+msgid ""
+"<!ENTITY file-trustedgpg \"\n"
+" <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n"
+" <listitem><para>Keyring of local trusted keys, new keys will be added here.\n"
+" Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+msgstr ""
+"<!ENTITY file-trustedgpg \"\n"
+" <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n"
+" <listitem><para>Porte-clés des clés de confiance locales. Les nouvelles clés y seront ajoutées.\n"
+" Élément de configuration: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+
+#. type: Plain text
+#: apt.ent:369
+#, fuzzy, 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"
+msgid ""
+" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
+" <listitem><para>File fragments for the trusted keys, additional keyrings can\n"
+" be stored here (by other packages or the administrator).\n"
+" Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+"\">\n"
+msgstr ""
+" <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
+" <listitem><para>Fragments de fichiers définissant les emplacements de récupération de paquets.\n"
+" Élément de configuration : <literal>Dir::Etc::SourceParts</literal>.</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
-#. The last update date
+#. type: Plain text
+#: apt.ent:371
+msgid "<!ENTITY translation-title \"TRANSLATION\">"
+msgstr "<!ENTITY translation-title \"Traducteurs\">"
+
+#. type: Plain text
+#: apt.ent:380
+#, no-wrap
+msgid ""
+"<!-- TRANSLATOR: This is a placeholder. You should write here who has constributed\n"
+" to the translation in the past, who is responsible now and maybe further information\n"
+" specially related to your translation. -->\n"
+"<!ENTITY translation-holder \"\n"
+" The english translation was done by John Doe <email>john@doe.org</email> in 2009,\n"
+" 2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together with the\n"
+" Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>.\n"
+"\">\n"
+msgstr ""
+"<!ENTITY translation-holder \"\n"
+" Jérôme Marant, Philippe Batailler, Christian Perrier <email>bubulle@debian.org</email> (2000, 2005, 2009, 2010),\n"
+" Équipe de traduction francophone de Debian <email>debian-l10n-french@lists.debian.org</email>\n"
+"\">\n"
+
+#. type: Plain text
+#: apt.ent:387
+#, no-wrap
+msgid ""
+"<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
+" in a shipped manpage will maybe appear english parts. -->\n"
+"<!ENTITY translation-english \"\n"
+" Note that this translated document may contain untranslated parts.\n"
+" This is done on purpose, to avoid losing content when the\n"
+" translation is lagging behind the original content.\n"
+"\">\n"
+msgstr ""
+"<!ENTITY translation-english \"\n"
+" Veuillez noter que cette traduction peut contenir des parties non traduites\n"
+" Cela est volontaire, pour éviter de perdre du contenu quand la\n"
+" traduction est légèrement en retard sur le contenu d'origine.\n"
+"\">\n"
+
+#. 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-sortpkgs.1.xml:13 sources.list.5.xml:13
@@ -1163,7 +1225,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: 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-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40
#: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33
#: sources.list.5.xml:33
msgid "Description"
@@ -1379,13 +1441,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
#: apt-cache.8.xml:152
-#, fuzzy
-#| msgid ""
-#| "<literal>Missing</literal> is the number of package names that were "
-#| "referenced in a dependency but were not provided by any package. Missing "
-#| "packages may be in evidence if a full distribution is not accessed, or if "
-#| "a package (real or virtual) has been dropped from the distribution. "
-#| "Usually they are referenced from Conflicts or Breaks statements."
msgid ""
"<literal>Missing</literal> is the number of package names that were "
"referenced in a dependency but were not provided by any package. Missing "
@@ -1397,7 +1452,7 @@ msgstr ""
"dépendance mais qui ne sont fournis par aucun paquet. Les paquets manquants "
"peuvent être mis en évidence quand on n'accède pas à une distribution "
"complète ou si un paquet (réel ou virtuel) a été sorti d'une distribution. "
-"Habituellement on les trouve dans les champs « Conflicts »."
+"Habituellement on les trouve dans les champs « Conflicts » ou « Breaks »."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
#: apt-cache.8.xml:159
@@ -1451,7 +1506,7 @@ msgid ""
"It is primarily for debugging."
msgstr ""
"La commande <literal>dump</literal> affiche un court résumé sur chaque "
-"paquet du cache. Elle est d'abord destinée au débogage."
+"paquet du cache. Elle est d'abord destinée au débogage."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:184
@@ -1519,11 +1574,11 @@ msgstr ""
"La commande <literal>search</literal> recherche l'expression rationnelle "
"donnée en paramètre sur tous les paquets disponibles. Elle cherche une "
"occurrence de la chaîne dans les noms de paquets et dans les descriptions "
-"puis elle affiche le nom du paquet et sa description courte. Quand on donne "
-"l'option <option>--full</option>, la sortie est identique à <literal>show</"
-"literal> pour chaque paquet ; l'option <option>--names-only</option> ne "
-"recherche pas la chaîne dans les descriptions longues mais seulement dans "
-"les noms de paquets."
+"puis elle affiche le nom du paquet et sa description courte. Quand l'option "
+"<option>--full</option> est fournie, la sortie est identique à "
+"<literal>show</literal> pour chaque paquet ; l'option <option>--names-only</"
+"option> ne recherche pas la chaîne dans les descriptions longues mais "
+"seulement dans les noms de paquets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cache.8.xml:214
@@ -1532,7 +1587,7 @@ msgid ""
"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 seront réalisées un « et » logique."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:218
@@ -1585,11 +1640,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cache.8.xml:234
-#, fuzzy
-#| msgid ""
-#| "Note that a package which APT knows of is not nessasarily available to "
-#| "download, installable or installed, e.g. virtual packages are also listed "
-#| "in the generated list."
msgid ""
"Note that a package which APT knows of is not necessarily available to "
"download, installable or installed, e.g. virtual packages are also listed in "
@@ -1597,7 +1647,7 @@ msgid ""
msgstr ""
"Veuillez noter qu'un paquet connu par APT n'est pas forcément disponible, "
"installable ou installé. Par exemple, les paquets virtuels sont également "
-"affichés dans la liste."
+"affichés dans la liste créée."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:239
@@ -1709,7 +1759,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89
-#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:484 apt.conf.5.xml:506
+#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524
msgid "options"
msgstr "options"
@@ -1948,14 +1998,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:556 apt-get.8.xml:554
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 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:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122
-#: apt.conf.5.xml:1017 apt_preferences.5.xml:615
+#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122
+#: apt.conf.5.xml:1035 apt_preferences.5.xml:622
msgid "Files"
msgstr "Fichiers"
@@ -1966,9 +2016,9 @@ msgstr "&file-sourceslist; &file-statelists;"
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569
-#: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569
+#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629
#: sources.list.5.xml:233
msgid "See Also"
msgstr "Voir aussi"
@@ -1980,10 +2030,10 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;."
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:576 apt-get.8.xml:575
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575
#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
-msgstr "Diagnostique"
+msgstr "Diagnostics"
#. type: Content of: <refentry><refsect1><para>
#: apt-cache.8.xml:374
@@ -2110,7 +2160,7 @@ msgstr ""
"\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:91
+#: apt-cdrom.8.xml:91 apt-key.8.xml:139
msgid "Options"
msgstr "Options"
@@ -2360,7 +2410,7 @@ 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:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585
#: apt-sortpkgs.1.xml:70
msgid "&apt-conf;"
msgstr "&apt-conf;"
@@ -2388,8 +2438,8 @@ msgstr "1"
#: 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 et fichiers de configuration pour DebConf "
+"contenu dans un paquet Debian"
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-extracttemplates.1.xml:36
@@ -2450,18 +2500,13 @@ msgstr "<option>--tempdir</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-extracttemplates.1.xml:62
-#, fuzzy
-#| msgid ""
-#| "Temporary directory in which to write extracted debconf template files "
-#| "and config scripts Configuration Item: <literal>APT::ExtractTemplates::"
-#| "TempDir</literal>"
msgid ""
"Temporary directory in which to write extracted debconf template files and "
"config scripts. Configuration Item: <literal>APT::ExtractTemplates::"
"TempDir</literal>"
msgstr ""
-"Répertoire temporaire dans lequel écrire les scripts et guides de "
-"configuration pour Debconf. Élément de configuration : <literal>APT::"
+"Répertoire temporaire dans lequel écrire les scripts de configuration et "
+"modèles d'écrans pour Debconf. Élément de configuration : <literal>APT::"
"ExtractTemplates::TempDir</literal>."
#. type: Content of: <refentry><refsect1><para>
@@ -2473,19 +2518,15 @@ msgstr ""
"<command>apt-extracttemplates</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-ftparchive.1.xml:13
-#, fuzzy
-#| msgid ""
-#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>2 "
-#| "November 2007</date>"
msgid ""
"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 "
"August 2009</date>"
msgstr ""
-"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>2 "
-"Novembre 2007</date>"
+"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>17 "
+"août 2009</date>"
#. type: Content of: <refentry><refnamediv><refname>
#: apt-ftparchive.1.xml:22 apt-ftparchive.1.xml:29
@@ -2601,8 +2642,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: 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."
+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."
@@ -2674,7 +2714,7 @@ msgid ""
"md5sum.txt files. It then writes to stdout a Release file containing an MD5 "
"digest and SHA1 digest for each file."
msgstr ""
-"La commande <literal>release</literal> crée un fichier Releases à partir "
+"La commande <literal>release</literal> crée un fichier « Releases » à partir "
"d'un répertoire. Elle cherche récursivement dans ce répertoire les fichiers "
"Packages, Packages.gz, Packages.bz2, Sources, Sources.gz, Sources.bz2, "
"Release et md5sum.txt. Elle envoie alors un fichier Release sur la sortie "
@@ -2694,7 +2734,7 @@ msgstr ""
"La valeur des autres champs du fichier Release est tirée de la valeur "
"correspondante dans <literal>APT::FTPArchive::Release</literal>, p. ex. "
"<literal>APT::FTPArchive::Release::Origin</literal>. Les champs reconnus "
-"sont : <literal>Origin</literal>, <literal>Label</literal>, <literal>Suite</"
+"sont : <literal>Origin</literal>, <literal>Label</literal>, <literal>Suite</"
"literal>, <literal>Version</literal>, <literal>Codename</literal>, "
"<literal>Date</literal>, <literal>Architectures</literal>, "
"<literal>Components</literal>, <literal>Description</literal>."
@@ -2757,10 +2797,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: 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."
+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:157
@@ -2769,12 +2807,6 @@ msgstr "La section Dir"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt-ftparchive.1.xml:159
-#, fuzzy
-#| msgid ""
-#| "The <literal>Dir</literal> section defines the standard directories "
-#| "needed to locate the files required during the generation process. These "
-#| "directories are prepended to certain relative paths defined in later "
-#| "sections to produce a complete an absolute path."
msgid ""
"The <literal>Dir</literal> section defines the standard directories needed "
"to locate the files required during the generation process. These "
@@ -2939,7 +2971,7 @@ msgid ""
"Links</literal> setting."
msgstr ""
"Indique le nombre de kilo-octets à délier (et à remplacer par des liens en "
-"dur) pour chaque exécution. On s'en sert, pour chaque section, avec le "
+"dur) pour chaque exécution. On s'en sert, pour chaque section, avec le "
"paramètre <literal>External-Links</literal>."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
@@ -2987,7 +3019,7 @@ msgid ""
"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 "
+"chaque jour. Les fichiers « Contents » sont choisis selon le système "
"<emphasis>round-robin</emphasis> de manière que, sur plusieurs jours, tous "
"soient reconstruits."
@@ -3063,11 +3095,14 @@ msgstr "Sources"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:288
+#| msgid ""
+#| "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
+#| "source/Sources</filename>"
msgid ""
-"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
+"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
"source/Sources</filename>"
msgstr ""
-"Indique le fichier « Packages » crée. Par défaut, c'est <filename>$(DIST)/"
+"Indique le fichier « Sources » créé. Par défaut, c'est <filename>$(DIST)/"
"$(SECTION)/source/Sources</filename>."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
@@ -3205,26 +3240,37 @@ msgstr ""
"peuvent s'utiliser dans la section <literal>Tree</literal> ainsi que les "
"trois nouvelles variables suivantes."
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:351
-msgid ""
-"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
-"command> performs an operation similar to:"
-msgstr ""
-"Quand il exécute la section <literal>Tree</literal>, <command>apt-"
-"ftparchive</command> agit ainsi :"
-
-#. type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting>
+#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt-ftparchive.1.xml:354
#, no-wrap
+#| msgid ""
+#| "for i in Sections do \n"
+#| " for j in Architectures do\n"
+#| " Generate for DIST=scope SECTION=i ARCH=j\n"
msgid ""
"for i in Sections do \n"
" for j in Architectures do\n"
" Generate for DIST=scope SECTION=i ARCH=j\n"
+" "
msgstr ""
"for i in Sections do \n"
" for j in Architectures do\n"
" Generate for DIST=scope SECTION=i ARCH=j\n"
+" "
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-ftparchive.1.xml:351
+#| msgid ""
+#| "When processing a <literal>Tree</literal> section <command>apt-"
+#| "ftparchive</command> performs an operation similar to:"
+msgid ""
+"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
+"command> performs an operation similar to: <placeholder type=\"programlisting"
+"\" id=\"0\"/>"
+msgstr ""
+"Quand il exécute la section <literal>Tree</literal>, <command>apt-"
+"ftparchive</command> effectue une opération analogue à : <placeholder type=\"programlisting"
+"\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:360
@@ -3254,9 +3300,9 @@ msgid ""
"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."
+"C'est une liste de toutes les architectures séparées par des espaces qui "
+"appartiennent à chaque 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:374 apt-ftparchive.1.xml:422
@@ -3506,7 +3552,7 @@ msgstr ""
"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 "
+"niveau de silence, et annuler le fichier de configuration. Élément de "
"configuration : <literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -3582,34 +3628,58 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:547
#, fuzzy
-#| msgid "<option>--version</option>"
-msgid "<option>APT::FTPArchive::LongDescription</option>"
-msgstr "<option>--version</option>"
+#| msgid "<option>APT::FTPArchive::LongDescription</option>"
+msgid "<option>APT::FTPArchive::AlwaysStat</option>"
+msgstr "<option>APT::FTPArchive::LongDescription</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:549
msgid ""
+"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If "
+"packages are recompiled and/or republished with the same version again, this "
+"will lead to problems as the now outdated cached metadata like size and "
+"checksums will be used. With this option enabled this will no longer happen "
+"as it will be checked if the file was changed. Note that this option is set "
+"to \"<literal>false</literal>\" by default as it is not recommend to upload "
+"multiply versions/builds of a package with the same versionnumber, so in "
+"theory nobody will have these problems and therefore all these extra checks "
+"are useless."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:559
+msgid "<option>APT::FTPArchive::LongDescription</option>"
+msgstr "<option>APT::FTPArchive::LongDescription</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:561
+msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
"only be set to <literal>\"false\"</literal> if the Archive generated with "
"&apt-ftparchive; also provides <filename>Translation</filename> files. Note "
"that it is currently not possible to create these files with <command>apt-"
"ftparchive</command>."
msgstr ""
+"Cette option de configuration a « <literal>true</literal> » comme valeur par "
+"défaut et ne devrait être placée sur « <literal>false</literal> » que si "
+"l'archive créée avec &apt-ftparchive; fournit également des fichiers "
+"<filename>Translation</filename>. Veuillez noter qu'il n'est actuellement "
+"pas possible de créer ces fichiers avec <command>apt-ftparchive</command>."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462
+#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469
#: sources.list.5.xml:193
msgid "Examples"
msgstr "Exemples"
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:567
+#: apt-ftparchive.1.xml:579
#, 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"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:563
+#: apt-ftparchive.1.xml:575
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3618,7 +3688,7 @@ msgstr ""
"paquets binaires (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:577
+#: apt-ftparchive.1.xml:589
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -3626,7 +3696,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 ""
@@ -3644,9 +3714,7 @@ msgstr "apt-get"
#. type: Content of: <refentry><refnamediv><refpurpose>
#: 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."
+msgstr "Utilitaire APT pour la gestion des paquets -- interface en ligne de commande."
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-get.8.xml:36
@@ -3721,13 +3789,13 @@ msgid ""
"library. Several \"front-end\" interfaces exist, such as &dselect;, "
"&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 "
+"<command>Apt-get</command> est le programme en ligne de commande pour la "
+"gestion des paquets. Il peut être considéré comme l'outil de base pour les "
+"autres programmes 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:135 apt-key.8.xml:123
+#: apt-get.8.xml:135 apt-key.8.xml:124
msgid "update"
msgstr "update"
@@ -3750,7 +3818,7 @@ msgstr ""
"filename>. Ainsi, lorsqu'on utilise une archive Debian, cette commande "
"récupère les fichiers <filename>Packages.gz</filename> et les analyse de "
"manière à rendre disponibles les informations concernant les nouveaux "
-"paquets et les paquets mis à jour. On doit toujours exécuter une commande "
+"paquets et les paquets mis à jour. On doit toujours exécuter une commande "
"<literal>update</literal> avant les commandes <literal>upgrade</literal> ou "
"<literal>dist-upgrade</literal>. Veuillez noter que l'indicateur de "
"progression d'ensemble peut être imprécis puisque la taille de ces fichiers "
@@ -3803,12 +3871,12 @@ 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 "
-"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)."
+"&dselect;, la plus ancienne interface du projet 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: <tag></tag>
#: apt-get.8.xml:170 guide.sgml:140
@@ -3833,7 +3901,7 @@ msgstr ""
"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 "
+"paquets les plus importants avant les 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."
@@ -3911,9 +3979,9 @@ msgid ""
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é"
+"différence de la commande « upgrade » qui installera la dernière version "
+"disponible de tous les paquets installés au moment de son exécution, "
+"« install » n'installera la nouvelle version que pour le(s) paquet(s) indiqué"
"(s). Il suffit de fournir le nom du(des) paquet(s) à mettre à jour et si une "
"nouvelle version est disponible, cette version (et ses dépendances, comme "
"décrit plus haut) sera récupérée et installée."
@@ -3982,7 +4050,7 @@ msgid ""
"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 "
+"literal> mais les paquets indiqués sont supprimés et purgés (leurs fichiers "
"de configuration sont également effacés)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -3992,15 +4060,6 @@ msgstr "source"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:251
-#, fuzzy
-#| msgid ""
-#| "<literal>source</literal> causes <command>apt-get</command> to fetch "
-#| "source packages. APT will examine the available packages to decide which "
-#| "source package to fetch. It will then find and download into the current "
-#| "directory the newest available version of that source package while "
-#| "respect the default release, set with the option <literal>APT::Default-"
-#| "Release</literal>, the <option>-t</option> option or per package with "
-#| "with the <literal>pkg/release</literal> syntax, if possible."
msgid ""
"<literal>source</literal> causes <command>apt-get</command> to fetch source "
"packages. APT will examine the available packages to decide which source "
@@ -4011,16 +4070,16 @@ msgid ""
"<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 par rapport à la version "
-"cible par défaut établie avec l'option <literal>APT::Default-Release</"
-"literal>, l'option <option>-t</option> ou par paquet avec la syntaxe "
-"<literal>paquet/version</literal>, si possible."
+"récupère des paquets source. APT examine les paquets disponibles pour "
+"choisir le paquet source à récupérer. Il télécharge ensuite dans le "
+"répertoire courant la version la plus récente du paquet, définie par rapport "
+"à la distribution par défaut établie soit avec l'option <literal>APT::"
+"Default-Release</literal>, soit avec l'option <option>-t</option> ou soit "
+"par paquet avec la syntaxe <literal>paquet/version</literal> \"\"\"while "
+"respect the default release\"\"\" me paraît douteux."
#. 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 "
@@ -4028,14 +4087,15 @@ msgid ""
"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."
+"Les paquets source sont gérés indépendamment des paquets binaires, avec les "
+"lignes de type <literal>deb-src</literal> dans le fichier &sources-list;. Il "
+"est donc nécessaire d'ajouter une telle ligne pour chaque dépôt pour lequel "
+"vous souhaitez pouvoir obtenir les sources. Dans le cas contraire, vous "
+"n'obtiendrez pas les mêmes sources que celles du paquet que vous avez "
+"installé ou que vous voulez installer."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:266
-#, fuzzy
msgid ""
"If the <option>--compile</option> option is specified then the package will "
"be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
@@ -4068,7 +4128,7 @@ msgid ""
"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 "
+"Veuillez noter que les paquets source 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."
@@ -4099,7 +4159,7 @@ msgid ""
"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."
+"jour le cache des paquets et cherche les dépendances défectueuses."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:293
@@ -4139,8 +4199,8 @@ msgstr ""
"Tout comme <literal>clean</literal>, <literal>autoclean</literal> nettoie le "
"référentiel local des paquets récupérés. La différence est qu'il supprime "
"uniquement les paquets qui ne peuvent plus être téléchargés et qui sont "
-"grandement inutiles. On peut ainsi contrôler la taille de ce cache sur une "
-"longue période. Tant qu'elle n'est pas activée, l'option de configuration "
+"inutiles. On peut ainsi contrôler la taille de ce cache sur une longue "
+"période. Tant qu'elle n'est pas activée, l'option de configuration "
"<literal>APT::Clean-Installed</literal> empêche la suppression de paquets "
"installés."
@@ -4196,31 +4256,44 @@ msgstr "<option>--fix-broken</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:334
+#, fuzzy
+#| msgid ""
+#| "Fix; attempt to correct a system with broken dependencies in place. This "
+#| "option, when used with install/remove, can omit any packages to permit "
+#| "APT to deduce a likely solution. Any Package that are specified must "
+#| "completely correct the problem. The option is sometimes necessary when "
+#| "running APT for the first time; APT itself does not allow broken package "
+#| "dependencies to exist on a system. It is possible that a system's "
+#| "dependency structure can be so corrupt as to require manual intervention "
+#| "(which usually means using &dselect; or <command>dpkg --remove</command> "
+#| "to eliminate some of the offending packages). Use of this option together "
+#| "with <option>-m</option> may produce an error in some situations. "
+#| "Configuration Item: <literal>APT::Get::Fix-Broken</literal>."
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
-"to deduce a likely solution. Any Package that are specified must completely "
-"correct the problem. The option is sometimes necessary when running APT for "
-"the first time; APT itself does not allow broken package dependencies to "
-"exist on a system. It is possible that a system's dependency structure can "
-"be so corrupt as to require manual intervention (which usually means using "
-"&dselect; or <command>dpkg --remove</command> to eliminate some of the "
-"offending packages). Use of this option together with <option>-m</option> "
-"may produce an error in some situations. Configuration Item: <literal>APT::"
-"Get::Fix-Broken</literal>."
-msgstr ""
-"Correction ; essaye de réparer un système dont les dépendances sont "
-"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>."
+"to deduce a likely solution. If packages are specified, these have to "
+"completely correct the problem. The option is sometimes necessary when "
+"running APT for the first time; APT itself does not allow broken package "
+"dependencies to exist on a system. It is possible that a system's dependency "
+"structure can be so corrupt as to require manual intervention (which usually "
+"means using &dselect; or <command>dpkg --remove</command> to eliminate some "
+"of the offending packages). Use of this option together with <option>-m</"
+"option> may produce an error in some situations. Configuration Item: "
+"<literal>APT::Get::Fix-Broken</literal>."
+msgstr ""
+"Correction ; cette option demande de réparer un système où existent des "
+"dépendances défectueuses. Utilisée avec install ou remove, elle peut exclure "
+"un paquet pour permettre de déduire une solution viable. Tout 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 "
+"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
@@ -4308,21 +4381,12 @@ msgid ""
"actually change the system. Configuration Item: <literal>APT::Get::"
"Simulate</literal>."
msgstr ""
-"Pas d'action ; simule les événements qui devraient se produire sans "
+"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:386
-#, fuzzy
-#| msgid ""
-#| "Simulation run as user will deactivate locking (<literal>Debug::"
-#| "NoLocking</literal>) automatical. Also a notice will be displayed "
-#| "indicating that this is only a simulation, if the option <literal>APT::"
-#| "Get::Show-User-Simulation-Note</literal> is set (Default: true) Neigther "
-#| "NoLocking nor the notice will be triggered if run as root (root should "
-#| "know what he is doing without further warnings by <literal>apt-get</"
-#| "literal>)."
msgid ""
"Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
"literal>) automatic. Also a notice will be displayed indicating that this "
@@ -4331,23 +4395,17 @@ msgid ""
"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 "
+"Lorsque la simulation est effectuée par un utilisateur sans privilège, 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)."
+"automatiquement. Une mention explicite indiquant 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 déclenché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:392
-#, fuzzy
-#| msgid ""
-#| "Simulate prints out a series of lines each one representing a dpkg "
-#| "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square "
-#| "brackets indicate broken packages with and empty set of square brackets "
-#| "meaning breaks that are of no consequence (rare)."
msgid ""
"Simulate prints out a series of lines each one representing a dpkg "
"operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@ -4355,7 +4413,7 @@ msgid ""
"that are of no consequence (rare)."
msgstr ""
"La simulation affiche une série de lignes représentant chacune une opération "
-"de dpkg, Configure (Conf),Remove (Remv),Unpack (Inst). Les crochets "
+"de dpkg, Configure (Conf), Remove (Remv), Unpack (Inst). Des crochets "
"encadrent des paquets endommagés et des crochets n'encadrant rien indiquent "
"que les dommages n'ont aucune conséquence (rare)."
@@ -4560,14 +4618,21 @@ msgstr "<option>--purge</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:467
+#, fuzzy
+#| 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>."
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> "
+"<option>remove --purge</option> is equivalent to the <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 supprimé. Un astérisque (*) sera accolé aux noms des paquets qui vont "
"être purgés. Élément de configuration : <literal>APT::Get::Purge</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -4632,7 +4697,7 @@ msgid ""
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 "
+"créée 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 "
@@ -4770,8 +4835,8 @@ msgid ""
"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 "
+"Ignorer le fait que les paquets ne peuvent pas être authentifiés ; ne le "
+"signale pas à l'utilisateur. Cette option est très utile pour certains "
"outils comme pbuilder. Élément de configuration : <literal>APT::Get::"
"AllowUnauthenticated</literal>."
@@ -4781,6 +4846,8 @@ msgid ""
"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
"&file-statelists;"
msgstr ""
+"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
+"&file-statelists;"
#. type: Content of: <refentry><refsect1><para>
#: apt-get.8.xml:570
@@ -4834,8 +4901,14 @@ msgstr "Utilitaire de gestion des clés d'APT"
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-key.8.xml:28
+#, fuzzy
+#| msgid ""
+#| "<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> "
+#| "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></"
+#| "option></arg>"
msgid ""
-"<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> "
+"<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
+"replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
"<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></"
"arg>"
msgstr ""
@@ -4844,7 +4917,7 @@ msgstr ""
"arg>"
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:36
+#: apt-key.8.xml:37
msgid ""
"<command>apt-key</command> is used to manage the list of keys used by apt to "
"authenticate packages. Packages which have been authenticated using these "
@@ -4854,17 +4927,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:42
+#: apt-key.8.xml:43
msgid "Commands"
msgstr "Commandes"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:44
+#: apt-key.8.xml:45
msgid "add <replaceable>filename</replaceable>"
msgstr "add <replaceable>fichier</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:48
+#: apt-key.8.xml:49
msgid ""
"Add a new key to the list of trusted keys. The key is read from "
"<replaceable>filename</replaceable>, or standard input if "
@@ -4875,71 +4948,71 @@ msgstr ""
"<replaceable>fichier</replaceable> est <literal>-</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:56
+#: apt-key.8.xml:57
msgid "del <replaceable>keyid</replaceable>"
msgstr "del <replaceable>clé</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:60
+#: apt-key.8.xml:61
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:67
+#: apt-key.8.xml:68
msgid "export <replaceable>keyid</replaceable>"
-msgstr "del <replaceable>clé</replaceable>"
+msgstr "export <replaceable>clé</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:71
+#: apt-key.8.xml:72
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:78
+#: apt-key.8.xml:79
msgid "exportall"
msgstr "exportall"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:82
+#: apt-key.8.xml:83
msgid "Output all trusted keys to standard output."
-msgstr "Affichier toutes les clés fiables sur la sortie standard."
+msgstr "Afficher toutes les clés fiables sur la sortie standard."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:89
+#: apt-key.8.xml:90
msgid "list"
msgstr "list"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:93
+#: apt-key.8.xml:94
msgid "List trusted keys."
msgstr "Afficher la liste des clés fiables."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:100
+#: apt-key.8.xml:101
msgid "finger"
msgstr "finger"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:104
+#: apt-key.8.xml:105
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:111
+#: apt-key.8.xml:112
msgid "adv"
msgstr "adv"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:115
+#: apt-key.8.xml:116
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 "
+"Passer des options 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:127
+#: apt-key.8.xml:128
msgid ""
"Update the local keyring with the keyring of Debian archive keys and removes "
"from the keyring the archive keys which are no longer valid."
@@ -4947,67 +5020,80 @@ msgstr ""
"Mettre à jour le trousseau de clés local avec le trousseau de clés de "
"l'archive Debian et supprimer les clés qui y sont périmées."
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><para>
#: apt-key.8.xml:140
-msgid "<filename>/etc/apt/trusted.gpg</filename>"
-msgstr "<filename>/etc/apt/trusted.gpg</filename>"
+msgid ""
+"Note that options need to be defined before the commands described in the "
+"previous section."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml:142
+#, fuzzy
+#| msgid "add <replaceable>filename</replaceable>"
+msgid "--keyring <replaceable>filename</replaceable>"
+msgstr "add <replaceable>fichier</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:141
-msgid "Keyring of local trusted keys, new keys will be added here."
+#: apt-key.8.xml:143
+msgid ""
+"With this option it is possible to specify a specific keyring file the "
+"command should operate on. The default is that a command is executed on the "
+"<filename>trusted.gpg</filename> file as well as on all parts in the "
+"<filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</"
+"filename> is the primary keyring which means that e.g. new keys are added to "
+"this one."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist>
+#: apt-key.8.xml:156
+msgid "&file-trustedgpg;"
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:144
+#: apt-key.8.xml:158
msgid "<filename>/etc/apt/trustdb.gpg</filename>"
msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:145
+#: apt-key.8.xml:159
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:148
+#: apt-key.8.xml:162
msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:149
+#: apt-key.8.xml:163
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:152
-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:166
+msgid "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+msgstr "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:153
+#: apt-key.8.xml:167
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:164
+#: apt-key.8.xml:176
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>9 "
"August 2009</date>"
msgstr ""
-"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>2 "
-"Novembre 2007</date>"
+"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
+"août 2009</date>"
#. type: Content of: <refentry><refnamediv><refname>
#: apt-mark.8.xml:22 apt-mark.8.xml:29
@@ -5017,16 +5103,10 @@ msgstr "apt-mark"
#. type: Content of: <refentry><refnamediv><refpurpose>
#: 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"
+msgstr "Indiquer si un paquet a été installé automatiquement ou non"
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-mark.8.xml:36
-#, fuzzy
-#| msgid ""
-#| "<command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
-#| "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"req"
-#| "\"><arg>markauto</arg><arg>unmarkauto</arg></group> <arg choice=\"plain\" "
-#| "rep=\"repeat\"><replaceable>package</replaceable></arg>"
msgid ""
" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
"f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
@@ -5035,10 +5115,12 @@ msgid ""
"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"
-"\"><arg>markauto</arg><arg>unmarkauto</arg></group> <arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>paquet</replaceable></arg>"
+" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
+"f=<replaceable>FICHIER</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>paquet</replaceable></arg> </"
+"arg> <arg choice=\"plain\">showauto</arg> </group>"
#. type: Content of: <refentry><refsect1><para>
#: apt-mark.8.xml:53
@@ -5046,18 +5128,11 @@ 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é."
+"Avec la commande <command>apt-mark</command>, on peut indiquer si un paquet "
+"a été automatiquement installé ou pas."
#. type: Content of: <refentry><refsect1><para>
#: apt-mark.8.xml:57
-#, fuzzy
-#| msgid ""
-#| "When you request that a package is installed, and as a result other "
-#| "packages are installed to satisfy its dependencies, the dependencies are "
-#| "marked as being automatically installed. Once these automatically "
-#| "installed packages are no longer depended on by any manually installed "
-#| "packages, they will be removed."
msgid ""
"When you request that a package is installed, and as a result other packages "
"are installed to satisfy its dependencies, the dependencies are marked as "
@@ -5065,10 +5140,12 @@ msgid ""
"are no longer depended on by any manually installed packages, they will be "
"removed by e.g. <command>apt-get</command> or <command>aptitude</command>."
msgstr ""
-"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 par voie de "
+"dépendances d'autres paquets sont installés, ces paquets sont marqués comme "
+"ayant été automatiquement installés. Une fois que ces paquets "
+"automatiquement installés ne sont plus liés à un paquet existant, ils seront "
+"supprimés par un appel à <command>apt-get</command> ou <command>aptitude</"
+"command>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-mark.8.xml:65
@@ -5105,58 +5182,43 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-mark.8.xml:81
msgid "showauto"
-msgstr ""
+msgstr "showauto"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml:82
-#, fuzzy
-#| msgid ""
-#| "<literal>autoremove</literal> is used to remove packages that were "
-#| "automatically installed to satisfy dependencies for some package and that "
-#| "are no more needed."
msgid ""
"<literal>showauto</literal> is used to print a list of automatically "
"installed packages with each package on a new line."
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."
+"<literal>showauto</literal>, affiche les paquets installés manuellement, un "
+"paquet par ligne."
#. 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>"
+msgid "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
+msgstr "<option>-f=<filename><replaceable>FICHIER</replaceable></filename></option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-mark.8.xml:94
-#, fuzzy
-#| msgid "<option>--file=<filename>FILENAME</filename></option>"
msgid ""
"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
"option>"
-msgstr "<option>--file=<filename>FICHIER</filename></option>"
+msgstr ""
+"<option>--file=<filename><replaceable>FICHIER</replaceable></filename></"
+"option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml:97
-#, fuzzy
-#| msgid ""
-#| "Read/Write package stats from <filename>FILENAME</filename> instead of "
-#| "the default location, which is <filename>extended_status</filename> in "
-#| "the directory defined by the Configuration Item: <literal>Dir::State</"
-#| "literal>."
msgid ""
"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
"filename> instead of the default location, which is "
"<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>."
+"Lecture/écriture des statistiques d'un paquet dans "
+"<filename><replaceable>FICHIER</replaceable></filename> au lieu du fichier "
+"par défaut (<filename>extended_status</filename> dans le répertoire défini "
+"par l'élément de configuration <literal>Dir::State</literal>)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-mark.8.xml:103
@@ -5171,7 +5233,7 @@ msgstr "<option>--help</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml:105
msgid "Show a short usage summary."
-msgstr "Affiche un résumé de la méthode d'utilisation"
+msgstr "Affiche un résumé de l'aide"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-mark.8.xml:111
@@ -5186,14 +5248,12 @@ msgstr "<option>--version</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml:113
msgid "Show the program version."
-msgstr "Afficher la version du programme."
+msgstr "Affiche 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>"
+msgstr "<filename>/var/lib/apt/extended_states</filename>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml:125
@@ -5202,13 +5262,14 @@ msgid ""
"State</literal> sets the path to the <filename>extended_states</filename> "
"file."
msgstr ""
+"États des paquets automatiquement installés. L'élément de configuration "
+"<literal>Dir::State</literal> définit le chemin d'accès au fichier "
+"<filename>extended_states</filename>."
#. type: Content of: <refentry><refsect1><para>
#: apt-mark.8.xml:134
-#, fuzzy
-#| msgid "&apt-cache; &apt-conf;"
msgid "&apt-get;,&aptitude;,&apt-conf;"
-msgstr "&apt-cache; &apt-conf;"
+msgstr "&apt-get;,&aptitude;,&apt-conf;"
#. type: Content of: <refentry><refsect1><para>
#: apt-mark.8.xml:138
@@ -5216,8 +5277,8 @@ 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 un "
+"autre chiffre en cas d'erreur."
#. type: Content of: <refentry><refnamediv><refname>
#: apt-secure.8.xml:14 apt-secure.8.xml:36
@@ -5274,14 +5335,6 @@ msgstr "Trusted archives"
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml:67
-#, fuzzy
-#| msgid ""
-#| "The chain of trust from an apt archive to the end user is made up of "
-#| "different steps. <command>apt-secure</command> is the last step in this "
-#| "chain, trusting an archive does not mean that the packages that you trust "
-#| "it do not contain malicious code but means that you trust the archive "
-#| "maintainer. Its the archive maintainer responsibility to ensure that the "
-#| "archive integrity is correct."
msgid ""
"The chain of trust from an apt archive to the end user is made up of "
"different steps. <command>apt-secure</command> is the last step in this "
@@ -5330,15 +5383,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml:92
-#, fuzzy
-#| msgid ""
-#| "Once the uploaded package is verified and included in the archive, the "
-#| "maintainer signature is stripped off, an MD5 sum of the package is "
-#| "computed and put in the Packages file. The MD5 sum of all of the packages "
-#| "files are then computed and put into the Release file. The Release file "
-#| "is then signed by the archive key (which is created once a year and "
-#| "distributed through the FTP server. This key is also on the Debian "
-#| "keyring."
msgid ""
"Once the uploaded package is verified and included in the archive, the "
"maintainer signature is stripped off, an MD5 sum of the package is computed "
@@ -5347,12 +5391,12 @@ msgid ""
"by the archive key (which is created once a year) and distributed through "
"the FTP server. This key is also on the Debian keyring."
msgstr ""
-"Une fois le paquet vérifié et archivé, la signature du responsable est "
-"enlevée, une somme MD5 du paquet est calculée et mise dans le fichier "
-"Packages. Une somme MD5 de tous les paquets est ensuite calculée et mise "
-"dans le fichier Release. Ce fichier est signé par la clé de l'archive. Cette "
-"clé qui est créée chaque année et distribuée par le serveur FTP se trouve "
-"aussi dans le trousseau Debian."
+"Une fois que le paquet envoyé a été vérifié et inclus dans l'archive, la "
+"signature du responsable est enlevée, une somme MD5 du paquet est calculée "
+"et mise dans le fichier Packages. Une somme MD5 de tous les paquets est "
+"ensuite calculée et mise dans le fichier Release. Ce fichier est signé par "
+"la clé de l'archive. Cette clé, qui est recréée chaque année, est distribuée "
+"par le serveur FTP. Elle se trouve aussi dans le trousseau Debian."
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml:102
@@ -5413,7 +5457,7 @@ msgid ""
"sign the Release files. In any case, this mechanism can complement a per-"
"package signature."
msgstr ""
-"Cependant cette méthode ne garantit pas contre une compromission du serveur "
+"Cependant cette méthode ne protège pas contre une compromission du serveur "
"Debian lui-même (qui signe les paquets) ni contre la compromission de la clé "
"qui sert à signer les fichiers Release. Mais elle peut compléter la "
"signature des paquets."
@@ -5467,48 +5511,34 @@ msgstr ""
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#: apt-secure.8.xml:160
-#, fuzzy
-#| msgid ""
-#| "<literal>Create a toplevel Release file</literal>. if it does not exist "
-#| "already. You can do this by running <command>apt-ftparchive release</"
-#| "command> (provided in apt-utils)."
msgid ""
"<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
"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 "
+"<emphasis>créer un fichier Release à la racine de l'archive</emphasis>, 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) ;"
+"ftparchive release</command> (fournie dans le paquet apt-utils)."
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#: apt-secure.8.xml:165
-#, fuzzy
-#| msgid ""
-#| "<literal>Sign it</literal>. You can do this by running <command>gpg -abs -"
-#| "o Release.gpg Release</command>."
msgid ""
"<emphasis>Sign it</emphasis>. You can do this by running <command>gpg -abs -"
"o Release.gpg Release</command>."
msgstr ""
-"<literal>le signer</literal>, avec la commande <command>gpg -abs -o Release."
-"gpg Release</command> ;"
+"<emphasis>le signer</emphasis>, avec la commande <command>gpg -abs -o "
+"Release.gpg Release</command>."
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#: apt-secure.8.xml:168
-#, fuzzy
-#| msgid ""
-#| "<literal>Publish the key fingerprint</literal>, that way your users will "
-#| "know what key they need to import in order to authenticate the files in "
-#| "the archive."
msgid ""
"<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
"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."
+"<emphasis>publier l'empreinte de la clé</emphasis>. 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:175
@@ -5626,7 +5656,7 @@ 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
@@ -5634,17 +5664,17 @@ msgstr ""
#| "&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>"
+#| "email; &apt-product; <date>18 September 2009</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>18 September 2009</date>"
+"&apt-product; <date>16 January 2010</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; "
-"&apt-product; <date>10 décembre 2008</date>"
+"&apt-product; <date>18 septembre 2009</date>"
#. type: Content of: <refentry><refnamediv><refname>
#: apt.conf.5.xml:28 apt.conf.5.xml:35
@@ -5665,36 +5695,59 @@ msgstr "Fichier de configuration pour APT"
#: 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 "
-"command line parser to provide a uniform environment. When an APT tool "
-"starts up it will read the configuration specified by the <envar>APT_CONFIG</"
-"envar> environment variable (if any) and then read the files in "
-"<literal>Dir::Etc::Parts</literal> then read the main configuration file "
-"specified by <literal>Dir::Etc::main</literal> then finally apply the "
-"command line options to override the configuration directives, possibly "
-"loading even more config files."
-msgstr ""
-"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 "
-"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 "
-"lit les fichiers situés dans <literal>Dir::Etc::Parts</literal> ainsi que le "
-"principal fichier de configuration indiqué par <literal>Dir::Etc::main</"
-"literal> ; enfin il applique les options de la ligne de commande qui "
-"prévalent sur les directives de configuration, chargeant si nécessaire "
-"d'autres fichiers de configuration."
+"suite of tools, but by far not the only place changes to options can be "
+"made. All tools therefore share the configuration files and also use a "
+"common command line parser to provide a uniform environment."
+msgstr ""
-#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:50
+#. type: Content of: <refentry><refsect1><orderedlist><para>
+#: apt.conf.5.xml:45
+msgid ""
+"When an APT tool starts up it will read the configuration files in the "
+"following order:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:47
+msgid ""
+"the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
+"any)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:49
+msgid ""
+"all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
+"order which have no or \"<literal>conf</literal>\" as filename extension and "
+"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
+"characters - otherwise they will be silently ignored."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:54
#, fuzzy
#| msgid ""
-#| "The configuration file is organized in a tree with options organized into "
-#| "functional groups. option specification is given with a double colon "
-#| "notation, for instance <literal>APT::Get::Assume-Yes</literal> is an "
-#| "option within the APT tool group, for the Get tool. options do not "
-#| "inherit from their parent groups."
+#| "APT configuration file. Configuration Item: <literal>Dir::Etc::Main</"
+#| "literal>."
+msgid "the main configuration file specified by <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><orderedlist><listitem><para>
+#: apt.conf.5.xml:56
+msgid ""
+"the command line options are applied to override the configuration "
+"directives or to load even more configuration files."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.conf.5.xml:60
+msgid "Syntax"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:61
msgid ""
"The configuration file is organized in a tree with options organized into "
"functional groups. Option specification is given with a double colon "
@@ -5709,16 +5762,7 @@ msgstr ""
"Get. Il n'y a pas d'héritage des options des groupes parents."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:56
-#, fuzzy
-#| msgid ""
-#| "Syntactically the configuration language is modeled after what the ISC "
-#| "tools such as bind and dhcp use. Lines starting with <literal>//</"
-#| "literal> are treated as comments (ignored), as well as all text between "
-#| "<literal>/*</literal> and <literal>*/</literal>, just like C/C++ "
-#| "comments. Each line is of the form <literal>APT::Get::Assume-Yes \"true"
-#| "\";</literal> The trailing semicolon is required and the quotes are "
-#| "optional. A new scope can be opened with curly braces, like:"
+#: apt.conf.5.xml:67
msgid ""
"Syntactically the configuration language is modeled after what the ISC tools "
"such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@ -5738,12 +5782,17 @@ msgstr ""
"ignorée, de même que les sections de texte placées entre <literal>/*</"
"literal> et <literal>*/</literal>, tout comme les commentaires C/C++. "
"Chaque ligne est de la forme : <literal>APT::Get::Assume-Yes \"true\";</"
-"literal> Le point-virgule final est obligatoire et les guillemets sont "
-"optionnels. On peut déclarer un nouveau champ d'action avec des accolades, "
-"comme suit :"
+"literal>. Le point-virgule final est obligatoire et les guillemets sont "
+"optionnels. La valeur doit tenir sur une seule ligne et il n'existe pas de "
+"fusion de chaînes. Elle ne doit pas comporter de guillemets. Le comportement "
+"du caractère barre oblique inversée \"\\\" et les caractères utilisés avec "
+"séquence d'échappement dans une valeur ne sont pas déterministes et "
+"devraient être évités. Le nom d'une option peut contenir des caractères "
+"alphanumériques et « /-:._+ ». On peut déclarer un nouveau champ d'action "
+"avec des accolades, comme suit :"
#. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:70
+#: apt.conf.5.xml:81
#, no-wrap
msgid ""
"APT {\n"
@@ -5761,7 +5810,7 @@ msgstr ""
"};\n"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:78
+#: apt.conf.5.xml:89
msgid ""
"with newlines placed to make it more readable. Lists can be created by "
"opening a scope and including a single string enclosed in quotes followed by "
@@ -5772,13 +5821,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:83
+#: apt.conf.5.xml:94
#, no-wrap
msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:86
+#: apt.conf.5.xml:97
msgid ""
"In general the sample configuration file in <filename>&docdir;examples/apt."
"conf</filename> &configureindex; is a good guide for how it should look."
@@ -5788,7 +5837,7 @@ msgstr ""
"configuration."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:90
+#: apt.conf.5.xml:101
msgid ""
"The names of the configuration items are not case-sensitive. So in the "
"previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
@@ -5798,7 +5847,7 @@ msgstr ""
"<literal>dpkg::pre-install-pkgs</literal>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:93
+#: apt.conf.5.xml:104
msgid ""
"Names for the configuration items are optional if a list is defined as it "
"can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. "
@@ -5806,17 +5855,15 @@ msgid ""
"list. If you specify a name you can override the option as every other "
"option by reassigning a new value to the option."
msgstr ""
+"Les noms des éléments de configuration sont optionnels si une liste est "
+"définie, comme cela peut se voir avec l'exemple <literal>DPkg::Pre-Install-"
+"Pkgs</literal> précédent. Si vous n'indiquez pas de nom, une nouvelle entrée "
+"ajoutera une nouvelle option à la liste. Dans le cas contraire, l'option "
+"correspondante peut être remplacée, comme toute autre option, en lui "
+"réaffectant une valeur."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:98
-#, fuzzy
-#| msgid ""
-#| "Two specials are allowed, <literal>#include</literal> and "
-#| "<literal>#clear</literal> <literal>#include</literal> will include the "
-#| "given file, unless the filename ends in a slash, then the whole directory "
-#| "is included. <literal>#clear</literal> is used to erase a part of the "
-#| "configuration tree. The specified element and all its descendents are "
-#| "erased."
+#: apt.conf.5.xml:109
msgid ""
"Two specials are allowed, <literal>#include</literal> (which is deprecated "
"and not supported by alternative implementations) and <literal>#clear</"
@@ -5826,15 +5873,17 @@ msgid ""
"The specified element and all its descendants are erased. (Note that these "
"lines also need to end with a semicolon.)"
msgstr ""
-"Deux éléments spéciaux sont autorisés : <literal>#include</literal> et "
+"Deux éléments spéciaux sont autorisés : <literal>#include</literal> (qui est "
+"obsolète et n'est plus géré par des implémentations alternatives) et "
"<literal>#clear</literal>. <literal>#include</literal> inclut le fichier "
-"donné en argument, à moins que le nom ne se termine par une barre oblique "
+"donné en paramètre, à moins que le nom ne se termine par une barre oblique "
"auquel cas le répertoire entier est inclus. <literal>#clear</literal> sert à "
"effacer une partie de l'arbre de configuration. L'élément désigné et tout "
-"ses descendants sont supprimés."
+"ses descendants sont supprimés. Veuillez noter que ces lignes doivent "
+"également se terminer avec un point-virgule."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:106
+#: apt.conf.5.xml:117
msgid ""
"The #clear command is the only way to delete a list or a complete scope. "
"Reopening a scope or the ::-style described below will <emphasis>not</"
@@ -5842,16 +5891,15 @@ msgid ""
"overridden by addressing a new value to it - lists and scopes can't be "
"overridden, only cleared."
msgstr ""
+"La commande #clear est la seule façon de supprimer une liste ou un champ "
+"d'action (« scope »). La réouverture d'un scope ou le style « ::- » décrit "
+"plus loin ne remplaceront <emphasis>pas</emphasis> les entrées écrites "
+"précédemment. Seules les options peuvent être remplacées en leur assignant "
+"une nouvelle valeur. Les listes et les champs d'action ne peuvent être "
+"remplacés mais seulement effacés."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:111
-#, fuzzy
-#| msgid ""
-#| "All of the APT tools take a -o option which allows an arbitrary "
-#| "configuration directive to be specified on the command line. The syntax "
-#| "is a full option name (<literal>APT::Get::Assume-Yes</literal> for "
-#| "instance) followed by an equals sign then the new value of the option. "
-#| "Lists can be appended too by adding a trailing :: to the list name."
+#: apt.conf.5.xml:122
msgid ""
"All of the APT tools take a -o option which allows an arbitrary "
"configuration directive to be specified on the command line. The syntax is a "
@@ -5865,10 +5913,11 @@ msgstr ""
"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."
+"liste. Comme on peut s'en douter, la syntaxe de champ d'action (« scope ») ne "
+"peut pas être indiquée à la ligne de commande."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:118
+#: apt.conf.5.xml:129
msgid ""
"Note that you can use :: only for appending one item per line to a list and "
"that you should not use it in combination with the scope syntax. (The scope "
@@ -5883,14 +5932,28 @@ msgid ""
"correct such statements now as long as APT doesn't complain explicit about "
"them."
msgstr ""
+"Veuillez noter que vous ne pouvez utiliser « :: » que pour ajouter un élément "
+"par ligne à la liste et que cela ne devrait pas être utilisé en combinaison "
+"avec la syntaxe de champ d'action (« scope ») qui inclut implicitement « :: ». "
+"L'utilisation simultanée des deux syntaxes déclenchera un bogue dont "
+"certains utilisateurs se servent comme d'une fonctionnalité : une option "
+"avec le nom inhabituel « <literal>::</literal> » se comportera comme toute "
+"autre option nommée. Cela risque d'avoir de nombreux problèmes comme "
+"conséquence, par exemple si un utilisateur écrit plusieurs lignes avec cette "
+"syntaxe <emphasis>erronée</emphasis> afin de faire un ajout à la liste, "
+"l'effet obtenu sera inverse puisque seule la dernière valeur pour l'option "
+"« <literal>::</literal> » sera utilisée. Les futures versions d'APT "
+"retourneront une erreur et l'exécution sera interrompue si cette utilisation "
+"incorrecte est rencontrée. Il est donc conseillé de corriger ces défauts "
+"tant qu'APT ne s'en plaint pas explicitement."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:130
+#: apt.conf.5.xml:141
msgid "The APT Group"
msgstr "Le groupe APT"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:131
+#: apt.conf.5.xml:142
msgid ""
"This group of options controls general APT behavior as well as holding the "
"options for all of the tools."
@@ -5899,12 +5962,12 @@ msgstr ""
"également des options communes à tous les outils."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:135
+#: apt.conf.5.xml:146
msgid "Architecture"
msgstr "Architecture"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:136
+#: apt.conf.5.xml:147
msgid ""
"System Architecture; sets the architecture to use when fetching files and "
"parsing package lists. The internal default is the architecture apt was "
@@ -5915,12 +5978,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:141
+#: apt.conf.5.xml:152
msgid "Default-Release"
msgstr "Default-Release"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:142
+#: apt.conf.5.xml:153
msgid ""
"Default release to install packages from if more than one version available. "
"Contains release name, codename or release version. Examples: 'stable', "
@@ -5930,15 +5993,15 @@ 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;."
+"« lenny », « squeeze », « 4.0 », « 5.0* ». Voir aussi &apt-preferences;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:146
+#: apt.conf.5.xml:157
msgid "Ignore-Hold"
msgstr "Ignore-Hold"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:147
+#: apt.conf.5.xml:158
msgid ""
"Ignore Held packages; This global option causes the problem resolver to "
"ignore held packages in its decision making."
@@ -5948,12 +6011,12 @@ msgstr ""
"décision."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:151
+#: apt.conf.5.xml:162
msgid "Clean-Installed"
msgstr "Clean-Installed"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:152
+#: apt.conf.5.xml:163
msgid ""
"Defaults to on. When turned on the autoclean feature will remove any "
"packages which can no longer be downloaded from the cache. If turned off "
@@ -5967,12 +6030,43 @@ msgstr ""
"les réinstaller."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:158
+#: apt.conf.5.xml:169
msgid "Immediate-Configure"
msgstr "Immediate-Configure"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:159
+#: apt.conf.5.xml:170
+#, fuzzy
+#| msgid ""
+#| "Defaults to on which will cause APT to install essential and important "
+#| "packages as fast as possible in the install/upgrade operation. This is "
+#| "done to limit the effect of a failing &dpkg; call: If this option is "
+#| "disabled APT does treat an important package in the same way as an extra "
+#| "package: Between the unpacking of the important package A and his "
+#| "configuration can then be many other unpack or configuration calls, e.g. "
+#| "for package B which has no relation to A, but causes the dpkg call to "
+#| "fail (e.g. because maintainer script of package B generates an error) "
+#| "which results in a system state in which package A is unpacked but "
+#| "unconfigured - each package depending on A is now no longer guaranteed to "
+#| "work as their dependency on A is not longer satisfied. The immediate "
+#| "configuration marker is also applied to all dependencies which can "
+#| "generate a problem if the dependencies e.g. form a circle as a dependency "
+#| "with the immediate flag is comparable with a Pre-Dependency. So in theory "
+#| "it is possible that APT encounters a situation in which it is unable to "
+#| "perform immediate configuration, error out and refers to this option so "
+#| "the user can deactivate the immediate configuration temporary to be able "
+#| "to perform an install/upgrade again. Note the use of the word \"theory\" "
+#| "here as this problem was only encountered by now in real world a few "
+#| "times in non-stable distribution versions and caused by wrong "
+#| "dependencies of the package in question or by a system in an already "
+#| "broken state, so you should not blindly disable this option as the "
+#| "mentioned scenario above is not the only problem immediate configuration "
+#| "can help to prevent in the first place. Before a big operation like "
+#| "<literal>dist-upgrade</literal> is run with this option disabled it "
+#| "should be tried to explicitly <literal>install</literal> the package APT "
+#| "is unable to configure immediately, but please make sure to report your "
+#| "problem also to your distribution and to the APT team with the buglink "
+#| "below so they can work on improving or correcting the upgrade process."
msgid ""
"Defaults to on which will cause APT to install essential and important "
"packages as fast as possible in the install/upgrade operation. This is done "
@@ -5988,13 +6082,13 @@ msgid ""
"dependencies which can generate a problem if the dependencies e.g. form a "
"circle as a dependency with the immediate flag is comparable with a Pre-"
"Dependency. So in theory it is possible that APT encounters a situation in "
-"which it is unable to perform immediate configuration, error out and refers "
+"which it is unable to perform immediate configuration, errors out and refers "
"to this option so the user can deactivate the immediate configuration "
-"temporary to be able to perform an install/upgrade again. Note the use of "
+"temporarily to be able to perform an install/upgrade again. Note the use of "
"the word \"theory\" here as this problem was only encountered by now in real "
-"world a few times in non-stable distribution versions and caused by wrong "
-"dependencies of the package in question or by a system in an already broken "
-"state, so you should not blindly disable this option as the mentioned "
+"world a few times in non-stable distribution versions and was caused by "
+"wrong dependencies of the package in question or by a system in an already "
+"broken state, so you should not blindly disable this option as the mentioned "
"scenario above is not the only problem immediate configuration can help to "
"prevent in the first place. Before a big operation like <literal>dist-"
"upgrade</literal> is run with this option disabled it should be tried to "
@@ -6003,14 +6097,44 @@ msgid ""
"distribution and to the APT team with the buglink below so they can work on "
"improving or correcting the upgrade process."
msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:181
+"La valeur par défaut de ce réglage est « on » ce qui conduira APT à installer "
+"les paquets essentiels et importants dès que possible pendant les opérations "
+"d'installation ou de mise à jour. Cela permet de limiter les conséquences de "
+"l'échec d'un appel à &dpkg; : si cette option est désactivée, APT gérera un "
+"paquet important de la même manière qu'un paquet « extra » ; entre le "
+"dépaquetage du paquet important A et sa configuration pourront prendre place "
+"de nombreux autres opérations de dépaquetage ou de configuration. Ainsi, si "
+"le paquet B, qui n'a pas de rapport avec A, provoque une erreur de &dpkg; "
+"(p. ex. en cas d'erreur dans les scripts du responsable), le paquet A sera "
+"alors dans l'état installé mais non configuré et chaque paquet qui en dépend "
+"ne fonctionnera plus nécessairement puisque sa dépendance n'est pas "
+"satisfaite. Le marqueur de configuration immédiate sera aussi utilisé pour "
+"toute dépendance qui peut créer un problème, par exemple les dépendances "
+"circulaires. En effet, les marqueur de configuration immédiate revient à "
+"gérer une pré-dépendance. Il est donc possible, en théorie, qu'APT rencontre "
+"une situation où il lui est impossible d'effectuer la configuration "
+"immédiate, qu'il se termine alors avec une erreur en faisant référence à "
+"cette option afin que l'utilisateur puisse la désactiver temporairement pour "
+"retenter l'opération d'installation ou de mise à jour. Il est à noter que "
+"« en théorie » indique ici que cette situation n'a été rencontrée que dans de "
+"rares cas, sur des versions instables de distributions, la cause étant des "
+"dépendances incorrectes ou un système déjà dans un état instable. Il est "
+"donc déconseillé de désactiver cette option sans réfléchir car la situation "
+"décrite précédemmebnt n'est qu'un des cas où la configuration immédiate "
+"permet de résoudre des situations complexes. Avant de tenter une opération "
+"telle que <literal>dist-upgrade</literal> avec cette option désactivée, il "
+"est largement préférable d'essayer une opération <literal>install</literal> "
+"sur le paquet qu'APT ne peut configurer immédiatement. Il est également "
+"conseillé de signaler ce type de problème dans le système de suivi de bogues "
+"de la distribution utilisée afin qu'il soit étudié et corrigé."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.conf.5.xml:192
msgid "Force-LoopBreak"
msgstr "Force-LoopBreak"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:182
+#: apt.conf.5.xml:193
msgid ""
"Never Enable this option unless you -really- know what you are doing. It "
"permits APT to temporarily remove an essential package to break a Conflicts/"
@@ -6022,45 +6146,45 @@ msgstr ""
"Ne jamais activer cette option à moins que vous ne sachiez - réellement - ce "
"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."
+"Pre-Depends entre deux paquets essentiels. Une telle boucle ne devrait "
+"jamais se produire : c'est un bogue très important. 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:190
+#: apt.conf.5.xml:201
msgid "Cache-Limit"
msgstr "Cache-Limit"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:191
+#: apt.conf.5.xml:202
msgid ""
"APT uses a fixed size memory mapped cache file to store the 'available' "
"information. This sets the size of that cache (in bytes)."
msgstr ""
"APT utilise un fichier de cache chargé en mémoire avec mmap pour ranger les "
"informations sur les paquets disponibles. Cette option fixe la taille "
-"mémoire allouée pour le chargement de ce cache."
+"mémoire allouée (en octets) pour le chargement de ce cache."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:195
+#: apt.conf.5.xml:206
msgid "Build-Essential"
msgstr "Build-Essential"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:196
+#: apt.conf.5.xml:207
msgid "Defines which package(s) are considered essential build dependencies."
msgstr ""
"Cette option définit les paquets qui sont considérés comme faisant partie "
"des dépendances essentielles pour la construction de paquets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:210
msgid "Get"
msgstr "Get"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:200
+#: apt.conf.5.xml:211
msgid ""
"The Get subsection controls the &apt-get; tool, please see its documentation "
"for more information about the options here."
@@ -6070,12 +6194,12 @@ msgstr ""
"question."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:204
+#: apt.conf.5.xml:215
msgid "Cache"
msgstr "Cache"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:205
+#: apt.conf.5.xml:216
msgid ""
"The Cache subsection controls the &apt-cache; tool, please see its "
"documentation for more information about the options here."
@@ -6085,12 +6209,12 @@ msgstr ""
"options en question."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:209
+#: apt.conf.5.xml:220
msgid "CDROM"
msgstr "CDROM"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:210
+#: apt.conf.5.xml:221
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool, please see its "
"documentation for more information about the options here."
@@ -6100,17 +6224,17 @@ msgstr ""
"options en question."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:216
+#: apt.conf.5.xml:227
msgid "The Acquire Group"
msgstr "Le groupe Acquire"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:232
msgid "PDiffs"
msgstr "PDiffs"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:222
+#: apt.conf.5.xml:233
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for Packages or "
"Sources files instead of downloading whole ones. True by default."
@@ -6119,13 +6243,24 @@ msgstr ""
"literal> pour les paquets ou les fichiers sources, plutôt que de les "
"télécharger entièrement. Par défaut à « true »."
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:236
+msgid ""
+"Two sub-options to limit the use of PDiffs are also available: With "
+"<literal>FileLimit</literal> can be specified how many PDiff files are "
+"downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
+"other hand is the maximum precentage of the size of all patches compared to "
+"the size of the targeted file. If one of these limits is exceeded the "
+"complete file is downloaded instead of the patches."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:227
+#: apt.conf.5.xml:245
msgid "Queue-Mode"
msgstr "Queue-Mode"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:228
+#: apt.conf.5.xml:246
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
"literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -6134,19 +6269,19 @@ msgid ""
"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 "
+"valeurs <literal>host</literal> ou <literal>access</literal>, ce qui "
"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:235
+#: apt.conf.5.xml:253
msgid "Retries"
msgstr "Retries"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:254
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
@@ -6156,12 +6291,12 @@ msgstr ""
"échoué."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:240
+#: apt.conf.5.xml:258
msgid "Source-Symlinks"
msgstr "Source-Symlinks"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:241
+#: apt.conf.5.xml:259
msgid ""
"Use symlinks for source archives. If set to true then source archives will "
"be symlinked when possible instead of copying. True is the default."
@@ -6171,20 +6306,12 @@ msgstr ""
"archives de sources au lieu de les copier. Par défaut à « true »."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:245 sources.list.5.xml:139
+#: apt.conf.5.xml:263 sources.list.5.xml:139
msgid "http"
msgstr "http"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:246
-#, fuzzy
-#| msgid ""
-#| "HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
-#| "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. "
-#| "Per host proxies can also be specified by using the form <literal>http::"
-#| "Proxy::&lt;host&gt;</literal> with the special keyword <literal>DIRECT</"
-#| "literal> meaning to use no proxies. The <envar>http_proxy</envar> "
-#| "environment variable will override all settings."
+#: apt.conf.5.xml:264
msgid ""
"HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
"standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@ -6194,16 +6321,17 @@ msgid ""
"<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://"
+"[[utilisateur][:mot_de_passe]@]hôte[: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. Si aucun des paramètres précédents n'est défini, 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:254
+#: apt.conf.5.xml:272
msgid ""
"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
"caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@ -6222,32 +6350,24 @@ msgstr ""
"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 "
+"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:264 apt.conf.5.xml:328
+#: apt.conf.5.xml:282 apt.conf.5.xml:346
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method, this applies to all things including connection timeout and data "
"timeout."
msgstr ""
-"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."
+"L'option <literal>timeout</literal> positionne le compteur d'expiration du "
+"délai (timeout) utilisé par la méthode. Cela vaut pour tout, connexion et "
+"données."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:267
-#, fuzzy
-#| msgid ""
-#| "One setting is provided to control the pipeline depth in cases where the "
-#| "remote server is not RFC conforming or buggy (such as Squid 2.0.2) "
-#| "<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to "
-#| "5 indicating how many outstanding requests APT should send. A value of "
-#| "zero MUST be specified if the remote host does not properly linger on TCP "
-#| "connections - otherwise data corruption will occur. Hosts which require "
-#| "this are in violation of RFC 2068."
+#: apt.conf.5.xml:285
msgid ""
"One setting is provided to control the pipeline depth in cases where the "
"remote server is not RFC conforming or buggy (such as Squid 2.0.2). "
@@ -6262,12 +6382,12 @@ msgstr ""
"(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 "
-"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."
+"correctement les connexions TCP, la valeur doit égale à 0. Dans le cas "
+"contraire, 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><listitem><para>
-#: apt.conf.5.xml:275
+#: apt.conf.5.xml:293
msgid ""
"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
"literal> which accepts integer values in kilobyte. The default value is 0 "
@@ -6275,27 +6395,31 @@ msgid ""
"bandwidth (Note that this option implicit deactivates the download from "
"multiple servers at the same time.)"
msgstr ""
+"La bande passante utilisée peut être limité avec <literal>Acquire::http::Dl-"
+"Limit</literal> qui peut prendre une valeur entière, l'unité utilisée étant "
+"le kilo-octet. La valeur par défaut est 0, ce qui correspond à aucune "
+"limitation de bande passante. Veuillez noter que cette option désactive "
+"implicitement le téléchargement simultané depuis plusieurs serveurs."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:280
+#: apt.conf.5.xml:298
msgid ""
"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
"User-Agent for the http download method as some proxies allow access for "
"clients only if the client uses a known identifier."
msgstr ""
+"L'option <literal>Acquire::http::User-Agent</literal> peut être utilisée "
+"pour envoyer une valeur User-Agent modifiée pour les téléchargements HTTP, "
+"ce qui peut par exemple être utile avec certains mandataires HTTP qui "
+"n'autorisent l'accès qu'aux client s'identifiant de manière spécifique.."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:286
+#: apt.conf.5.xml:304
msgid "https"
msgstr "https"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:287
-#, fuzzy
-#| msgid ""
-#| "HTTPS URIs. Cache-control and proxy options are the same as for "
-#| "<literal>http</literal> method. <literal>Pipeline-Depth</literal> option "
-#| "is not supported yet."
+#: apt.conf.5.xml:305
msgid ""
"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
"options are the same as for <literal>http</literal> method and will also "
@@ -6303,12 +6427,15 @@ msgid ""
"not explicitly set for https. <literal>Pipeline-Depth</literal> option is "
"not supported yet."
msgstr ""
-"URI HTTPS. Les options de contrôle de cache et de mandataire (proxy) sont "
-"les mêmes que pour la méthode <literal>http</literal>. L'option "
-"<literal>Pipeline-Depth</literal> n'est pas encore supportée."
+"URI HTTPS. Les options de contrôle de cache, de délai limite, d'autorisation "
+"de redirection, de Dl-Limit et de mandataire (proxy) sont les mêmes que pour "
+"la méthode <literal>http</literal>. Les valeurs par défaut sont les mêmes "
+"que pour l'option <literal>http</literal> sauf si des valeurs spécifiques à "
+"https sont indiquées. L'option <literal>Pipeline-Depth</literal> n'est pas "
+"encore gérée."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:311
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -6328,7 +6455,7 @@ msgid ""
"option."
msgstr ""
"La sous-option <literal>CaInfo</literal> spécifie le fichier contenant les "
-"informations sur les certificats de confiance. La sous-option booléenne "
+"informations sur les certificats de confiance. La sous-option booléenne "
"<literal>Verify-Peer</literal> précise si le certificat d'hôte du serveur "
"doit être confronté aux certificats de confiance ou pas. La sous-option "
"booléenne <literal>Verify-Host</literal> précise s'il faut vérifier ou pas "
@@ -6340,25 +6467,12 @@ msgstr ""
"ou 'SSLv3'."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:311 sources.list.5.xml:150
+#: apt.conf.5.xml:329 sources.list.5.xml:150
msgid "ftp"
msgstr "ftp"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:312
-#, 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."
+#: apt.conf.5.xml:330
msgid ""
"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@ -6380,20 +6494,20 @@ msgstr ""
"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."
+"n'utiliser aucun mandataire pour l'hôte. Si aucun des paramètres précédents "
+"n'est définis, 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:331
+#: apt.conf.5.xml:349
msgid ""
"Several settings are provided to control passive mode. Generally it is safe "
"to leave passive mode on, it works in nearly every environment. However "
@@ -6410,7 +6524,7 @@ msgstr ""
"modèle de fichier de configuration)."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:338
+#: apt.conf.5.xml:356
msgid ""
"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
"envar> environment variable to a http url - see the discussion of the http "
@@ -6421,11 +6535,11 @@ msgstr ""
"positionnant la variable d'environnement <envar>ftp_proxy</envar> à une URL "
"HTTP -- consultez la méthode http ci-dessus pour la syntaxe. On ne peut pas "
"le faire dans le fichier de configuration et il n'est de toute façon pas "
-"recommandé d'utiliser FTP au travers de HTTP en raison la faible efficacité "
-"de cette méthode."
+"recommandé d'utiliser FTP au travers de HTTP en raison de la faible "
+"efficacité de cette méthode."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:343
+#: apt.conf.5.xml:361
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -6441,19 +6555,18 @@ msgstr ""
"des serveurs FTP ne suivent pas la RFC 2428."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:350 sources.list.5.xml:132
+#: apt.conf.5.xml:368 sources.list.5.xml:132
msgid "cdrom"
msgstr "cdrom"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:356
-#, fuzzy, no-wrap
-#| msgid "\"/cdrom/\"::Mount \"foo\";"
+#: apt.conf.5.xml:374
+#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
-msgstr "\"/cdrom/\"::Mount \"foo\";"
+msgstr "/cdrom/::Mount \"foo\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:369
msgid ""
"CDROM URIs; the only setting for CDROM URIs is the mount point, "
"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@ -6467,20 +6580,20 @@ 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</"
+"D'autres commandes de montage et de démontage peuvent être fournies 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:361
+#: apt.conf.5.xml:379
msgid "gpgv"
msgstr "gpgv"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:362
+#: apt.conf.5.xml:380
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
@@ -6491,18 +6604,18 @@ msgstr ""
"supplémentaires passées à gpgv."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:385
msgid "CompressionTypes"
-msgstr ""
+msgstr "CompressionTypes"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:373
+#: apt.conf.5.xml:391
#, no-wrap
msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
-msgstr ""
+msgstr "Acquire::CompressionTypes::<replaceable>ExtensionFichier</replaceable> \"<replaceable>NomMethode</replaceable>\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:368
+#: apt.conf.5.xml:386
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -6512,21 +6625,29 @@ msgid ""
"the fly or the used method can be changed. The syntax for this is: "
"<placeholder type=\"synopsis\" id=\"0\"/>"
msgstr ""
+"Cette option indique la liste des types de compression comprises par les "
+"méthodes d'acquisition. Des fichiers comme <filename>Packages</filename> "
+"peuvent être disponibles dans divers formats de compression. Par défaut, les "
+"méthodes d'acquisition décompressent les fichiers compressés avec "
+"<command>bzip2</command>, <command>lzma</command> et <command>gzip</"
+"command>. Ce réglage permet d'ajouter à la volée des formats supplémentaires "
+"ou de modifier la méthode utilisée. La syntaxe à utiliser est : <placeholder "
+"type=\"synopsis\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:378
+#: apt.conf.5.xml:396
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
-msgstr ""
+msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:381
+#: apt.conf.5.xml:399
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
-msgstr ""
+msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:374
+#: apt.conf.5.xml:392
msgid ""
"Also the <literal>Order</literal> subgroup can be used to define in which "
"order the acquire system will try to download the compressed files. The "
@@ -6541,15 +6662,29 @@ msgid ""
"<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 ""
+"Le sous-groupe <literal>Order</literal> peut être également utilisé pour "
+"définir l'ordre dans lequel le système d'acquisition tentera de télécharger "
+"les fichiers compressés. Le premier système mentionné sera essayé en "
+"premier, puis le suivant en cas d'échec. Ainsi, pour privilégier un format "
+"par rapport à un autre, il suffit de le placer en premier dans cette liste. "
+"Les types par défaut qui ne sont pas déjà indiqués seront ajoutés en fin de "
+"liste au moment de l'exécution. Ainsi, par exemple, <placeholder type="
+"\"synopsis\" id=\"0\"/> peut être utiliser de préférence les fichiers "
+"compressés avec <command>gzip</command> par rapport à <command>bzip2</"
+"command> et <command>lzma</command>. Si l'objectif est d'utiliser "
+"<command>lzma</command> en priorité par rapport à <command>gzip</command> et "
+"<command>bzip2</command>, ce réglage doit ressembler à <placeholder type="
+"\"synopsis\" id=\"1\"/>. Il est inutile d'ajouter explicitement "
+"<literal>bz2</literal> à liste car il sera ajouté automatiquement."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:385
+#: apt.conf.5.xml:403
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
-msgstr ""
+msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:383
+#: apt.conf.5.xml:401
msgid ""
"Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
"replaceable></literal> will be checked: If this setting exists the method "
@@ -6562,9 +6697,20 @@ msgid ""
"will not override the defined list, it will only prefix the list with this "
"type."
msgstr ""
+"Veuillez noter qu'à l'exécution, <literal>Dir::Bin::<replaceable>Methodname</"
+"replaceable></literal> sera vérifié : si ce réglage existe, la méthode ne "
+"sera utilisée que si ce fichier existe. Ainsi, pour la méthode bzip2, le "
+"réglage (utilisé en interne) est <placeholder type=\"literallayout\" id=\"0"
+"\"/>. Veuillez également noter que les éléments de liste indiqués à la ligne "
+"de commande seront ajoutés à la fin de la liste indiquée dans les fichiers "
+"de configuration, mais avant les valeurs par défaut. Dans ce cas, pour "
+"établir une préférence par rapport aux types mentionnés dans les fichiers de "
+"configuration, il est possible de placer l'option directement, pas sous "
+"forme de liste. Cela ne remplacera pas la liste par défaut mais elle sera "
+"simplement préfixée avec l'option en question."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:408
msgid ""
"While it is possible to add an empty compression type to the order list, but "
"APT in its current version doesn't understand it correctly and will display "
@@ -6572,38 +6718,84 @@ msgid ""
"time false negatives. Future versions will maybe include a way to really "
"prefer uncompressed files to support the usage of local mirrors."
msgstr ""
+"Bien qu'il soit possible d'ajouter un type vide de compression à la liste "
+"ordonnée, APT ne l'interprétera pas correctement et affichera de nombreux "
+"messages d'avertissement à propos d'échec de téléchargement, qui sont le "
+"plus souvent des avertissements sans conséquences. Dans de futures versions, "
+"il deviendra réellement possible d'établir une préférence pour des fichiers "
+"non compressés afin de gérer des miroirs locaux."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:396
+#: apt.conf.5.xml:414
msgid "Languages"
-msgstr ""
+msgstr "Langues"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:397
+#: apt.conf.5.xml:415
+#, fuzzy
+#| msgid ""
+#| "The Languages subsection controls which <filename>Translation</filename> "
+#| "files are downloaded and in which order APT tries to display the "
+#| "Description-Translations. APT will try to display the first available "
+#| "Description for the Language which is listed at first. Languages can be "
+#| "defined with their short or long Languagecodes. Note that not all "
+#| "archives provide <filename>Translation</filename> files for every "
+#| "Language - especially the long Languagecodes are rare, so please inform "
+#| "you which ones are available before you set here impossible values."
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the Description-"
-"Translations. APT will try to display the first available Description for "
-"the Language which is listed at first. Languages can be defined with their "
-"short or long Languagecodes. Note that not all archives provide "
+"Translations. APT will try to display the first available Description in the "
+"Language which is listed at first. Languages can be defined with their short "
+"or long Languagecodes. Note that not all archives provide "
"<filename>Translation</filename> files for every Language - especially the "
"long Languagecodes are rare, so please inform you which ones are available "
"before you set here impossible values."
msgstr ""
+"La sous-section « Languages » contrôle quels fichiers <filename>Translation</"
+"filename> sont téléchargés et dans quel ordre APT les utilisera pour "
+"afficher les traductions de descriptions. APT recherchera d'abord la "
+"première traduction disponible pour le champ Description dans la langue "
+"choisie en premier. Les langues peuvent être indiquées par leur code long ou "
+"court. Veuillez noter que tous les dépôts ne fournissent pas les fichiers "
+"<filename>Translation</filename> pour toutes les langues, particulièrement "
+"pour les code de langues long sont rares. Il est donc conseillé de vous "
+"renseigner sur ce qui est disponible avant d'établir des réglages "
+"impossibles."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:413
+#: apt.conf.5.xml:431
#, no-wrap
msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
-msgstr ""
+msgstr "Acquire::Languages { \"environment\"; \"fr\"; \"en\"; \"none\"; \"de\"; };"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:421
+#, fuzzy
+#| msgid ""
+#| "The default list includes \"environment\" and \"en\". "
+#| "\"<literal>environment</literal>\" has a special meaning here: It will be "
+#| "replaced at runtime with the languagecodes extracted from the "
+#| "<literal>LC_MESSAGES</literal> enviroment variable. It will also ensure "
+#| "that these codes are not included twice in the list. If "
+#| "<literal>LC_MESSAGES</literal> is set to \"C\" only the "
+#| "<filename>Translation-en</filename> file (if available) will be used. To "
+#| "force apt to use no Translation file use the setting <literal>Acquire::"
+#| "Languages=none</literal>. \"<literal>none</literal>\" is another special "
+#| "meaning code which will stop the search for a fitting "
+#| "<filename>Translation</filename> file. This can be used by the system "
+#| "administrator to let APT know that it should download also this files "
+#| "without actually use them if not the environment specifies this "
+#| "languages. So the following example configuration will result in the "
+#| "order \"en, de\" in an english and in \"de, en\" in a german "
+#| "localization. Note that \"fr\" is downloaded, but not used if APT is not "
+#| "used in a french localization, in such an environment the order would be "
+#| "\"fr, de, en\". <placeholder type=\"programlisting\" id=\"0\"/>"
msgid ""
"The default list includes \"environment\" and \"en\". "
"\"<literal>environment</literal>\" has a special meaning here: It will be "
"replaced at runtime with the languagecodes extracted from the "
-"<literal>LC_MESSAGES</literal> enviroment variable. It will also ensure "
+"<literal>LC_MESSAGES</literal> environment variable. It will also ensure "
"that these codes are not included twice in the list. If "
"<literal>LC_MESSAGES</literal> is set to \"C\" only the "
"<filename>Translation-en</filename> file (if available) will be used. To "
@@ -6612,16 +6804,35 @@ msgid ""
"meaning code which will stop the search for a fitting <filename>Translation</"
"filename> file. This can be used by the system administrator to let APT "
"know that it should download also this files without actually use them if "
-"not the environment specifies this languages. So the following example "
+"the environment doesn't specify this languages. So the following example "
"configuration will result in the order \"en, de\" in an english and in \"de, "
"en\" in a german localization. Note that \"fr\" is downloaded, but not used "
"if APT is not used in a french localization, in such an environment the "
"order would be \"fr, de, en\". <placeholder type=\"programlisting\" id=\"0"
"\"/>"
msgstr ""
+"La liste par défaut contient « environment » and « en ». La valeur "
+"« environment » a une signification spéciale : elle sera remplacée, à "
+"l'exécution, par les codes de langues utilisés dans la variable "
+"d'environnement <literal>LC_MESSAGES</literal>. Les codes utilisés en double "
+"ne seront pas inclus deux fois dans la liste. Si <literal>LC_MESSAGES</"
+"literal> contient « C », seul le fichier <filename>Translation-en</filename> "
+"sera utilisé, s'il est disponible. Pour forcer APT à n'utiliser aucun "
+"fichier de traduction, il est nécessaire d'utiliser le réglage "
+"<literal>Acquire::Languages=none</literal>. La valeur « <literal>none</"
+"literal> » a une signification spéciale et indique de ne rechercher aucun "
+"fichier <filename>Translation</filename>. Cela permet à l'administrateur "
+"local d'indiquer à APT de télécharger des fichiers sans les utiliser si la "
+"variable d'environnement ne les comporte pas. Ainsi, dans l'exemple qui "
+"suit, l'ordre utilisé sera « en, fr » si dans un environnement configuré pour "
+"l'anglais et « fr, en » pour un environnement configuré en français. Les "
+"fichiers pour l'allemand seront également téléchargés mais ne sont utilisés "
+"que dans un environnement configuré pour l'allemand. Dans ce dernier cas, "
+"l'ordre est alors « de, fr, en ». <placeholder type=\"programlisting\" id=\"0"
+"\"/>"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:217
+#: apt.conf.5.xml:228
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>"
@@ -6631,12 +6842,12 @@ msgstr ""
"id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:438
msgid "Directories"
msgstr "Les répertoires"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:422
+#: apt.conf.5.xml:440
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -6656,7 +6867,7 @@ msgstr ""
"filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:429
+#: apt.conf.5.xml:447
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -6669,17 +6880,17 @@ msgid ""
msgstr ""
"<literal>Dir::Cache</literal> contient les emplacements qui renseignent sur "
"le cache local : par exemple, les deux caches de paquets "
-"<literal>srcpkgcache</literal> et <literal>pkgcache</literal>, et aussi "
+"<literal>srcpkgcache</literal> et <literal>pkgcache</literal>, ainsi que "
"l'endroit où sont placées les archives téléchargées, <literal>Dir::Cache::"
"archives</literal>. On peut empêcher la création des caches en saisissant un "
-"nom vide. Cela ralentit le démarrage mais sauve de l'espace disque. Il vaut "
-"mieux se passer du cache <literal>pkgcache</literal> plutôt que se passer du "
-"cache <literal>srcpkgcache</literal>. Comme pour <literal>Dir::State</"
-"literal>, le répertoire par défaut est contenu dans <literal>Dir::Cache</"
-"literal>."
+"nom vide. Cela ralentit le démarrage mais économise de l'espace disque. Il "
+"vaut mieux se passer du cache <literal>pkgcache</literal> plutôt que se "
+"passer du cache <literal>srcpkgcache</literal>. Comme pour <literal>Dir::"
+"State</literal>, le répertoire par défaut est contenu dans <literal>Dir::"
+"Cache</literal>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:438
+#: apt.conf.5.xml:456
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -6694,7 +6905,7 @@ msgstr ""
"fichier de configuration indiqué par la variable <envar>APT_CONFIG</envar>)."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:444
+#: apt.conf.5.xml:462
msgid ""
"The <literal>Dir::Parts</literal> setting reads in all the config fragments "
"in lexical order from the directory specified. After this is done then the "
@@ -6705,15 +6916,7 @@ msgstr ""
"configuration est chargé."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:448
-#, 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."
+#: apt.conf.5.xml:466
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -6724,13 +6927,14 @@ msgid ""
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>bzip2</literal>, "
+"<literal>lzma</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:456
+#: apt.conf.5.xml:474
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -6752,12 +6956,12 @@ msgstr ""
"staging/var/lib/dpkg/status</filename>."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:469
+#: apt.conf.5.xml:487
msgid "APT in DSelect"
msgstr "APT et DSelect"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:471
+#: apt.conf.5.xml:489
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -6768,12 +6972,12 @@ msgstr ""
"<literal>DSelect</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:475
+#: apt.conf.5.xml:493
msgid "Clean"
msgstr "Clean"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:476
+#: apt.conf.5.xml:494
msgid ""
"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
"and never. always and prompt will remove all packages from the cache after "
@@ -6791,7 +6995,7 @@ msgstr ""
"supprime avant de récupérer de nouveaux paquets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:485
+#: apt.conf.5.xml:503
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the install phase."
@@ -6800,12 +7004,12 @@ msgstr ""
"&apt-get; lors de la phase d'installation."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:489
+#: apt.conf.5.xml:507
msgid "Updateoptions"
msgstr "UpdateOptions"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:508
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the update phase."
@@ -6814,12 +7018,12 @@ msgstr ""
"&apt-get; lors de la phase de mise à jour."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:494
+#: apt.conf.5.xml:512
msgid "PromptAfterUpdate"
msgstr "PromptAfterUpdate"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:495
+#: apt.conf.5.xml:513
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
@@ -6829,12 +7033,12 @@ msgstr ""
"d'erreur que l'on propose à l'utilisateur d'intervenir."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:501
+#: apt.conf.5.xml:519
msgid "How APT calls dpkg"
msgstr "Méthode d'appel de &dpkg; par APT"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:520
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
@@ -6843,7 +7047,7 @@ msgstr ""
"&dpkg; : elles figurent dans la section <literal>DPkg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:507
+#: apt.conf.5.xml:525
msgid ""
"This is a list of options to pass to dpkg. The options must be specified "
"using the list notation and each list item is passed as a single argument to "
@@ -6854,17 +7058,17 @@ msgstr ""
"est passé comme un seul paramètre à &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:530
msgid "Pre-Invoke"
msgstr "Pre-Invoke"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:530
msgid "Post-Invoke"
msgstr "Post-Invoke"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:513
+#: apt.conf.5.xml:531
msgid ""
"This is a list of shell commands to run before/after invoking &dpkg;. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -6877,12 +7081,12 @@ msgstr ""
"<filename>/bin/sh</filename> : APT s'arrête dès que l'une d'elles échoue."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:519
+#: apt.conf.5.xml:537
msgid "Pre-Install-Pkgs"
msgstr "Pre-Install-Pkgs"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:520
+#: apt.conf.5.xml:538
msgid ""
"This is a list of shell commands to run before invoking dpkg. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -6898,7 +7102,7 @@ msgstr ""
"qu'il va installer, à raison d'un par ligne."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:526
+#: apt.conf.5.xml:544
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -6914,12 +7118,12 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:533
+#: apt.conf.5.xml:551
msgid "Run-Directory"
msgstr "Run-Directory"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:534
+#: apt.conf.5.xml:552
msgid ""
"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
"</filename>."
@@ -6928,12 +7132,12 @@ msgstr ""
"le répertoire <filename>/</filename>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:556
msgid "Build-options"
msgstr "Build-options"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:557
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages, the "
"default is to disable signing and produce all binaries."
@@ -6943,12 +7147,14 @@ msgstr ""
"créés."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:544
+#: apt.conf.5.xml:562
msgid "dpkg trigger usage (and related options)"
msgstr ""
+"utilisation des actions différées (« triggers ») de dpkg (et options "
+"associées)"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:545
+#: apt.conf.5.xml:563
msgid ""
"APT can call dpkg in a way so it can make aggressive use of triggers over "
"multiply calls of dpkg. Without further options dpkg will use triggers only "
@@ -6961,9 +7167,21 @@ msgid ""
"all frontends will currently stay around half (or more) of the time in the "
"100% state while it actually configures all packages."
msgstr ""
+"APT peut lancer dpkg pour utiliser les actions différées de manière "
+"agressive entre les appels successifs à dpkg. Sans options supplémentaires, "
+"dpkg n'utilisera les actions différées que dans le cadre de sa propre "
+"exécution. Si ces options sont utilisées, le temps d'exécution peut diminuer "
+"fortement dans les actions d'installation ou de mise à jour. Il est prévu de "
+"les activer par défaut dans le futur mais étant donné qu'elles changent "
+"notablement la méthode qu'utilise APT pour lancer dpkg, elles ont besoin "
+"d'importantes validations. <emphasis>Ces options sont donc expérimentales et "
+"ne devraient pas être utilisées avec des environnements de production.</"
+"emphasis>. Elles modifient également le suivi de progression et toutes les "
+"interfaces passeront la moitié du temps à un état terminé à 100% pendant la "
+"configuration des paquets."
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:578
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -6971,9 +7189,13 @@ msgid ""
"DPkg::ConfigurePending \"true\";\n"
"DPkg::TriggersPending \"true\";"
msgstr ""
+"DPkg::NoTriggers \"true\";\n"
+"PackageManager::Configure \"smart\";\n"
+"DPkg::ConfigurePending \"true\";\n"
+"DPkg::TriggersPending \"true\";"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:554
+#: apt.conf.5.xml:572
msgid ""
"Note that it is not guaranteed that APT will support these options or that "
"these options will not cause (big) trouble in the future. If you have "
@@ -6985,14 +7207,24 @@ msgid ""
"see e.g. <command>dpkg --audit</command>. A defensive option combination "
"would be <placeholder type=\"literallayout\" id=\"0\"/>"
msgstr ""
+"Veuillez noter que rien ne garantit qu'APT gérera encore ces options dans le "
+"futur ou qu'elles ne provoqueront pas de nombreux dégâts. Si vous avez bien "
+"compris les implications de ce choix et êtes suffisamment motivé(e) pour "
+"essayer ces options, il vous est donc possible de créer un nouveau fichier "
+"de configuration et essayer une combinaison de ces options. Veuillez "
+"signaler tout bogue, problèmes ou suggestions d'amélioration en prenant soin "
+"de mentionner les options utilisées. Utiliser l'aide apportée par dpkg peut "
+"également être utile pour le débogage, par exemple <command>dpkg --audit</"
+"command>. Une combinaison intéressante d'options pourrait être <placeholder "
+"type=\"literallayout\" id=\"0\"/>."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:584
msgid "DPkg::NoTriggers"
-msgstr ""
+msgstr "DPkg::NoTriggers"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:567
+#: apt.conf.5.xml:585
msgid ""
"Add the no triggers flag to all dpkg calls (except the ConfigurePending "
"call). See &dpkg; if you are interested in what this actually means. In "
@@ -7002,16 +7234,24 @@ msgid ""
"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 ""
+"Ajoute l'option « no-triggers » à tous les appels à dpkg (hormis l'appel "
+"« ConfigurePending »). Voir &dpkg; pour plus d'informations sur la "
+"signification de cette option. En résumé, dpkg n'effectuera pas les actions "
+"différées (« triggers ») si cette option est utilisée sauf si cela est "
+"demandé explicitement dans une invocation supplémentaire. Cette option "
+"existe en fait déjà (mais n'est pas documentée) dans de plus anciennes "
+"version d'APT avec une signification légèrement différente : elle n'ajoutait "
+"l'option « --no-triggers » qu'aux appels de dpkg avec « configure » alors que "
+"cela sera désormais utilisé également avec les appels à dpkg avec les "
+"options « unpack » et « remove »."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:574
-#, fuzzy
-#| msgid "Packages::Compress"
+#: apt.conf.5.xml:592
msgid "PackageManager::Configure"
-msgstr "Packages::Compress"
+msgstr "PackageManager::Configure"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:575
+#: apt.conf.5.xml:593
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
@@ -7025,14 +7265,26 @@ msgid ""
"value will implicitly activate also the next option per default as otherwise "
"the system could end in an unconfigured status which could be unbootable!"
msgstr ""
+"Les valeurs possibles sont « <literal>all</literal> », « <literal>smart</"
+"literal> » et « <literal>no</literal> ». La valeur par défaut est "
+"« <literal>all</literal> » où APT configure explicitement tous les paquets. "
+"La valeur « <literal>smart</literal> » permet de ne configurer que les "
+"paquets qui ont besoin de l'être avant la décompaction d'un autre paquet (à "
+"cause d'une pré-dépendance) ; les autres configurations sont laissées pour "
+"un appel ultérieur à dpkg. L'option « <literal>no</literal> » ne provoquera "
+"aucune configuration et s'en remettra totalement à dpkg pour ces opérations "
+"(ce qui échouera en cas de pré-dépendances). Si cette option est définie sur "
+"une valeur différente de « <literal>all</literal> », l'option suivante sera "
+"activée par défaut pour éviter de placer le système dans un état non "
+"configuré et donc éventuellement non amorçable."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:603
msgid "DPkg::ConfigurePending"
-msgstr ""
+msgstr "DPkg::ConfigurePending"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:586
+#: apt.conf.5.xml:604
msgid ""
"If this option is set apt will call <command>dpkg --configure --pending</"
"command> to let dpkg handle all required configurations and triggers. This "
@@ -7041,14 +7293,22 @@ msgid ""
"run APT multiple times in a row - e.g. in an installer. In these sceneries "
"you could deactivate this option in all but the last run."
msgstr ""
+"Si cette option est choisie, APT lancera <command>dpkg --configure --"
+"pending</command> pour laisser dpkg gérer les configurations de paquets et "
+"les actions différées. Cette option est automatiquement activée si l'option "
+"précédente a une valeur différente de « <literal>all</literal> ». Il peut par "
+"contre être utile de la désactiver pour lancer APT plusieurs fois "
+"successives, par exemple quand il est utilisé depuis un outil "
+"d'installation. Dans ce cas, seul le dernier de tous les appels successifs "
+"peut conserver l'option active."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:592
+#: apt.conf.5.xml:610
msgid "DPkg::TriggersPending"
-msgstr ""
+msgstr "DPkg::TriggersPending"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:593
+#: apt.conf.5.xml:611
msgid ""
"Useful for <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -7056,14 +7316,22 @@ msgid ""
"for Pre-Dependencies (see debbugs #526774). Note that this will process all "
"triggers, not only the triggers needed to configure this package."
msgstr ""
+"Cette option est utile pour la configuration en mode « <literal>smart</"
+"literal> ». En effet, un paquet qui a des actions différées (« triggers ») en "
+"attente n'est pas considéré comme installé (état « <literal>installed</"
+"literal> ») et dpkg le considère actuellement comme simplement décompacté "
+"(état « <literal>unpacked</literal> ») ce qui empêche une gestion correcte "
+"des pré-dépendances (voir le bogue Debian #526774). Veuillez noter que cette "
+"option provoquera la gestion de toutes les actions différées, pas seulement "
+"celles concernant le paquet en cours de traitement."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:616
msgid "PackageManager::UnpackAll"
-msgstr ""
+msgstr "PackageManager::UnpackAll"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:599
+#: apt.conf.5.xml:617
msgid ""
"As the configuration can be deferred to be done at the end by dpkg it can be "
"tried to order the unpack series only by critical needs, e.g. by Pre-"
@@ -7073,14 +7341,27 @@ msgid ""
"method is very experimental and needs further improvements before becoming "
"really useful."
msgstr ""
+"Cette option permet de ne trier les opérations de décompactage qu'en "
+"fonction de leur criticité (c'est à dire en ne considérant que les pré-"
+"dépendances) dans le cas où la configuration des paquets est différée pour "
+"n'être effectuée qu'à la fin par dpkg. Cette option est active par défaut, "
+"ce qui revient à la méthode traditionnelle où les opérations ont lieu en "
+"plusieurs étapes, selon l'ensemble des critères de tri. Bien que les deux "
+"méthodes existent même dans les versions, la méthode "
+"« <literal>OrderCritical</literal> » n'était pas utilisée. Elle doit donc "
+"être considérée comme très expérimentale et a besoin de nombreuses "
+"améliorations avant de devenir réellement utile. (Note du traducteur : la "
+"version originale de cette partie des pages de manuel est très confuse. Il "
+"est donc conseillé de s'y reporter en cas de doute car le contresens de "
+"traduction n'est pas exclu...)."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:606
+#: apt.conf.5.xml:624
msgid "OrderList::Score::Immediate"
-msgstr ""
+msgstr "OrderList::Score::Immediate"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:632
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -7090,9 +7371,15 @@ msgid ""
"\tPreDepends 50;\n"
"};"
msgstr ""
+"OrderList::Score {\n"
+"\tDelete 500;\n"
+"\tEssential 200;\n"
+"\tImmediate 10;\n"
+"\tPreDepends 50;\n"
+"};"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:625
msgid ""
"Essential packages (and there dependencies) should be configured immediately "
"after unpacking. It will be a good idea to do this quite early in the "
@@ -7104,14 +7391,26 @@ msgid ""
"change the scoring. The following example shows the settings with there "
"default values. <placeholder type=\"literallayout\" id=\"0\"/>"
msgstr ""
+"Les paquets essentiels (et leurs dépendances) devraient être configurés "
+"après avoir été décompressés. Il est conseillé que cette opération ait lieu "
+"le plus tôt possible dans le processus de mise à jour car ces opérations de "
+"configuration nécessitent également <literal>DPkg::TriggersPending</"
+"literal>, ce qui peut conduire à l'exécution de certains actions différées "
+"qui ne sont pas nécessairement utiles. Les paquets essentiels obtiennent par "
+"défaut un score élevé mais le marqueur « immédiat » implique un score assez "
+"bas (par exemple un paquet qui comporte des prédépendances obtient un score "
+"plus élevé). Cette option et les options du même groupe permettent de "
+"modifier la façon d'attribuer un score. L'exemple ci-dessous indique ces "
+"réglages avec leurs valeurs par défaut. <placeholder type=\"literallayout\" "
+"id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:627
+#: apt.conf.5.xml:645
msgid "Periodic and Archives options"
msgstr "Options « Periodic » et « Archive »"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:628
+#: apt.conf.5.xml:646
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -7123,12 +7422,12 @@ msgstr ""
"script <literal>/etc/cron.daily/apt</literal>, lancé quotidiennement."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:636
+#: apt.conf.5.xml:654
msgid "Debug options"
msgstr "Les options de débogage"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:638
+#: apt.conf.5.xml:656
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -7146,7 +7445,7 @@ msgstr ""
"peuvent tout de même être utiles :"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:667
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -7157,7 +7456,7 @@ msgstr ""
"upgrade, upgrade, install, remove et purge</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:657
+#: apt.conf.5.xml:675
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -7169,7 +7468,7 @@ msgstr ""
"superutilisateur."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:666
+#: apt.conf.5.xml:684
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -7179,9 +7478,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:674
+#: apt.conf.5.xml:692
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CDROM IDs."
@@ -7190,62 +7489,59 @@ msgstr ""
"type statfs dans les identifiants de CD."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:702
msgid "A full list of debugging options to apt follows."
msgstr "Liste complète des options de débogage de APT :"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:689
+#: apt.conf.5.xml:707
msgid "<literal>Debug::Acquire::cdrom</literal>"
msgstr "<literal>Debug::Acquire::cdrom</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:693
-msgid ""
-"Print information related to accessing <literal>cdrom://</literal> sources."
+#: apt.conf.5.xml:711
+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:700
+#: apt.conf.5.xml:718
msgid "<literal>Debug::Acquire::ftp</literal>"
msgstr "<literal>Debug::Acquire::ftp</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:704
+#: apt.conf.5.xml:722
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:711
+#: apt.conf.5.xml:729
msgid "<literal>Debug::Acquire::http</literal>"
msgstr "<literal>Debug::Acquire::http</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:733
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:722
+#: apt.conf.5.xml:740
msgid "<literal>Debug::Acquire::https</literal>"
msgstr "<literal>Debug::Acquire::https</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:744
msgid "Print information related to downloading packages using HTTPS."
msgstr "Print information related to downloading packages using HTTPS."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:751
msgid "<literal>Debug::Acquire::gpgv</literal>"
msgstr "<literal>Debug::Acquire::gpgv</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:755
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
@@ -7254,12 +7550,12 @@ msgstr ""
"cryptographiques avec <literal>gpg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:744
+#: apt.conf.5.xml:762
msgid "<literal>Debug::aptcdrom</literal>"
msgstr "<literal>Debug::aptcdrom</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:748
+#: apt.conf.5.xml:766
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
@@ -7268,24 +7564,24 @@ msgstr ""
"stockées sur CD."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:755
+#: apt.conf.5.xml:773
msgid "<literal>Debug::BuildDeps</literal>"
msgstr "<literal>Debug::BuildDeps</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:776
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
"Décrit le processus de résolution des dépendances pour la construction de "
"paquets source ( « build-dependencies » ) par &apt-get;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:783
msgid "<literal>Debug::Hashes</literal>"
msgstr "<literal>Debug::Hashes</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:768
+#: apt.conf.5.xml:786
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
@@ -7294,12 +7590,12 @@ msgstr ""
"librairies d'<literal>apt</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:775
+#: apt.conf.5.xml:793
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr "<literal>Debug::IdentCDROM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:778
+#: apt.conf.5.xml:796
msgid ""
"Do not include information from <literal>statfs</literal>, namely the number "
"of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -7310,12 +7606,12 @@ msgstr ""
"utilisés sur le système de fichier du CD."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:786
+#: apt.conf.5.xml:804
msgid "<literal>Debug::NoLocking</literal>"
msgstr "<literal>Debug::NoLocking</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:807
msgid ""
"Disable all file locking. For instance, this will allow two instances of "
"<quote><literal>apt-get update</literal></quote> to run at the same time."
@@ -7325,24 +7621,24 @@ msgstr ""
"temps."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:815
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr "<literal>Debug::pkgAcquire</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:819
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
"Trace les ajouts et suppressions d'éléments de la queue globale de "
"téléchargement."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:808
+#: apt.conf.5.xml:826
msgid "<literal>Debug::pkgAcquire::Auth</literal>"
msgstr "<literal>Debug::pkgAcquire::Auth</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:811
+#: apt.conf.5.xml:829
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
@@ -7352,12 +7648,12 @@ msgstr ""
"éventuelles."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:818
+#: apt.conf.5.xml:836
msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
msgstr "<literal>Debug::pkgAcquire::Diffs</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:821
+#: apt.conf.5.xml:839
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
@@ -7367,12 +7663,12 @@ msgstr ""
"éventuelles."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:829
+#: apt.conf.5.xml:847
msgid "<literal>Debug::pkgAcquire::RRed</literal>"
msgstr "<literal>Debug::pkgAcquire::RRed</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:833
+#: apt.conf.5.xml:851
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
@@ -7382,25 +7678,24 @@ msgstr ""
"place des fichiers complets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:840
+#: apt.conf.5.xml:858
msgid "<literal>Debug::pkgAcquire::Worker</literal>"
msgstr "<literal>Debug::pkgAcquire::Worker</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:844
-msgid ""
-"Log all interactions with the sub-processes that actually perform downloads."
+#: apt.conf.5.xml:862
+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:851
+#: apt.conf.5.xml:869
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr "<literal>Debug::pkgAutoRemove</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:873
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
@@ -7409,12 +7704,12 @@ msgstr ""
"automatiquement, et la suppression des paquets inutiles."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:862
+#: apt.conf.5.xml:880
msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:883
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -7429,12 +7724,12 @@ msgstr ""
"de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:876
+#: apt.conf.5.xml:894
msgid "<literal>Debug::pkgDepCache::Marker</literal>"
msgstr "<literal>Debug::pkgDepCache::Marker</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:897
msgid ""
"Generate debug messages describing which package is marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -7469,24 +7764,24 @@ msgstr ""
"de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:898
+#: apt.conf.5.xml:916
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr "<literal>Debug::pkgInitConfig</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:901
+#: apt.conf.5.xml:919
msgid "Dump the default configuration to standard error on startup."
msgstr ""
"Affiche, au lancement, l'ensemble de la configuration sur la sortie d'erreur "
"standard."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:908
+#: apt.conf.5.xml:926
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr "<literal>Debug::pkgDPkgPM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:911
+#: apt.conf.5.xml:929
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
@@ -7495,12 +7790,12 @@ msgstr ""
"paramètres sont séparés par des espaces."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:919
+#: apt.conf.5.xml:937
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:922
+#: apt.conf.5.xml:940
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
@@ -7510,12 +7805,12 @@ msgstr ""
"fichier."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:947
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr "<literal>Debug::pkgOrderList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:933
+#: apt.conf.5.xml:951
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
@@ -7524,33 +7819,32 @@ msgstr ""
"<literal>apt</literal> passe les paquets à &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:941
+#: apt.conf.5.xml:959
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr "<literal>Debug::pkgPackageManager</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:945
-msgid ""
-"Output status messages tracing the steps performed when invoking &dpkg;."
+#: apt.conf.5.xml:963
+msgid "Output status messages tracing the steps performed when invoking &dpkg;."
msgstr "Affiche le détail des opérations liées à l'invocation de &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:952
+#: apt.conf.5.xml:970
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr "<literal>Debug::pkgPolicy</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:974
msgid "Output the priority of each package list on startup."
msgstr "Affiche, au lancement, la priorité de chaque liste de paquets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:962
+#: apt.conf.5.xml:980
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr "<literal>Debug::pkgProblemResolver</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:966
+#: apt.conf.5.xml:984
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
@@ -7559,12 +7853,12 @@ msgstr ""
"concerne que les cas où un problème de dépendances complexe se présente)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:974
+#: apt.conf.5.xml:992
msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:977
+#: apt.conf.5.xml:995
msgid ""
"Display a list of all installed packages with their calculated score used by "
"the pkgProblemResolver. The description of the package is the same as "
@@ -7575,12 +7869,12 @@ msgstr ""
"est décrite dans <literal>Debug::pkgDepCache::Marker</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:985
+#: apt.conf.5.xml:1003
msgid "<literal>Debug::sourceList</literal>"
msgstr "<literal>Debug::sourceList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:989
+#: apt.conf.5.xml:1007
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
@@ -7589,7 +7883,7 @@ msgstr ""
"list</filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1012
+#: apt.conf.5.xml:1030
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -7598,19 +7892,17 @@ msgstr ""
"exemples pour toutes les options existantes."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1019
-#, fuzzy
-#| msgid "&apt-conf;"
+#: apt.conf.5.xml:1037
msgid "&file-aptconf;"
-msgstr "&apt-conf;"
+msgstr "&file-aptconf;"
-#. ? reading apt.conf
+#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:1042
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>"
@@ -7628,19 +7920,16 @@ msgstr "Fichier de contrôle des préférences pour APT"
#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:34
-#, fuzzy
-#| msgid ""
-#| "The APT preferences file <filename>/etc/apt/preferences</filename> can be "
-#| "used to control which versions of packages will be selected for "
-#| "installation."
msgid ""
"The APT preferences file <filename>/etc/apt/preferences</filename> and the "
"fragment files in the <filename>/etc/apt/preferences.d/</filename> folder "
"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."
+"Le fichier d'APT, <filename>/etc/apt/preferences</filename> et les fichiers "
+"fragments situés dans le dossier <filename>/etc/apt/preferences.d/</"
+"filename>, peuvent être utilisé pour choisir la version des paquets que l'on "
+"veut installer."
#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:39
@@ -7679,25 +7968,36 @@ msgstr ""
"&sources-list;. Le fichier des préférences n'influe pas sur le choix des "
"exemplaires, seulement sur le choix de la version."
-#. type: Content of: <refentry><refsect1><refsect2><title>
+#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:56
+msgid ""
+"Note that the files in the <filename>/etc/apt/preferences.d</filename> "
+"directory are parsed in alphanumeric ascending order and need to obey the "
+"following naming convention: The files have no or \"<literal>pref</literal>"
+"\" as filename extension and which only contain alphanumeric, hyphen (-), "
+"underscore (_) and period (.) characters - otherwise they will be silently "
+"ignored."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt_preferences.5.xml:63
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:71
+#: apt_preferences.5.xml:78
#, 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:74
+#: apt_preferences.5.xml:81
#, 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:58
+#: apt_preferences.5.xml:65
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 "
@@ -7722,22 +8022,22 @@ msgstr ""
"\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:83
+#: apt_preferences.5.xml:90
msgid "priority 100"
msgstr "une priorité égale à 100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:84
+#: apt_preferences.5.xml:91
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:88
+#: apt_preferences.5.xml:95
msgid "priority 500"
msgstr "une priorité égale à 500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:89
+#: apt_preferences.5.xml:96
msgid ""
"to the versions that are not installed and do not belong to the target "
"release."
@@ -7746,20 +8046,19 @@ msgstr ""
"pas à la distribution par défaut."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:93
+#: apt_preferences.5.xml:100
msgid "priority 990"
msgstr "une priorité égale à 990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:94
-msgid ""
-"to the versions that are not installed and belong to the target release."
+#: apt_preferences.5.xml:101
+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:78
+#: apt_preferences.5.xml:85
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: "
@@ -7770,7 +8069,7 @@ msgstr ""
"type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:99
+#: apt_preferences.5.xml:106
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 "
@@ -7781,7 +8080,7 @@ msgstr ""
"une priorité égale à 500 à tout version non installée."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml:110
msgid ""
"APT then applies the following rules, listed in order of precedence, to "
"determine which version of a package to install."
@@ -7790,7 +8089,7 @@ msgstr ""
"qu'il faut installer (par ordre de priorité) :"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:106
+#: apt_preferences.5.xml:113
msgid ""
"Never downgrade unless the priority of an available version exceeds 1000. "
"(\"Downgrading\" is installing a less recent version of a package in place "
@@ -7806,12 +8105,12 @@ msgstr ""
"arrière."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:112
+#: apt_preferences.5.xml:119
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:113
+#: apt_preferences.5.xml:120
msgid ""
"If two or more versions have the same priority, install the most recent one "
"(that is, the one with the higher version number)."
@@ -7820,7 +8119,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:116
+#: apt_preferences.5.xml:123
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</"
@@ -7832,7 +8131,7 @@ msgstr ""
"qui n'est pas installée."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:122
+#: apt_preferences.5.xml:129
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 "
@@ -7847,7 +8146,7 @@ msgstr ""
"replaceable></command> ou <command>apt-get dist-upgrade</command>."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml:136
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 "
@@ -7860,7 +8159,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:134
+#: apt_preferences.5.xml:141
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 "
@@ -7879,12 +8178,12 @@ msgstr ""
"priorité que celle de la version installée."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:143
+#: apt_preferences.5.xml:150
msgid "The Effect of APT Preferences"
msgstr "Conséquences des préférences"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:145
+#: apt_preferences.5.xml:152
msgid ""
"The APT preferences file allows the system administrator to control the "
"assignment of priorities. The file consists of one or more multi-line "
@@ -7897,7 +8196,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:151
+#: apt_preferences.5.xml:158
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 "
@@ -7912,7 +8211,7 @@ 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:158
+#: apt_preferences.5.xml:165
#, no-wrap
msgid ""
"Package: perl\n"
@@ -7924,7 +8223,7 @@ msgstr ""
"Pin-Priority: 1001\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:164
+#: apt_preferences.5.xml:171
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 "
@@ -7939,7 +8238,7 @@ msgstr ""
"un nom complètement qualifié."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:170
+#: apt_preferences.5.xml:177
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 "
@@ -7950,7 +8249,7 @@ 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:175
+#: apt_preferences.5.xml:182
#, no-wrap
msgid ""
"Package: *\n"
@@ -7962,7 +8261,7 @@ msgstr ""
"Pin-Priority: 999\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:180
+#: apt_preferences.5.xml:187
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 "
@@ -7977,7 +8276,7 @@ msgstr ""
"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:186
+#: apt_preferences.5.xml:193
msgid ""
"The following record assigns a low priority to all package versions "
"belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -7988,7 +8287,7 @@ msgstr ""
"<literal>unstable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:190
+#: apt_preferences.5.xml:197
#, no-wrap
msgid ""
"Package: *\n"
@@ -8000,7 +8299,7 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:195
+#: apt_preferences.5.xml:202
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is \"<literal>squeeze</literal>"
@@ -8011,7 +8310,7 @@ msgstr ""
"<literal>squeeze</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:199
+#: apt_preferences.5.xml:206
#, no-wrap
msgid ""
"Package: *\n"
@@ -8023,7 +8322,7 @@ msgstr ""
"Pin-Priority: 900\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:204
+#: apt_preferences.5.xml:211
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -8035,7 +8334,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:209
+#: apt_preferences.5.xml:216
#, no-wrap
msgid ""
"Package: *\n"
@@ -8047,17 +8346,17 @@ msgstr ""
"Pin-Priority: 500\n"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:220
+#: apt_preferences.5.xml:227
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:228
+#: apt_preferences.5.xml:235
msgid "P &gt; 1000"
msgstr "P &gt; 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:229
+#: apt_preferences.5.xml:236
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
@@ -8066,12 +8365,12 @@ msgstr ""
"retour en arrière."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:233
+#: apt_preferences.5.xml:240
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:234
+#: apt_preferences.5.xml:241
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
@@ -8081,12 +8380,12 @@ msgstr ""
"plus récente."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:239
+#: apt_preferences.5.xml:246
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:240
+#: apt_preferences.5.xml:247
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"
@@ -8095,12 +8394,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:245
+#: apt_preferences.5.xml:252
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:246
+#: apt_preferences.5.xml:253
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"
@@ -8109,29 +8408,29 @@ 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:251
+#: apt_preferences.5.xml:258
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:252
+#: apt_preferences.5.xml:259
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:256
+#: apt_preferences.5.xml:263
msgid "P &lt; 0"
msgstr "P &lt; 0"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:257
+#: apt_preferences.5.xml:264
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:223
+#: apt_preferences.5.xml:230
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -8142,7 +8441,7 @@ msgstr ""
"<placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:262
+#: apt_preferences.5.xml:269
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -8156,7 +8455,7 @@ msgstr ""
"trouvée détermine la priorité."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:268
+#: apt_preferences.5.xml:275
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
@@ -8165,7 +8464,7 @@ msgstr ""
"entrées décrites ci-dessous :"
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:272
+#: apt_preferences.5.xml:279
#, no-wrap
msgid ""
"Package: perl\n"
@@ -8193,12 +8492,12 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:285
+#: apt_preferences.5.xml:292
msgid "Then:"
msgstr "Alors :"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:294
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 "
@@ -8212,7 +8511,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:292
+#: apt_preferences.5.xml:299
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -8223,7 +8522,7 @@ msgstr ""
"appartenant à la distribution par défaut."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:296
+#: apt_preferences.5.xml:303
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</"
@@ -8236,13 +8535,12 @@ msgstr ""
"paquet n'est déjà installée."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:313
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:308
+#: apt_preferences.5.xml:315
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -8253,27 +8551,27 @@ msgstr ""
"décrivent les paquets disponibles à cet endroit."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:320
+#: apt_preferences.5.xml:327
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:321
+#: apt_preferences.5.xml:328
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:324 apt_preferences.5.xml:374
+#: apt_preferences.5.xml:331 apt_preferences.5.xml:381
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:325
+#: apt_preferences.5.xml:332
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:312
+#: apt_preferences.5.xml:319
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -8294,12 +8592,12 @@ msgstr ""
"\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:341
+#: apt_preferences.5.xml:348
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:342
+#: apt_preferences.5.xml:349
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -8316,18 +8614,18 @@ msgstr ""
"préférences demanderait cette ligne :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:352
+#: apt_preferences.5.xml:359
#, 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:358
+#: apt_preferences.5.xml:365
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:359
+#: apt_preferences.5.xml:366
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 "
@@ -8343,13 +8641,13 @@ msgstr ""
"préférences demanderait cette ligne :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:368
+#: apt_preferences.5.xml:375
#, 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:375
+#: apt_preferences.5.xml:382
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 "
@@ -8365,7 +8663,7 @@ msgstr ""
"préférences demanderait ces lignes :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:384
+#: apt_preferences.5.xml:391
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -8377,12 +8675,12 @@ msgstr ""
"Pin: release 3.0\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:393
+#: apt_preferences.5.xml:400
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:394
+#: apt_preferences.5.xml:401
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -8400,18 +8698,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:403
+#: apt_preferences.5.xml:410
#, 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:409
+#: apt_preferences.5.xml:416
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:410
+#: apt_preferences.5.xml:417
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8424,18 +8722,18 @@ msgstr ""
"ligne :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:416
+#: apt_preferences.5.xml:423
#, 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:422
+#: apt_preferences.5.xml:429
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:423
+#: apt_preferences.5.xml:430
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8448,13 +8746,13 @@ msgstr ""
"préférences demanderait cette ligne :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:429
+#: apt_preferences.5.xml:436
#, 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:330
+#: apt_preferences.5.xml:337
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -8476,7 +8774,7 @@ msgstr ""
"déterminer les priorités : <placeholder type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:436
+#: apt_preferences.5.xml:443
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -8501,12 +8799,12 @@ msgstr ""
"<literal>unstable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:449
+#: apt_preferences.5.xml:456
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:451
+#: apt_preferences.5.xml:458
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -8517,7 +8815,7 @@ msgstr ""
"commentaires."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:455
+#: apt_preferences.5.xml:462
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 "
@@ -8530,12 +8828,12 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:471
msgid "Tracking Stable"
msgstr "Méthode pour suivre Stable"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:472
+#: apt_preferences.5.xml:479
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -8559,7 +8857,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:466
+#: apt_preferences.5.xml:473
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 "
@@ -8574,8 +8872,8 @@ msgstr ""
"literal>. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:489 apt_preferences.5.xml:535
-#: apt_preferences.5.xml:593
+#: apt_preferences.5.xml:496 apt_preferences.5.xml:542
+#: apt_preferences.5.xml:600
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -8587,7 +8885,7 @@ msgstr ""
"apt-get dist-upgrade\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:484
+#: apt_preferences.5.xml:491
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 "
@@ -8600,13 +8898,13 @@ msgstr ""
"\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:501
+#: apt_preferences.5.xml:508
#, 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:495
+#: apt_preferences.5.xml:502
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -8619,12 +8917,12 @@ msgstr ""
"de relancer la commande. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:507
+#: apt_preferences.5.xml:514
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:516
+#: apt_preferences.5.xml:523
#, no-wrap
msgid ""
"Package: *\n"
@@ -8652,7 +8950,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:509
+#: apt_preferences.5.xml:516
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -8669,7 +8967,7 @@ msgstr ""
"<placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:530
+#: apt_preferences.5.xml:537
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 "
@@ -8682,13 +8980,13 @@ msgstr ""
"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:550
+#: apt_preferences.5.xml:557
#, 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:541
+#: apt_preferences.5.xml:548
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -8707,12 +9005,12 @@ msgstr ""
"installée. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:564
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:571
+#: apt_preferences.5.xml:578
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -8746,7 +9044,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:559
+#: apt_preferences.5.xml:566
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 "
@@ -8770,7 +9068,7 @@ msgstr ""
"exemples précédents. <placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:588
+#: apt_preferences.5.xml:595
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 "
@@ -8783,13 +9081,13 @@ msgstr ""
"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:608
+#: apt_preferences.5.xml:615
#, 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:599
+#: apt_preferences.5.xml:606
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -8808,14 +9106,12 @@ msgstr ""
"type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:617
-#, fuzzy
-#| msgid "apt_preferences"
+#: apt_preferences.5.xml:624
msgid "&file-preferences;"
-msgstr "apt_preferences"
+msgstr "&file-preferences;"
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:623
+#: apt_preferences.5.xml:630
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -8831,12 +9127,6 @@ msgstr "Liste des sources de paquets"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:34
-#, fuzzy
-#| msgid ""
-#| "The package resource list is used to locate archives of the package "
-#| "distribution system in use on the system. At this time, this manual page "
-#| "documents only the packaging system used by the Debian GNU/Linux system. "
-#| "This control file is located in <filename>/etc/apt/sources.list</filename>"
msgid ""
"The package resource list is used to locate archives of the package "
"distribution system in use on the system. At this time, this manual page "
@@ -8850,16 +9140,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:39
-#, fuzzy
-#| msgid ""
-#| "The source list is designed to support any number of active sources and a "
-#| "variety of source media. The file lists one source per line, with the "
-#| "most preferred source listed first. The format of each line is: "
-#| "<literal>type uri args</literal> The first item, <literal>type</literal> "
-#| "determines the format for <literal>args</literal> <literal>uri</literal> "
-#| "is a Universal Resource Identifier (URI), which is a superset of the more "
-#| "specific and well-known Universal Resource Locator, or URL. The rest of "
-#| "the line can be marked as a comment by using a #."
msgid ""
"The source list is designed to support any number of active sources and a "
"variety of source media. The file lists one source per line, with the most "
@@ -8870,15 +9150,15 @@ msgid ""
"Universal Resource Locator, or URL. The rest of the line can be marked as a "
"comment by using a #."
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 "
-"#."
+"La liste des sources est conçue pour gérer 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 paramètres</literal>. Le premier élément, <literal>type</"
+"literal>, détermine le format des <literal>paramètres</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:50
@@ -8910,17 +9190,6 @@ msgstr "Les types deb et deb-src."
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:61
-#, fuzzy
-#| msgid ""
-#| "The <literal>deb</literal> type describes a typical two-level Debian "
-#| "archive, <filename>distribution/component</filename>. Typically, "
-#| "<literal>distribution</literal> is generally one of <literal>stable</"
-#| "literal> <literal>unstable</literal> or <literal>testing</literal> while "
-#| "component is one of <literal>main</literal> <literal>contrib</literal> "
-#| "<literal>non-free</literal> or <literal>non-us</literal> The <literal>deb-"
-#| "src</literal> type describes a debian distribution's source code in the "
-#| "same form as the <literal>deb</literal> type. A <literal>deb-src</"
-#| "literal> line is required to fetch source indexes."
msgid ""
"The <literal>deb</literal> type describes a typical two-level Debian "
"archive, <filename>distribution/component</filename>. Typically, "
@@ -8938,23 +9207,19 @@ msgstr ""
"literal>, <literal>unstable</literal>, ou <literal>testing</literal>, et "
"composant : <literal>main</literal>, <literal>contrib</literal>, "
"<literal>non-free</literal>, ou <literal>non-us</literal>. Le type "
-"<literal>deb-src</literal> décrit le code source pour une distribution "
-"Debian dans le même format que le type <literal>deb</literal>. Une ligne "
-"<literal>deb-src</literal> est nécessaire pour récupérer les index des "
-"sources."
+"<literal>deb-src</literal> décrit une archive de distribution de code source "
+"pour une distribution Debian dans le même format que le type <literal>deb</"
+"literal>. Une ligne <literal>deb-src</literal> est nécessaire pour récupérer "
+"les index des sources."
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:73
-#, fuzzy
-#| msgid ""
-#| "The format for a <filename>sources.list</filename> entry using the "
-#| "<literal>deb</literal> and <literal>deb-src</literal> types are:"
msgid ""
"The format for a <filename>sources.list</filename> entry using the "
"<literal>deb</literal> and <literal>deb-src</literal> types is:"
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 :"
#. type: Content of: <refentry><refsect1><literallayout>
#: sources.list.5.xml:76
@@ -8964,16 +9229,6 @@ msgstr "deb uri distribution [composant1] [composant2] [...]"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:78
-#, fuzzy
-#| msgid ""
-#| "The URI for the <literal>deb</literal> type must specify the base of the "
-#| "Debian distribution, from which APT will find the information it needs. "
-#| "<literal>distribution</literal> can specify an exact path, in which case "
-#| "the components must be omitted and <literal>distribution</literal> must "
-#| "end with a slash (/). This is useful for when only a particular sub-"
-#| "section of the archive denoted by the URI is of interest. If "
-#| "<literal>distribution</literal> does not specify an exact path, at least "
-#| "one <literal>component</literal> must be present."
msgid ""
"The URI for the <literal>deb</literal> type must specify the base of the "
"Debian distribution, from which APT will find the information it needs. "
@@ -9100,14 +9355,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: sources.list.5.xml:141
-#, fuzzy
-#| msgid ""
-#| "The http scheme specifies an HTTP server for the archive. If an "
-#| "environment variable <envar>http_proxy</envar> is set with the format "
-#| "http://server:port/, the proxy server specified in <envar>http_proxy</"
-#| "envar> will be used. Users of authenticated HTTP/1.1 proxies may use a "
-#| "string of the format http://user:pass@server:port/ Note that this is an "
-#| "insecure method of authentication."
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -9187,21 +9434,42 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
#: sources.list.5.xml:178
-msgid "more recongnizable URI types"
-msgstr ""
+#, fuzzy
+#| msgid "more recongnizable URI types"
+msgid "more recognizable URI types"
+msgstr "type d'URI les plus simples à reconnaître"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: sources.list.5.xml:180
+#, fuzzy
+#| msgid ""
+#| "APT can be extended with more methods shipped in other optional packages "
+#| "which should follow the nameing scheme <literal>apt-transport-"
+#| "<replaceable>method</replaceable></literal>. The APT team e.g. maintain "
+#| "also the <literal>apt-transport-https</literal> package which provides "
+#| "access methods for https-URIs with features similiar to the http method, "
+#| "but other methods for using e.g. debtorrent are also available, see "
+#| "<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</"
+#| "filename></refentrytitle> <manvolnum>1</manvolnum></citerefentry>."
msgid ""
"APT can be extended with more methods shipped in other optional packages "
"which should follow the nameing scheme <literal>apt-transport-"
-"<replaceable>method</replaceable></literal>. The APT team e.g. maintain "
+"<replaceable>method</replaceable></literal>. The APT team e.g. maintains "
"also the <literal>apt-transport-https</literal> package which provides "
-"access methods for https-URIs with features similiar to the http method, but "
+"access methods for https-URIs with features similar to the http method, but "
"other methods for using e.g. debtorrent are also available, see "
"<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></"
"refentrytitle> <manvolnum>1</manvolnum></citerefentry>."
msgstr ""
+"APT peut être complété avec des méthodes supplémentaires fournies par des "
+"paquets optionnels dont le schéma de nommage est <literal>apt-transport-"
+"<replaceable>méthode</replaceable></literal>. Ainsi, l'équipe de "
+"maintenance d'APT gère un paquet <literal>apt-transport-https</literal> qui "
+"gère les accès par URI de type https, avec des fonctionnalités analogues à "
+"la méthode http. D'autres méthodes telles que debtorrent sont aussi "
+"disponibles (voir <citerefentry> <refentrytitle><filename>apt-transport-"
+"debtorrent</filename></refentrytitle> <manvolnum>1</manvolnum></"
+"citerefentry>)."
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:122
@@ -9283,12 +9551,6 @@ msgstr "deb ftp://ftp.debian.org/debian stable contrib"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:212
-#, fuzzy
-#| msgid ""
-#| "Uses FTP to access the archive at ftp.debian.org, under the debian "
-#| "directory, and uses only the unstable/contrib area. If this line appears "
-#| "as well as the one in the previous example in <filename>sources.list</"
-#| "filename>. a single FTP session will be used for both resource lines."
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 "
@@ -9354,28 +9616,29 @@ msgstr "&apt-cache; &apt-conf;"
#. type: <title></title>
#: guide.sgml:4
msgid "APT User's Guide"
-msgstr ""
+msgstr "Guide d'utilisation d'APT"
#. type: <author></author>
#: guide.sgml:6 offline.sgml:6
msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
-msgstr ""
+msgstr "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
#. type: <version></version>
#: guide.sgml:7
msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
-msgstr ""
+msgstr "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
#. type: <abstract></abstract>
#: guide.sgml:11
-msgid ""
-"This document provides an overview of how to use the the APT package manager."
+msgid "This document provides an overview of how to use the the APT package manager."
msgstr ""
+"Ce document fournit un aperçu des méthode d'utilisation du gestionnaire de "
+"paquets APT."
#. type: <copyrightsummary></copyrightsummary>
#: guide.sgml:15
msgid "Copyright &copy; Jason Gunthorpe, 1998."
-msgstr ""
+msgstr "Copyright &copy; Jason Gunthorpe, 1998."
#. type: <p></p>
#: guide.sgml:21 offline.sgml:22
@@ -9385,6 +9648,10 @@ msgid ""
"published by the Free Software Foundation; either version 2 of the License, "
"or (at your option) any later version."
msgstr ""
+"APT, ainsi que ce document, sont libres. Vous pouvez les redistribuer et les "
+"modifier en respectant les conditions de la licence publique générale GNU "
+"telle que publiée par la Free Software Foundation, en version 2 ou "
+"ultérieure."
#. type: <p></p>
#: guide.sgml:24 offline.sgml:25
@@ -9392,13 +9659,13 @@ msgid ""
"For more details, on Debian GNU/Linux systems, see the file /usr/share/"
"common-licenses/GPL for the full license."
msgstr ""
+"Les détails complets de cette licence sont, sur les systèmes Debian GNU/"
+"Linux, consultables dans le fichier usr/share/common-licenses/GPL."
#. type: <heading></heading>
#: guide.sgml:32
-#, fuzzy
-#| msgid "generate"
msgid "General"
-msgstr "generate"
+msgstr "Généralités"
#. type: <p></p>
#: guide.sgml:38
@@ -9408,11 +9675,15 @@ msgid ""
"provide a way to install and remove packages as well as download new "
"packages from the Internet."
msgstr ""
+"Le paquet APT comporte actuellement deux parties : la méthode APT pour "
+"<prgn>dselect</prgn> et l'interface en ligne de commande <prgn>apt-get</"
+"prgn>. Les deux fournissent des méthodes d'installation et de suppression de "
+"paquets ainsi que de téléchargement de nouveaux paquets par Internet."
#. type: <heading></heading>
#: guide.sgml:39
msgid "Anatomy of the Package System"
-msgstr ""
+msgstr "Anatomie du système de gestion des paquets"
#. type: <p></p>
#: guide.sgml:44
@@ -9421,6 +9692,10 @@ msgid ""
"with each package to help assure that it integrates cleanly and easily into "
"the system. The most prominent of its features is the dependency system."
msgstr ""
+"Le système de gestion de paquets de Debian intègre de nombreuses "
+"informations associées à chaque paquet afin de garantir qu'il s'intègre "
+"proprement et facilement sur le système. Une des fonctionnalités les plus "
+"immédiatement visibles est le système de gestion des dépendances."
#. type: <p></p>
#: guide.sgml:52
@@ -9431,6 +9706,13 @@ msgid ""
"things the average user is required to install. Also, it allows for choices "
"in mail transport agents, X servers and so on."
msgstr ""
+"Le système de gestion des dépendances permet aux programmes de partage des "
+"éléments du système, tels que les bibliothèques de fonctions. Il permet "
+"d'isoler dans des paquets spécifiques certains parties moins utilisées des "
+"programmes afin de limiter le nombre d'éléments que l'utilisateur ordinaire "
+"a besoin d'installer. Ce système de gestion des dépendances permet également "
+"d'effectuer des choix parmi les divers agents de transport de courrier "
+"électronique, les serveurs X et d'autres cxomposants du système."
#. type: <p></p>
#: guide.sgml:57
@@ -9440,15 +9722,31 @@ msgid ""
"package requires another package to be installed at the same time to work "
"properly."
msgstr ""
+"La première étape de compréhension de la gestion de dépendances est "
+"d'examiner le fonctionnement d'une dépendance simple. Une dépendance simple "
+"est le cas où un paquet donné a besoin qu'un autre paquet soit installé "
+"simultanément pour pouvoir fonctionner correctement."
#. type: <p></p>
#: guide.sgml:63
+#, fuzzy
+#| msgid ""
+#| "For instance, mailcrypt is an emacs extension that aids in encrypting "
+#| "email with GPG. Without GPGP installed mail-crypt is useless, so "
+#| "mailcrypt has a simple dependency on GPG. Also, because it is an emacs "
+#| "extension it has a simple dependency on emacs, without emacs it is "
+#| "completely useless."
msgid ""
"For instance, mailcrypt is an emacs extension that aids in encrypting email "
-"with GPG. Without GPGP installed mail-crypt is useless, so mailcrypt has a "
+"with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
"simple dependency on GPG. Also, because it is an emacs extension it has a "
"simple dependency on emacs, without emacs it is completely useless."
msgstr ""
+"Par example, mailcrypt est une extension à Emacs qui permet de gérer le "
+"courrier électronique chiffré avec GPG. Si GPG n'est pas installé, mailcrypt "
+"est inutile. Donc le paquet mailcrypt a une dépendance simple sur GPG. De "
+"plus, étant une extension à Emacs sans lequel il est totalement inutile, il "
+"a une dépendance simple sur emacs."
#. type: <p></p>
#: guide.sgml:73
@@ -9462,6 +9760,17 @@ msgid ""
"system so all mail transport agents have a conflicting dependency with all "
"other mail transport agents."
msgstr ""
+"Un autre type de dépendance importante est la dépendance en conflit. Cela "
+"signifie qu'un paquet ne fonctionne pas lorsqu'il est installé en même temps "
+"qu'un autre paquet donné, ce qui peut même être dommageable pour le système. "
+"Un exemple est par exemple constitué par les agents de transport de courrier "
+"tels que sendmail, exim ou qmail. Il n'est pas possible d'installer deux "
+"agents de transport de courrier simultanément puisque les deux ont besoin "
+"d'être à l'écoute sur le réseau pour recevoir le courrier électronique. "
+"Installer deux programmes de ce type sur le même système pourrait conduire à "
+"des pertes de données, ce qui explique que tous les agents de transport de "
+"courrier électronique soient établis comme étant en conflit les uns avec les "
+"autres."
#. type: <p></p>
#: guide.sgml:83
@@ -9475,6 +9784,16 @@ msgid ""
"depend on mail-transport-agent. This can add a great deal of confusion when "
"trying to manually fix packages."
msgstr ""
+"Il existe également la possibilité pour un paquet donné de prétendre être un "
+"autre paquet. Par exemple, exim et sendmail sont analogues sur de nombreux "
+"aspects ; ils servent tous deux à acheminer le courrier électronique et leur "
+"interface d'utilisation est la même. Pour cette raison, le système de "
+"gestion des paquets leur fournit la possibilité d'indiquer qu'ils sont "
+"chacun un agent de transport de courrier (« mail transport agent ») en "
+"indiquant qu'ils fournissent (« Provides ») « mail-transport-agent ». Ainsi, "
+"un paquet qui a besoin de cette fonctionnalité peut dépendre simplement d'un "
+"paquet « mail-transprot-agent ». Cette fonctionnalité utile peut toutefois "
+"rendre la correction de certains défauts des paquets plus complexe."
#. type: <p></p>
#: guide.sgml:88
@@ -9484,6 +9803,10 @@ msgid ""
"issues by providing a number of automatic algorithms that help in selecting "
"packages for installation."
msgstr ""
+"À un instant donné, une dépendance donnée peut être ou pas remplie par des "
+"paquets installés ou pas encore installés. APT tente donc de résoudre les "
+"problèmes de dépendances par l'intermédiaire d'un certain nombre "
+"d'algorithmes automatiques qui simplifient le choix des paquets à installer."
#. type: <p></p>
#: guide.sgml:102
@@ -9493,6 +9816,11 @@ msgid ""
"understand .deb files, it works with the package's proper name and can only "
"install .deb archives from a <em>Source</em>."
msgstr ""
+"Le programme <prgn>apt-get</prgn> offre une méthode simple pour installer "
+"des paquets à la ligne de commande. À la différence de <prgn>dpkg</prgn>, "
+"<prgn>apt-get</prgn> ne gère pas directement les fichiers .deb files. Il "
+"travaille avec le nom des paquets et ne peut installer les archives .deb que "
+"depuis une <em>Source</em>."
#. type: <p></p>
#: guide.sgml:109
@@ -9504,6 +9832,13 @@ msgid ""
"packages are available. This is done with <tt>apt-get update</tt>. For "
"instance,"
msgstr ""
+"La première action <footnote><p>Si vous utilisez un serveur mandataire "
+"(« proxy ») HTTP, vous devez d'abord positionner la variable d'environnement "
+"http_proxy, voir sources.list(5)</p></footnote> à effectuer avant d'utiliser "
+"<prgn>apt-get</prgn> est de récupérer les listes de paquets depuis les "
+"<em>Sources</em> afin que le programme sache quels sont les paquets "
+"disponibles. Cela peut être effectué avec la commande <tt>apt-get update</"
+"tt>. Par exemple,"
#. type: <example></example>
#: guide.sgml:116
@@ -9515,11 +9850,18 @@ msgid ""
"Reading Package Lists... Done\n"
"Building Dependency Tree... Done"
msgstr ""
+"# apt-get update\n"
+"Réception de http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
+"Réception de http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
+"Lecture des listes de paquets... Fait\n"
+"Construction de l'arbre des dépendances... Fait"
#. type: <p><taglist>
#: guide.sgml:120
msgid "Once updated there are several commands that can be used:"
msgstr ""
+"Une fois cette mise à jour effectuée, plusieurs commandes peuvent être "
+"utilisées :"
#. type: <p></p>
#: guide.sgml:131
@@ -9532,6 +9874,17 @@ msgid ""
"on new packages or conflict with some other package. <prgn>dselect</prgn> or "
"<tt>apt-get install</tt> can be used to force these packages to install."
msgstr ""
+"La commande « upgrade » permet de mettre à jour le système de manière non "
+"invasive. Cette commande ne provoquera jamais l'installation de nouveaux "
+"paquets ou la suppression de paquets existants. Elle ne déclenchera pas non "
+"plus la mise à jour d'un paquet si celle-ci casse le fonctionnement d'un "
+"autre paquet. Cette commande peut être utilisé par exemple quotidiennement "
+"pour mettre à jour le système de manière relativement sûre. Lorsqu'elle est "
+"utilisée, la liste des paquets qui ne peuvent être mis à jour sera affichée. "
+"Cela est en général du au fait qu'ils dépendent de nouveaux paquets ou "
+"qu'ils entrent en conflit avec d'autres paquets. Le programme <prgn>dselect</"
+"prgn> ou la commande <tt>apt-get install</tt> peuvet être utilisés pour "
+"forcer l'installation de tels paquets."
#. type: <p></p>
#: guide.sgml:140
@@ -9544,6 +9897,15 @@ msgid ""
"listed packages and will print a summary and ask for confirmation if "
"anything other than its arguments are changed."
msgstr ""
+"La commande « install » permet d'installer des paquets par nom. Le paquet à "
+"installer est automatiquement récupéré et installé. Cela est utile lorsque "
+"le nom du paquet à installer est déjà connu et que l'on ne souhaite pas "
+"passer par une interface graphique pour le choisir. Un nombre quelconque de "
+"paquets peuvent être demandés à être installés ;  ils seront alors tous "
+"récupérés. La commande « install » résout automatiquement les problèmes de "
+"dépendances pour les paquets concernés, puis affiche un résumé avant de "
+"demander une confirmation si des actions autres que ce qui est demandé à la "
+"ligne de commande sont nécessaires."
#. type: <p></p>
#: guide.sgml:149
@@ -9556,6 +9918,15 @@ msgid ""
"<prgn>dselect</prgn>. Once dist-upgrade has completed then <prgn>dselect</"
"prgn> can be used to install any packages that may have been left out."
msgstr ""
+"La commande « dist-upgrade » est une commande de mise à jour complète d'abord "
+"destinés à permettre les mises à jour entre deux versions successives de la "
+"distribution. Via un algorithme complexe, le meilleur jeu de paquets à "
+"installer, mettre à jour ou supprimer est déterminé dans le but d'amener une "
+"majorité du système vers la nouvelle version. Dans certains cas, il peut "
+"être judicieux d'utiliser « dist-upgrade » plutôt que de chercher à résoudre "
+"manuellement les dépendances avec <prgn>dselect</prgn>. Une fois que « dist-"
+"upgrade » a été utilisé, <prgn>dselect</prgn> peut servir à installer les "
+"paquets qui auraient pu être laissés de côté."
#. type: <p></p>
#: guide.sgml:152
@@ -9563,6 +9934,8 @@ msgid ""
"It is important to closely look at what dist-upgrade is going to do, its "
"decisions may sometimes be quite surprising."
msgstr ""
+"Il est important de regarder de près ce que « dist-upgrade » car ses "
+"décisions peuvent parfois apparaître surprenantes."
#. type: <p></p>
#: guide.sgml:163
@@ -9575,13 +9948,20 @@ msgid ""
"the downloaded archives can be installed by simply running the command that "
"caused them to be downloaded again without <tt>-d</tt>."
msgstr ""
+"<prgn>apt-get</prgn> fournit de nombreuses options de ligne de commande qui "
+"sont expliquées en détail dans sa page de manuel, <manref section=\"8\" name="
+"\"apt-get\">. Une des plus utiles est l'option <tt>-d</tt> qui récupère sans "
+"les installer les fichiers nécessaires. Si le système a besoin de "
+"télécharger un grand nombre de paquets, il est par exemple souhaitable de "
+"pouvoir simplement les récupérer sans les installer immédiatement, au cas où "
+"quelque chose se passe mal. Une fois que <tt>-d</tt> a été utilisé, il est "
+"possible d'installer les archives téléchargées en exécutant simplement la "
+"commande qui a permis de les récupérer, sans l'option <tt>-d</tt>."
#. type: <heading></heading>
#: guide.sgml:168
-#, fuzzy
-#| msgid "APT in DSelect"
msgid "DSelect"
-msgstr "APT et DSelect"
+msgstr "DSelect"
#. type: <p></p>
#: guide.sgml:173
@@ -9591,12 +9971,28 @@ msgid ""
"to select the packages to be installed or removed and APT actually installs "
"them."
msgstr ""
+"La méthode APT de <prgn>dselect</prgn> permet d'utiliser le système APT dans "
+"son ensemble depuis l'interface graphique de gestion des paquets "
+"<prgn>dselect</prgn>. L'interface est alors utilisée pour choisir les "
+"paquets à installer ou supprimer et c'est APT qui effectue les opérations "
+"individuelles d'installation ou suppression."
#. type: <p></p>
#: guide.sgml:184
-msgid ""
-"To enable the APT method you need to to select [A]ccess in <prgn>dselect</"
-"prgn> and then choose the APT method. You will be prompted for a set of "
+#, fuzzy
+#| msgid ""
+#| "To enable the APT method you need to to select [A]ccess in <prgn>dselect</"
+#| "prgn> and then choose the APT method. You will be prompted for a set of "
+#| "<em>Sources</em> which are places to fetch archives from. These can be "
+#| "remote Internet sites, local Debian mirrors or CDROMs. Each source can "
+#| "provide a fragment of the total Debian archive, APT will automatically "
+#| "combine them to form a complete set of packages. If you have a CDROM then "
+#| "it is a good idea to specify it first and then specify a mirror so that "
+#| "you have access to the latest bug fixes. APT will automatically use "
+#| "packages on your CDROM before downloading from the Internet."
+msgid ""
+"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
+"and then choose the APT method. You will be prompted for a set of "
"<em>Sources</em> which are places to fetch archives from. These can be "
"remote Internet sites, local Debian mirrors or CDROMs. Each source can "
"provide a fragment of the total Debian archive, APT will automatically "
@@ -9605,6 +10001,17 @@ msgid ""
"have access to the latest bug fixes. APT will automatically use packages on "
"your CDROM before downloading from the Internet."
msgstr ""
+"Pou ractiver la méthode APT, il est nécessaire de choisir [A]ccéder dans "
+"<prgn>dselect</prgn> puis utiliser le choix permettant d'activer APT. Des "
+"<em>Sources</em> d'installation seront demandées, qui sont les emplacements "
+"d'où les paquets seront récupérés. Cela peut être des sites Internet "
+"distants, des miroirs locaux ou des CD. Chaque source peut fournir un sous-"
+"ensemble de l'archive complète Debian. APT les combinera automatiquement "
+"pour créer un jeu complet de paquets. Avec des supports de type CD, il est "
+"conseillé de les indiquer en premier puis de les compléter avec un miroir "
+"distant qui permettra d'obtenir les versions les plus à jour s'il y en a. "
+"APT utilisera alors les paquets disponibles sur les CD avant de les "
+"télécharger via l'Internet."
#. type: <example></example>
#: guide.sgml:198
@@ -9623,6 +10030,18 @@ msgid ""
" \n"
" URL [http://llug.sep.bnl.gov/debian]:"
msgstr ""
+" Réglage de a liste des emplacements sources de distribution\n"
+"\t \n"
+" Veuillez indiquer l'URL de base de la distribution Debian.\n"
+" Les schémas d'accès connus sont : http file\n"
+"\t \n"
+" Exemple:\n"
+" file:/mnt/debian,\n"
+" ftp://ftp.debian.org/debian,\n"
+" http://ftp.de.debian.org/debian,\n"
+" \n"
+" \n"
+" URL [http://llug.sep.bnl.gov/debian]:"
#. type: <p></p>
#: guide.sgml:205
@@ -9631,6 +10050,9 @@ msgid ""
"archive, defaulting to a HTTP mirror. Next it asks for the distribution to "
"get."
msgstr ""
+"La configuration des <em>Sources</em> débute par l'indication de la base de "
+"l'archive Debian, par défaut un miroir HTTP. Puis la distribution est "
+"demandée."
#. type: <example></example>
#: guide.sgml:212
@@ -9642,6 +10064,12 @@ msgid ""
" \n"
" Distribution [stable]:"
msgstr ""
+" Veuillez indiquer le nom de la distribution à utiliser ou\n"
+" le chemin d'accès au fichier des paquets, terminé par un /.\n"
+" Les noms de distribution sont en général de la forme suivante :\n"
+" stable unstable testing non-US\n"
+" \n"
+" Distribution [stable] :"
#. type: <p></p>
#: guide.sgml:222
@@ -9653,6 +10081,14 @@ msgid ""
"that cannot be exported from the United States. Importing these packages "
"into the US is legal however."
msgstr ""
+"La distribution fait référence à la version de Debian dans l'archive. "
+"<em>stable</em> est la dernière version publiée et <em>unstable</em> la "
+"version en développement. <em>non-US</em> n'est disponible que sur certains "
+"miroirs et fait référence à des paquets contenant des technologies de "
+"chiffrement et d'autres élements dont l'exportation est interdite depuis les "
+"États-Unis d'Amérique. Il est toutefois autorisé de les y importer. [Note du "
+"traducteur : à la date de cette traduction, 2010, cette notion est "
+"totalement obsolète]."
#. type: <example></example>
#: guide.sgml:228
@@ -9663,6 +10099,11 @@ msgid ""
" \n"
" Components [main contrib non-free]:"
msgstr ""
+" Veuillez indiquer les composants à utiliser\n"
+" Les composants sont en général de la forme suivante :\n"
+" main contrib non-free\n"
+" \n"
+" Composants [main contrib non-free] :"
#. type: <p></p>
#: guide.sgml:236
@@ -9672,6 +10113,12 @@ msgid ""
"packages while contrib and non-free contain things that have various "
"restrictions placed on their use and distribution."
msgstr ""
+"La liste des composants correspond à la liste des sous-ensemble de la "
+"distribution que l'on souhaite utiliser. Les distributions sont en général "
+"divisées ainsi pour des raisons de licences. La sous-distribution « main » "
+"comporte les paquets libre selon les principes du logiciel libre selon "
+"Debian (DFSG) alors que contrib et non-free correspondent à des éléments qui "
+"comprennent des restrictions de distribution ou d'utilisation."
#. type: <p></p>
#: guide.sgml:240
@@ -9679,16 +10126,32 @@ msgid ""
"Any number of sources can be added, the setup script will continue to prompt "
"until you have specified all that you want."
msgstr ""
+"Un nombre quelconque de sources peuvent être ajoutées. Le script de "
+"configuration continuera à les demander tant que vous n'indiquerez pas que "
+"le processus est terminé."
#. type: <p></p>
#: guide.sgml:247
+#, fuzzy
+#| msgid ""
+#| "Before starting to use <prgn>dselect</prgn> it is necessary to update the "
+#| "available list by selecting [U]pdate from the menu. This is a super-set "
+#| "of <tt>apt-get update</tt> that makes the fetched information available "
+#| "to <prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get "
+#| "update</tt> has been run before."
msgid ""
"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a super-set of "
+"available list by selecting [U]pdate from the menu. This is a superset of "
"<tt>apt-get update</tt> that makes the fetched information available to "
"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
"tt> has been run before."
msgstr ""
+"Avant d'utiliser <prgn>dselect</prgn>, il est nécessaire de mettre à jour la "
+"liste de ce qui est disponible en choisissant « [M]ise à jour » depuis le "
+"menu. Cette action exécutera la commande « apt-get update », ce qui rendra "
+"les informations récupérées disponibles pour <prgn>dselect</prgn>. Elle doit "
+"être utilisée même si la commande « apt-get » a déjà été utilisée sur ce "
+"système."
#. type: <p></p>
#: guide.sgml:253
@@ -9698,6 +10161,11 @@ msgid ""
"[R]emove commands have no meaning, the [I]nstall command performs both of "
"them together."
msgstr ""
+"Une fois cela effectué, vous pouvez poursuivre et utiliser l'option « [S]"
+"électionner » pour choisir les paquets à installer puis « [I]nstaller » pour "
+"les installer. Lorsque la méthode APT est utilisée, les options « [C]"
+"onfigurer » et « [R]etirer » ne sont pas utilisées, car « [I]nstaller » fait "
+"l'ensemble des opérations."
#. type: <p></p>
#: guide.sgml:258
@@ -9706,11 +10174,15 @@ msgid ""
"have been successfully installed. To change this behavior place <tt>Dselect::"
"clean \"prompt\";</tt> in /etc/apt/apt.conf."
msgstr ""
+"Par défait, APT supprimera automatiquement les fichiers des paquets "
+"(fichiers .deb) une fois qu'ils ont été installés correctement. Pour "
+"modifier ce comportement, vous pouvez utiliser <tt>Dselect::clean \"prompt\";"
+"</tt> dans /etc/apt/apt.conf."
#. type: <heading></heading>
#: guide.sgml:264
msgid "The Interface"
-msgstr ""
+msgstr "L'interface"
#. type: <p></p>
#: guide.sgml:278
@@ -9724,11 +10196,20 @@ msgid ""
"then will print out some informative status messages so that you can "
"estimate how far along it is and how much is left to do."
msgstr ""
+"La méthode APT de <prgn>dselect</prgn> et le programme <prgn>apt-get</prgn> "
+"utilisent la même interface. Elle consiste en un système simple qui indique "
+"les opérations qui seront effectuées puis les réalise.<footnote><p>La "
+"méthode <prgn>dselect</prgn> consiste en fait en un jeu de scripts qui "
+"encapsulent <prgn>apt-get</prgn>. Cela approte des fonctionnalités "
+"supplémentaires à celles d'<prgn>apt-get</prgn> utilisé isolément.</p></"
+"footnote> Après avoir indiqué un résumé des opérations qui seront "
+"effectuées, APT donnera un certain nombre d'informations permettant "
+"d'estimer sa progression, tout au long des actions qu'il effectue. "
#. type: <heading></heading>
#: guide.sgml:280
msgid "Startup"
-msgstr ""
+msgstr "Démarrage"
#. type: <p></p>
#: guide.sgml:284
@@ -9738,6 +10219,10 @@ msgid ""
"At any time these operations can be performed by running <tt>apt-get check</"
"tt>."
msgstr ""
+"Avant toute opération autre qu'une mise à jour, APT effectue un certain "
+"nombre d'actions pour préparer ses mécaismes internes de fonctionnement. Il "
+"vérifie également l'état du système. Ces opérations peuvent être effectuées "
+"isolément avec la commande <tt>apt-get check</tt>."
#. type: <example></example>
#: guide.sgml:289
@@ -9747,6 +10232,9 @@ msgid ""
"Reading Package Lists... Done\n"
"Building Dependency Tree... Done"
msgstr ""
+"# apt-get check\n"
+"Lecture de la liste des paquets... Fait\n"
+"Construction de l'arbre des dépendances... Fait"
#. type: <p></p>
#: guide.sgml:297
@@ -9756,6 +10244,11 @@ msgid ""
"If some of the package files are not found then they will be ignored and a "
"warning will be printed when apt-get exits."
msgstr ""
+"En premier lieu, la liste des paquets est lue et placée en mémoire. APT "
+"utilise un mécanisme de cache et cette opération sera plus rapide si elle "
+"est effectuée une deuxième fois.Si certains des fichiers de paquets ne sont "
+"pas trouvés, ils seront ignorés et une informatique sera affichée quand apt-"
+"get se terminera."
#. type: <p></p>
#: guide.sgml:303
@@ -9765,6 +10258,10 @@ msgid ""
"package and considers if it is OK. Should this find a problem then a report "
"will be printed out and <prgn>apt-get</prgn> will refuse to run."
msgstr ""
+"Ensuite, une analyse détaillée des dépendances du système est réalisée. Les "
+"dépendances de chaque paquet installé ou décompressé sont vérifiées. Si un "
+"problème est trouvé, il sera affiché et <prgn>apt-get</prgn> bloquera des "
+"opérations ultérieures."
#. type: <example></example>
#: guide.sgml:320
@@ -9786,6 +10283,21 @@ msgid ""
" Depends: xlib6g (>= 3.3-5) but it is not installed\n"
" libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
msgstr ""
+"# apt-get check\n"
+"Lecture de la liste des paquets... Fait\n"
+"Construction de l'arbre des dépendances.. Fait\n"
+"Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes.\n"
+"Les paquets suivants contiennent des dépendances non satisfaites :\n"
+" 9fonts: Depends: xlib6g mais il n'est pas installé\n"
+" uucp: Depends: mailx mais il n'est pas installé\n"
+" blast: Depends: xlib6g (>= 3.3-5) mais il n'est pas installé\n"
+" adduser: Depends: perl-base mais il n'est pas installé\n"
+" aumix: Depends: libgpmg1 mais il n'est pas installé\n"
+" debiandoc-sgml: Depends: sgml-base mais il n'est pas installé\n"
+" bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
+" cthugha: Depends: svgalibg1 mais il n'est pas installé\n"
+" Depends: xlib6g (>= 3.3-5) mais il n'est pas installé\n"
+" libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
#. type: <p></p>
#: guide.sgml:329
@@ -9796,6 +10308,10 @@ msgid ""
"that are unmet. A short explanation of why the package has a dependency "
"problem is also included."
msgstr ""
+"Dans cet exemple, le système comporte plusieurs problèmes, notamment un "
+"problème sérieux avec libreadline2g. Une ligne est affichée pour chaque "
+"paquet dont les dépendances ne sont pas satisfaites, indiquant quel est le "
+"problème. Une explication simple du problème est donnée."
#. type: <p></p>
#: guide.sgml:337
@@ -9808,6 +10324,14 @@ msgid ""
"situation a package may have been unpacked without its dependents being "
"installed."
msgstr ""
+"Il existe deux façons pour le système d'aboutir à cet état. Cela peut "
+"d'abord être causé par des subtilités de relations entre les paquets que "
+"<prgn>dpkg</prgn> aurait manquées lors de mises à jour. "
+"<footnote><p>Cependant, APT prend en compte les dépendances connues et "
+"s'efforce d'éviter que cette situation ne se produise</p></footnote>. Cela "
+"peut également être dû à l'échec antérieur d'une installation de paquet. "
+"Dans le cas présent, un paquet a pu être décompressé sans que ses "
+"dépendances ne soient satisfaites."
#. type: <p></p>
#: guide.sgml:345
@@ -9819,6 +10343,13 @@ msgid ""
"<prgn>dselect</prgn> method always supplies the <tt>-f</tt> option to allow "
"for easy continuation of failed maintainer scripts."
msgstr ""
+"La seconde situation est moins grave que la première car APT met certaines "
+"contraintes sur l'ordre d'installation des paquets. Dans les deux cas, "
+"l'option <tt>-f</tt> utilisée avec <prgn>apt-get</prgn> conduira APT à "
+"rechercher une solution possible puis à continuer. La méthode APT de "
+"<prgn>dselect</prgn> utilise toujours cette option <tt>-f</tt> afin de "
+"pouvoir poursuivre plus facilement ses opérations si un script de mainteneur "
+"échoue de manière inopinée."
#. type: <p></p>
#: guide.sgml:351
@@ -9829,11 +10360,18 @@ msgid ""
"necessary to manually use dpkg (possibly with forcing options) to correct "
"the situation enough to allow APT to proceed."
msgstr ""
+"Cependant, si l'option <tt>-f</tt> est utilisée pour corriger un système "
+"fortement corrompu qui est dans le premier cas, il est possible que "
+"l'opération échoue immédiatement ou au cours des diverses tentatives de "
+"réparation effectuées. Dans tous les cas, il peut être nécessaire de "
+"corriger la situation manuellement avec dpkg (éventuellement en utilisant "
+"des options pour forcer certains opérations) avant de pouvoir utiliser à "
+"nouveau APT."
#. type: <heading></heading>
#: guide.sgml:356
msgid "The Status Report"
-msgstr ""
+msgstr "Le rapport d'état"
#. type: <p></p>
#: guide.sgml:363
@@ -9844,11 +10382,17 @@ msgid ""
"final state of things, taking into account the <tt>-f</tt> option and any "
"other relevant activities to the command being executed."
msgstr ""
+"Avant de démarrer ses actions, <prgn>apt-get</prgn> en affiche un résumé. En "
+"général, ce rapport dépend du type d'opération qui est entreprise, mais de "
+"nombreux éléments sont communs aux différents types de rapports. Ainsi, dans "
+"tous les cas, les listes reflètent l'état final du système, en tenant compte "
+"de l'option <tt>-f</tt> et des autres opérations découlant du type de "
+"commande utilisée."
#. type: <heading></heading>
#: guide.sgml:364
msgid "The Extra Package list"
-msgstr ""
+msgstr "La liste des paquets supplémentaires"
#. type: <example></example>
#: guide.sgml:372
@@ -9861,6 +10405,12 @@ msgid ""
" squake pgp-i python-base debmake ldso perl libreadlineg2\n"
" ssh"
msgstr ""
+"Les paquets supplémentaires suivants seront installés :\n"
+" libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n"
+" mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
+" bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
+" squake pgp-i python-base debmake ldso perl libreadlineg2\n"
+" ssh"
#. type: <p></p>
#: guide.sgml:379
@@ -9870,11 +10420,15 @@ msgid ""
"generated for an <tt>install</tt> command. The listed packages are often the "
"result of an Auto Install."
msgstr ""
+"La liste des paquets supplémentaires montre tous les paquets installés ou "
+"mis à jour en plus de ceux indiqués à la ligne de commande. Elle n'apparaît "
+"qu'avec la commande <tt>install</tt>. Le plus souvent, les paquets concernés "
+"sont le résultat d'une installation automatique."
#. type: <heading></heading>
#: guide.sgml:382
msgid "The Packages to Remove"
-msgstr ""
+msgstr "Les paquets à supprimer"
#. type: <example></example>
#: guide.sgml:389
@@ -9886,6 +10440,11 @@ msgid ""
" xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
" nas xpilot xfig"
msgstr ""
+"Les paquets suivants seront ENLEVÉS :\n"
+" xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
+" xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
+" xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
+" nas xpilot xfig"
#. type: <p></p>
#: guide.sgml:399
@@ -9898,11 +10457,19 @@ msgid ""
"that are going to be removed because they are only partially installed, "
"possibly due to an aborted installation."
msgstr ""
+"La liste des paquets à enlever montre tous les paquets qui seront supprimés "
+"du système. Elle peut apparaître pour tout type d'opération. Il est "
+"conseillé de l'inspecter en détail afin de vérifier qu'aucun paquet "
+"important ne va être supprimé. L'option <tt>-f</tt> provoque notamment "
+"souvent des suppressions de paquets et il est déconseillé d'être "
+"particulièrement attentif dans ce genre de cas. La liste peut comporter des "
+"paquets qui seront supprimés parce qu'ils sont seulement partiellement "
+"installés, par exemple après l'interruption d'une opération d'installation."
#. type: <heading></heading>
#: guide.sgml:402
msgid "The New Packages list"
-msgstr ""
+msgstr "La liste des nouveaux paquets"
#. type: <example></example>
#: guide.sgml:406
@@ -9911,6 +10478,8 @@ msgid ""
"The following NEW packages will installed:\n"
" zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
msgstr ""
+"Les NOUVEAUX paquets suivants seront installés :\n"
+" zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
#. type: <p></p>
#: guide.sgml:411
@@ -9919,11 +10488,14 @@ msgid ""
"listed are not presently installed in the system but will be when APT is "
"done."
msgstr ""
+"La liste des nouveaux paquets est un simple rappel des opérations qui vont "
+"avoir lieu. Les paquets affichés ne sont pas encore présents sur le système "
+"mais le seront une fois qu'APT aura terminé."
#. type: <heading></heading>
#: guide.sgml:414
msgid "The Kept Back list"
-msgstr ""
+msgstr "La liste des paquets conservés"
#. type: <example></example>
#: guide.sgml:419
@@ -9933,6 +10505,9 @@ msgid ""
" compface man-db tetex-base msql libpaper svgalib1\n"
" gs snmp arena lynx xpat2 groff xscreensaver"
msgstr ""
+"Les paquets suivants ont été conservés :\n"
+" compface man-db tetex-base msql libpaper svgalib1\n"
+" gs snmp arena lynx xpat2 groff xscreensaver"
#. type: <p></p>
#: guide.sgml:428
@@ -9944,11 +10519,18 @@ msgid ""
"to install is with <tt>apt-get install</tt> or by using <prgn>dselect</prgn> "
"to resolve their problems."
msgstr ""
+"À chaque fois que le système entier est mis à jour, il est possible que de "
+"nouvelles versions de paquets ne puissent pas être installées car elles ont "
+"besoins ne nouveaux paquets ou qu'elles entrent en conflit avec des paquets "
+"existants. Ces paquets apparaîtront alors dans la liste des paquets "
+"conservés. Le meilleure méthode pour effectivement installer ces paquets est "
+"souvent de le faire explicitement avec la commande <tt>apt-get install</tt> "
+"ou avec <prgn>dselect</prgn>."
#. type: <heading></heading>
#: guide.sgml:431
msgid "Held Packages warning"
-msgstr ""
+msgstr "L'avertissement pour paquets retenus"
#. type: <example></example>
#: guide.sgml:435
@@ -9957,6 +10539,8 @@ msgid ""
"The following held packages will be changed:\n"
" cvs"
msgstr ""
+"Les paquets retenus suivants seront changés :\n"
+" cvs"
#. type: <p></p>
#: guide.sgml:441
@@ -9965,17 +10549,20 @@ msgid ""
"case it prints out a warning that the held package is going to be changed. "
"This should only happen during dist-upgrade or install."
msgstr ""
+"Il peut parfois être utile de demander à APT d'installer un paquet retenu "
+"(« hold »). Dans ce cas, le programme affichera un avertissement indiquant "
+"que le paquet retenu va être modifié. Cela ne se produira que lors de "
+"l'utilisation des commandes dist-upgrade ou install."
#. type: <heading></heading>
#: guide.sgml:444
msgid "Final summary"
-msgstr ""
+msgstr "Résumé final"
#. type: <p></p>
#: guide.sgml:447
-msgid ""
-"Finally, APT will print out a summary of all the changes that will occur."
-msgstr ""
+msgid "Finally, APT will print out a summary of all the changes that will occur."
+msgstr "Anfin, APT affichera un résumé de toutes les opérations qui prendront place."
#. type: <example></example>
#: guide.sgml:452
@@ -9985,6 +10572,9 @@ msgid ""
"12 packages not fully installed or removed.\n"
"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
msgstr ""
+"206 paquets mis à jour, 8 nouvellement installés, 23 à enlever et 51 non mis à jour.\n"
+"12 paquets partiellement installés ou enlevés.\n"
+"Il est nécessaire de prendre 65,7Mo/66,7Mo dans les archives. Après cette opération, 26,5Mo d'espace disque supplémentaires seront utilisés."
#. type: <p></p>
#: guide.sgml:470
@@ -10003,6 +10593,20 @@ msgid ""
"If a large number of packages are being removed then the value may indicate "
"the amount of space that will be freed."
msgstr ""
+"La première ligne de ce résumé est une version simplifiée de l'ensemble des "
+"listes et indique le nombre de mises à jour (paquets déjà installés et pour "
+"lesquels une nouvelle version est disponible). La deuxième ligne indique le "
+"nombre de paquets incorrectement configurés, en raison notamment "
+"d'installations interrompues. La dernière ligne indique l'espace disque "
+"nécessaire pour effectuer l'installation. Le premier couple de nombre fait "
+"référence à la taille des fichiers d'archive. Le premier nombre est le "
+"nombre d'octets à récupérer depuis les sites distants et le deuxième la "
+"taille totale de tous les fichiers nécessaires. Le nombre suivant représente "
+"la différence d'espace occupé entre les paquets installés actuellement et ce "
+"qui sera ensuite installé. Il est grossièrement égal à l'espace "
+"supplémentaire nécessaire dans /usr après achèvement de toutes les "
+"opérations. Si de nombreux paquets sont supprimés, cette valeur peut "
+"représenter l'espace qui est alors libéré."
#. type: <p></p>
#: guide.sgml:473
@@ -10010,11 +10614,13 @@ msgid ""
"Some other reports can be generated by using the -u option to show packages "
"to upgrade, they are similar to the previous examples."
msgstr ""
+"D'autres rapports peuvent être créés avec l'option -u qui affiche les "
+"paquets à mettre à jour. Il sont analogues aux exemples précédents."
#. type: <heading></heading>
#: guide.sgml:477
msgid "The Status Display"
-msgstr ""
+msgstr "L'affichage d'état"
#. type: <p></p>
#: guide.sgml:481
@@ -10022,6 +10628,8 @@ msgid ""
"During the download of archives and package files APT prints out a series of "
"status messages."
msgstr ""
+"Pendant le téléchargement des fichiers des paquets, APT affiche un certain "
+"nombre de messages d'avancement."
#. type: <example></example>
#: guide.sgml:490
@@ -10035,6 +10643,13 @@ msgid ""
"Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
msgstr ""
+"# apt-get update\n"
+"Réception de :1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"
+"Réception de :2 http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
+"Atteint http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
+"Réception de :4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
+"Réception de :5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
+"11% [5 testing/non-free `Attente du fichier' 0/32.1k 0%] 2203b/s 1m52s"
#. type: <p></p>
#: guide.sgml:500
@@ -10046,6 +10661,13 @@ msgid ""
"<tt>apt-get update</tt> estimates the percent done which causes some "
"inaccuracies."
msgstr ""
+"Les lignes qui débutent par « Réception de » sont affichées quand APT démarre "
+"la récupération d'un fichier alors que la dernière ligne indique la "
+"progression du téléchargement. La première valeur de pourcentage de la ligne "
+"est le pourcentage de téléchargement déjà effectué, pour l'ensemble des "
+"fichiers. Il faut noter que, comme la taille des fichiers de paquets n'est "
+"pas connue, <tt>apt-get update</tt> estime le pourcentage effectué ce qui "
+"peut conduire à des imprécisions."
#. type: <p></p>
#: guide.sgml:509
@@ -10058,6 +10680,14 @@ msgid ""
"The next word is the short form name of the object being downloaded. For "
"archives it will contain the name of the package that is being fetched."
msgstr ""
+"La section suivante de la ligne d'état est répétée pour chaque sous-tâche de "
+"téléchargement. Elle indique l'opération effectuée et d'autres informations "
+"utiles sur ce qui est en cours. Cette section indiquera parfois <em>Forking</"
+"em> ce qui indique que le système charge le module de téléchargement. Le "
+"premier mot après le crochet ouvrant ([) est le numéro d'ordre de "
+"téléchargement comme indiqué dans les lignes d'historique. Le mot suivant "
+"est le nom court de l'objet téléchargé. Pour les archives, il s'agit du nom "
+"du paquet en cours de récupération."
#. type: <p></p>
#: guide.sgml:524
@@ -10076,6 +10706,21 @@ msgid ""
"regularly and reflects the time to complete everything at the shown transfer "
"rate."
msgstr ""
+"À l'intérieur des guillemets, on trouve une information sur la progression "
+"de la phase de négociation du téléchargement. Usuellement, elle évolue de "
+"<em>Connexion</em> à <em>Attente du fichier</em>, puis <em>Téléchargement</"
+"em> ou <em>Reprise</em>. La valeur finale est le nombre d'octets téléchargés "
+"depuis le site distant. Une fois le téléchargement commencé, cette "
+"indication prend la forme <tt>102/10,2ko</tt>, ce qui indique que 102 octets "
+"ont été téléchargés et que 10,2 kilo-octets sont attendus. La taille totale "
+"est toujours représentées sur 4 digits pour des raisons de place disponible. "
+"Après cet affichage de taille, se trouve une barre de progression pour le "
+"téléchargement du fichier lui-même. L'élément suivant est la vitesse "
+"instantanée de téléchargement. Elle est mise à jour toutes les 5 secondes et "
+"représente la vitesse de transfert pour cette période. Enfin, est affiché la "
+"temps de téléchargement restant estimé. Cette information est mise "
+"régulièrement à jour et représete la durée estimée de téléchargement de "
+"toute ce qui est nécessaire, à la vitesse affichée."
#. type: <p></p>
#: guide.sgml:530
@@ -10086,11 +10731,17 @@ msgid ""
"for logging to a file, use the <tt>-q</tt> option to remove the status "
"display."
msgstr ""
+"La ligne d'état est mise à jour chaque demi-seconde afin de fournir un "
+"retour régulier sur la progression du téléchargement alors que les lignes "
+"« Réception de » reculent d'une unité à chaque fois qu'un nouveau fichier est "
+"démarré. Comme l'état est mis à jour régulièrement, il ne peut pas servir "
+"pour la journalisation dans un fichier. Il est nécessaire d'utiliser "
+"l'option <tt>-q</tt> pour supprimer cet affichage."
#. type: <heading></heading>
#: guide.sgml:535
msgid "Dpkg"
-msgstr ""
+msgstr "Dpkg"
#. type: <p></p>
#: guide.sgml:542
@@ -10102,16 +10753,23 @@ msgid ""
"each question there is usually a description of what it is asking and the "
"questions are too varied to discuss completely here."
msgstr ""
+"APT utilise <prgn>dpkg</prgn> pour installer les archives et bascule vers "
+"l'interface de ce programme une fois le téléchargement terminé. <prgn>dpkg</"
+"prgn> peut poser un certain nombre de questions pendant le traitement des "
+"paquets, qui peuvent eux-même être amener à poser des questions. Chacune de "
+"ces questions comporte un description de ce qui est attendu et elles sont "
+"trop variables d'un paquet à l'autre pour qu'une description détaillée soit "
+"donnée dans ce document."
#. type: <title></title>
#: offline.sgml:4
msgid "Using APT Offline"
-msgstr ""
+msgstr "Utilisation d'APT hors ligne"
#. type: <version></version>
#: offline.sgml:7
msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-msgstr ""
+msgstr "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
#. type: <abstract></abstract>
#: offline.sgml:12
@@ -10119,23 +10777,24 @@ msgid ""
"This document describes how to use APT in a non-networked environment, "
"specifically a 'sneaker-net' approach for performing upgrades."
msgstr ""
+"Ce document décrit la méthode d'utilisation d'APT hors connexion à un "
+"réseau, et plus particulièrement une approche « sneaker-net » pour les mises "
+"à jour."
#. type: <copyrightsummary></copyrightsummary>
#: offline.sgml:16
msgid "Copyright &copy; Jason Gunthorpe, 1999."
-msgstr ""
+msgstr "Copyright &copy; Jason Gunthorpe, 1999."
#. type: <heading></heading>
#: offline.sgml:32
msgid "Introduction"
-msgstr ""
+msgstr "Introduction"
#. type: <heading></heading>
#: offline.sgml:34 offline.sgml:65 offline.sgml:180
-#, fuzzy
-#| msgid "OverrideDir"
msgid "Overview"
-msgstr "OverrideDir"
+msgstr "Aperçu"
#. type: <p></p>
#: offline.sgml:40
@@ -10145,6 +10804,10 @@ msgid ""
"machine is on a slow link, such as a modem and another machine has a very "
"fast connection but they are physically distant."
msgstr ""
+"Normalement, APT a besoin d'avoir un accès direct à une archive Debian, soit "
+"sur un support local, soit via le réseau. Un autre cas intéressant à traiter "
+"est celui d'une machine dotée d'une liaison peu rapide (comme un modem) avec "
+"une autre possédant une connexion à haut débit mais située à distance."
#. type: <p></p>
#: offline.sgml:51
@@ -10159,20 +10822,42 @@ msgid ""
"the machine downloading the packages, and <em>target host</em> the one with "
"bad or no connection."
msgstr ""
+"Une solution est d'utiliser un support amovible de grande taille tel qu'un "
+"disque Zip ou un disque Superdisk (NdT : ce document est daté..:-)). Bien "
+"que ces supports ne disposent pas d'assez de place pour héberger une archive "
+"Debian complète, ils peuvent toutefois contenir un sous-ensemble de taille "
+"suffisante pour les besoins de nombreux utilisateurs. L'idée est alors "
+"d'utiliser APT pour créer une liste de paquets nécessaires, puis de les "
+"récupérer avec une machine disposant d'une bonne connectivité. Il est même "
+"possible d'utiliser soit une autre machine Debian avec APT soit un autre "
+"système d'exploitation et un outil de téléchargement tel que wget. Dans ce "
+"qui suit, <em>machine distante</em> désignera la machine qui télécharge les "
+"paquets et <em>machine cible</em>, celle qui a une connectivité limitée."
#. type: <p></p>
#: offline.sgml:57
+#, fuzzy
+#| msgid ""
+#| "This is achieved by creatively manipulating the APT configuration file. "
+#| "The essential premis to tell APT to look on a disc for it's archive "
+#| "files. Note that the disc should be formated with a filesystem that can "
+#| "handle long file names such as ext2, fat32 or vfat."
msgid ""
"This is achieved by creatively manipulating the APT configuration file. The "
-"essential premis to tell APT to look on a disc for it's archive files. Note "
+"essential premise to tell APT to look on a disc for it's archive files. Note "
"that the disc should be formated with a filesystem that can handle long file "
"names such as ext2, fat32 or vfat."
msgstr ""
+"Il est nécessaire de manipuler le fichier de configuration d'APT de manière "
+"intelligente. Le préalable est d'indiquer à APT d'examiner le contenu d'un "
+"disque pour y trouver les fichiers d'archive. Ce disque doit utiliser un "
+"système de fichier autorisant les noms longs, par exemple ext2, fat32 ou "
+"vfat."
#. type: <heading></heading>
#: offline.sgml:63
msgid "Using APT on both machines"
-msgstr ""
+msgstr "Utilisation d'APT sur les deux machines"
#. type: <p><example>
#: offline.sgml:71
@@ -10182,6 +10867,11 @@ msgid ""
"remote machine to fetch the latest package files and decide which packages "
"to download. The disk directory structure should look like:"
msgstr ""
+"Si APT existe sur les deux machines, le cas est relativement simple. L'idée "
+"de base est de mettre une copie du fichier d'état sur le disque et "
+"d'utiliser la machine distante pour récupérer la dernière liste de paquets "
+"et choisir ceux à télécharger. La structure des répertoires du disque "
+"devraient ressembler à :"
#. type: <example></example>
#: offline.sgml:80
@@ -10196,13 +10886,19 @@ msgid ""
" sources.list\n"
" apt.conf"
msgstr ""
+" /disc/\n"
+" archives/\n"
+" partial/\n"
+" lists/\n"
+" partial/\n"
+" status\n"
+" sources.list\n"
+" apt.conf"
#. type: <heading></heading>
#: offline.sgml:88
-#, fuzzy
-#| msgid "User configuration"
msgid "The configuration file"
-msgstr "Configuration utilisateur"
+msgstr "Le fichier de configuration"
#. type: <p></p>
#: offline.sgml:96
@@ -10214,6 +10910,13 @@ msgid ""
"<em>target host</em>. Please note, if you are using a local archive you must "
"use copy URIs, the syntax is identical to file URIs."
msgstr ""
+"Le fichier de configuration indique à APT où conserver ses fichiers sur le "
+"disque et d'utiliser également les fichiers de configuration du disque. Le "
+"fichier sources.list devrait référencer les sites que vous souhaitez "
+"utiliser depuis la machine distante et le fichier d'état doit être une copie "
+"de <em>/var/lib/dpkg/status</em> de l'<em>ordinateur cible</em>. Veuillez "
+"noter que si sous utilisez une archive locale, les URI doivent en être "
+"copiés. La syntaxe est la même que celle des URI fichiers."
#. type: <p><example>
#: offline.sgml:100
@@ -10221,6 +10924,8 @@ msgid ""
"<em>apt.conf</em> must contain the necessary information to make APT use the "
"disc:"
msgstr ""
+"<em>apt.conf</em> doit avoir les informations nécessaires pour qu'APT "
+"utilise le disque.disc:"
#. type: <example></example>
#: offline.sgml:124
@@ -10250,6 +10955,29 @@ msgid ""
" Etc \"/disc/\";\n"
" };"
msgstr ""
+" APT\n"
+" {\n"
+" /* This is not necessary if the two machines are the same arch, it tells\n"
+" the remote APT what architecture the target machine is */\n"
+" Architecture \"i386\";\n"
+" \n"
+" Get::Download-Only \"true\";\n"
+" };\n"
+" \n"
+" Dir\n"
+" {\n"
+" /* Use the disc for state information and redirect the status file from\n"
+" the /var/lib/dpkg default */\n"
+" State \"/disc/\";\n"
+" State::status \"status\";\n"
+"\n"
+" // Binary caches will be stored locally\n"
+" Cache::archives \"/disc/archives/\";\n"
+" Cache \"/tmp/\";\n"
+" \n"
+" // Location of the source list.\n"
+" Etc \"/disc/\";\n"
+" };"
#. type: </example></p>
#: offline.sgml:129
@@ -10257,16 +10985,32 @@ msgid ""
"More details can be seen by examining the apt.conf man page and the sample "
"configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>."
msgstr ""
+"Plus d'informations peuvent être trouvées dans la page de manuel du fichier "
+"apt.conf et dans l'exemple de fichier de configuration que l'on peut trouver "
+"dans <em>/usr/share/doc/apt/examples/apt.conf</em>."
#. type: <p><example>
#: offline.sgml:136
+#, fuzzy
+#| msgid ""
+#| "On the target machine the first thing to do is mount the disc and copy "
+#| "<em>/var/lib/dpkg/status</em> to it. You will also need to create the "
+#| "directories outlined in the Overview, <em>archives/partial/</em> and "
+#| "<em>lists/partial/</em> Then take the disc to the remote machine and "
+#| "configure the sources.list. On the remote machine execute the following:"
msgid ""
"On the target machine the first thing to do is mount the disc and copy <em>/"
"var/lib/dpkg/status</em> to it. You will also need to create the directories "
"outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
-"em> Then take the disc to the remote machine and configure the sources.list. "
-"On the remote machine execute the following:"
+"em>. Then take the disc to the remote machine and configure the sources."
+"list. On the remote machine execute the following:"
msgstr ""
+"Sur la machine cible, il est d'abord nécessaire de monter le disque et y "
+"copier le fichier <em>/var/lib/dpkg/status</em>. Il sera aussi nécessaire de "
+"créer les répertoires dans l'aperçu (Overview), <em>archives/partial/</em> "
+"and <em>lists/partial/</em>. Connecter ensuite le disque à la machine "
+"distante et configurer le fichier sources.list. Sur la machine distante, "
+"exécuter la séquence de commandes suivante :"
#. type: <example></example>
#: offline.sgml:142
@@ -10278,15 +11022,30 @@ msgid ""
" # apt-get dist-upgrade\n"
" [ APT fetches all the packages needed to upgrade the target machine ]"
msgstr ""
+" # export APT_CONFIG=\"/disc/apt.conf\"\n"
+" # apt-get update\n"
+" [ APT récupère les fichiers des paquets ]\n"
+" # apt-get dist-upgrade\n"
+" [ APT récupère tous les fichiers nécessaires à la mise à jour de la machine distante ]"
#. type: </example></p>
#: offline.sgml:149
+#, fuzzy
+#| msgid ""
+#| "The dist-upgrade command can be replaced with any-other standard APT "
+#| "commands, particularly dselect-upgrade. You can even use an APT front end "
+#| "such as <em>dselect</em> However this presents a problem in communicating "
+#| "your selections back to the local computer."
msgid ""
-"The dist-upgrade command can be replaced with any-other standard APT "
+"The dist-upgrade command can be replaced with any other standard APT "
"commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em> However this presents a problem in communicating "
+"such as <em>dselect</em>. However this presents a problem in communicating "
"your selections back to the local computer."
msgstr ""
+"La commande dist-upgrade peut être remplacée par toute autres commande "
+"usuelle d'APT, notamment dselect-upgrade. Il est même possible d'utiliser "
+"une interface comme <em>dselect</em>. Cependant, cela complique la "
+"communication des choix vers l'ordinateur local."
#. type: <p><example>
#: offline.sgml:153
@@ -10294,6 +11053,9 @@ msgid ""
"Now the disc contains all of the index files and archives needed to upgrade "
"the target machine. Take the disc back and run:"
msgstr ""
+"Après cette opération, le disque contiendra tous les fichiers d'index et les "
+"archives nécessaires pour mettr eà jour la machine cible. Il est alors "
+"possible d'y ramener le disque et exécuter :"
#. type: <example></example>
#: offline.sgml:159
@@ -10305,6 +11067,11 @@ msgid ""
" # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
" [ Or any other APT command ]"
msgstr ""
+" # export APT_CONFIG=\"/disc/apt.conf\"\n"
+" # apt-get check\n"
+" [ APT crée la copie locale des fichiers de cache ]\n"
+" # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
+" [ Ou toute autre commande APT ]"
#. type: <p></p>
#: offline.sgml:165
@@ -10312,6 +11079,8 @@ msgid ""
"It is necessary for proper function to re-specify the status file to be the "
"local one. This is very important!"
msgstr ""
+"Pour un fonctionnement correct, il est indispensable de ré-indiquer que le "
+"fichier d'état est le fichier local. Cela est très important."
#. type: <p></p>
#: offline.sgml:172
@@ -10322,11 +11091,17 @@ msgid ""
"the local machine - but this may not always be possible. DO NOT copy the "
"status file if dpkg or APT have been run in the mean time!!"
msgstr ""
+"Si vous utilisez dselect, vous pouvez effectuer l'opération dangereuse "
+"consistant à copier disc/status en /var/lib/dpkg/status, afin que les choix "
+"effectués sur la machine distante soient mis à jour. Il est recommandé de "
+"n'éffectuer les choix que sur la machine locale, mais ce n'est pas toujours "
+"possible. NE COPIEZ PAS le fichier d'état si dpkg ou APT ont été exécutés "
+"dans l'intervalle."
#. type: <heading></heading>
#: offline.sgml:178
msgid "Using APT and wget"
-msgstr ""
+msgstr "Utilisation d'APT et wget"
#. type: <p></p>
#: offline.sgml:185
@@ -10335,6 +11110,10 @@ msgid ""
"any machine. Unlike the method above this requires that the Debian machine "
"already has a list of available packages."
msgstr ""
+"<em>wget</em> est un outil classique de téléchargement qui peut être exécuté "
+"sur à peu près tout type de machine. À la différence de la méthode "
+"précédente, cela impose que la machine Debian a déjà une liste des paquets "
+"disponibles."
#. type: <p></p>
#: offline.sgml:190
@@ -10344,13 +11123,15 @@ msgid ""
"option to apt-get and then preparing a wget script to actually fetch the "
"packages."
msgstr ""
+"L'idée de base est de créer un disque qui ne comporte que les fichiers "
+"archive téléchargés depuis le site distant. Cela peut être effectué avec "
+"l'option --print-uris d'apt-get puis de la préparation d'un script wget "
+"permettant de récupérer les paquets/"
#. type: <heading></heading>
#: offline.sgml:196
-#, fuzzy
-#| msgid "Options"
msgid "Operation"
-msgstr "Options"
+msgstr "Fonctionnement"
#. type: <p><example>
#: offline.sgml:200
@@ -10358,6 +11139,9 @@ msgid ""
"Unlike the previous technique no special configuration files are required. "
"We merely use the standard APT commands to generate the file list."
msgstr ""
+"À la différence de la méthode précédente, aucun fichier de configuration "
+"spécifique n'est nécessaire. Seules les commandes standard d'APT seront "
+"utilisées pour créer la liste de ficheirs."
#. type: <example></example>
#: offline.sgml:205
@@ -10368,6 +11152,10 @@ msgid ""
" # apt-get -qq --print-uris dist-upgrade > uris\n"
" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
msgstr ""
+" # apt-get dist-upgrade \n"
+" [ Répondre négativement à la question, pour être sûr(e) que les actions vous conviennent ]\n"
+" # apt-get -qq --print-uris dist-upgrade > uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
#. type: </example></p>
#: offline.sgml:210
@@ -10375,6 +11163,8 @@ msgid ""
"Any command other than dist-upgrade could be used here, including dselect-"
"upgrade."
msgstr ""
+"Toute autre commande que dist-upgrade peut être utilisée, y compris dselect-"
+"upgrade."
#. type: <p></p>
#: offline.sgml:216
@@ -10384,11 +11174,15 @@ msgid ""
"with the current directory as the disc's mount point so as to save the "
"output on the disc."
msgstr ""
+"Le fichier /disc/wget-script contiendra alors la liste des commandes wget à "
+"exécuter afin de récupérer les fichiers nécessaires. Ce script doit être "
+"exécuté depuis le point de montage du disque afin que les fichiers soient "
+"écrits sur le disque."
#. type: <p><example>
#: offline.sgml:219
msgid "The remote machine would do something like"
-msgstr ""
+msgstr "Sur la machine distante, il faudra alors exécuter l'équivalent de :"
#. type: <example></example>
#: offline.sgml:223
@@ -10398,6 +11192,9 @@ msgid ""
" # sh -x ./wget-script\n"
" [ wait.. ]"
msgstr ""
+" # cd /disc\n"
+" # sh -x ./wget-script\n"
+" [ attendre.. ]"
#. type: </example><example>
#: offline.sgml:228
@@ -10405,17 +11202,49 @@ msgid ""
"Once the archives are downloaded and the disc returned to the Debian machine "
"installation can proceed using,"
msgstr ""
+"Une fois les fichiers téléchargés et le disque reconnecté à la machine "
+"Debian, l'installation peut se poursuivre avec :"
#. type: <example></example>
#: offline.sgml:230
#, no-wrap
msgid " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
-msgstr ""
+msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
#. type: </example></p>
#: offline.sgml:234
msgid "Which will use the already fetched archives on the disc."
-msgstr ""
+msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
+
+#~ msgid "<filename>/etc/apt/trusted.gpg</filename>"
+#~ msgstr "<filename>/etc/apt/trusted.gpg</filename>"
+
+#~ msgid "Keyring of local trusted keys, new keys will be added here."
+#~ msgstr ""
+#~ "Trousseau de clés locales fiables : les nouvelles clés y seront ajoutées."
+
+#~ msgid ""
+#~ "<filename>apt.conf</filename> is the main configuration file for the APT "
+#~ "suite of tools, all tools make use of the configuration file and a common "
+#~ "command line parser to provide a uniform environment. When an APT tool "
+#~ "starts up it will read the configuration specified by the "
+#~ "<envar>APT_CONFIG</envar> environment variable (if any) and then read the "
+#~ "files in <literal>Dir::Etc::Parts</literal> then read the main "
+#~ "configuration file specified by <literal>Dir::Etc::main</literal> then "
+#~ "finally apply the command line options to override the configuration "
+#~ "directives, possibly loading even more config files."
+#~ msgstr ""
+#~ "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 "
+#~ "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 lit les fichiers situés dans <literal>Dir::Etc::Parts</literal> "
+#~ "ainsi que le principal fichier de configuration indiqué par <literal>Dir::"
+#~ "Etc::main</literal> ; enfin il applique les options de la ligne de "
+#~ "commande qui prévalent sur les directives de configuration, chargeant si "
+#~ "nécessaire d'autres fichiers de configuration."
#~ msgid ""
#~ "Disable Immediate Configuration; This dangerous option disables some of "
@@ -10450,13 +11279,6 @@ msgstr ""
#~ msgid "<filename>/etc/apt/apt.conf</filename>"
#~ msgstr "<filename>/etc/apt/apt.conf</filename>"
-#~ 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>."
-
#~ msgid "<filename>/etc/apt/apt.conf.d/</filename>"
#~ msgstr "<filename>/etc/apt/apt.conf.d/</filename>"
diff --git a/doc/po/it.po b/doc/po/it.po
index 37cf5d078..fd2e2994e 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2009-11-27 00:05+0100\n"
+"POT-Creation-Date: 2010-01-20 12:18+0100\n"
"PO-Revision-Date: 2003-04-26 23:26+0100\n"
"Last-Translator: Traduzione di Eugenia Franzoni <eugenia@linuxcare.com>\n"
"Language-Team: <debian-l10n-italian@lists.debian.org>\n"
@@ -739,7 +739,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:355
+#: apt.ent:356
#, no-wrap
msgid ""
" <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
@@ -749,6 +749,61 @@ msgid ""
"\">\n"
msgstr ""
+#. type: Plain text
+#: apt.ent:362
+#, no-wrap
+msgid ""
+"<!ENTITY file-trustedgpg \"\n"
+" <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n"
+" <listitem><para>Keyring of local trusted keys, new keys will be added here.\n"
+" Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:369
+#, no-wrap
+msgid ""
+" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
+" <listitem><para>File fragments for the trusted keys, additional keyrings can\n"
+" be stored here (by other packages or the administrator).\n"
+" Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+"\">\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:371
+msgid "<!ENTITY translation-title \"TRANSLATION\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:380
+#, no-wrap
+msgid ""
+"<!-- TRANSLATOR: This is a placeholder. You should write here who has constributed\n"
+" to the translation in the past, who is responsible now and maybe further information\n"
+" specially related to your translation. -->\n"
+"<!ENTITY translation-holder \"\n"
+" The english translation was done by John Doe <email>john@doe.org</email> in 2009,\n"
+" 2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together with the\n"
+" Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>.\n"
+"\">\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:387
+#, no-wrap
+msgid ""
+"<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
+" in a shipped manpage will maybe appear english parts. -->\n"
+"<!ENTITY translation-english \"\n"
+" Note that this translated document may contain untranslated parts.\n"
+" This is done on purpose, to avoid losing content when the\n"
+" translation is lagging behind the original content.\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
@@ -812,7 +867,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: 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-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40
#: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33
#: sources.list.5.xml:33
msgid "Description"
@@ -1203,7 +1258,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89
-#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:484 apt.conf.5.xml:506
+#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524
msgid "options"
msgstr ""
@@ -1397,14 +1452,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:556 apt-get.8.xml:554
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554
#: apt-sortpkgs.1.xml:64
msgid "&apt-commonoptions;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122
-#: apt.conf.5.xml:1017 apt_preferences.5.xml:615
+#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122
+#: apt.conf.5.xml:1035 apt_preferences.5.xml:622
msgid "Files"
msgstr ""
@@ -1415,9 +1470,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569
-#: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569
+#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629
#: sources.list.5.xml:233
msgid "See Also"
msgstr ""
@@ -1429,7 +1484,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:576 apt-get.8.xml:575
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575
#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
msgstr ""
@@ -1529,7 +1584,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:91
+#: apt-cdrom.8.xml:91 apt-key.8.xml:139
msgid "Options"
msgstr ""
@@ -1729,7 +1784,7 @@ msgid "Just show the contents of the configuration space."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585
#: apt-sortpkgs.1.xml:70
msgid "&apt-conf;"
msgstr ""
@@ -2263,7 +2318,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:288
msgid ""
-"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
+"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
"source/Sources</filename>"
msgstr ""
@@ -2375,20 +2430,22 @@ msgid ""
"variables."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: 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>
+#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt-ftparchive.1.xml:354
#, no-wrap
msgid ""
"for i in Sections do \n"
" for j in Architectures do\n"
" Generate for DIST=scope SECTION=i ARCH=j\n"
+" "
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-ftparchive.1.xml:351
+msgid ""
+"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
+"command> performs an operation similar to: <placeholder type=\"programlisting"
+"\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
@@ -2682,12 +2739,31 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:547
-msgid "<option>APT::FTPArchive::LongDescription</option>"
+msgid "<option>APT::FTPArchive::AlwaysStat</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:549
msgid ""
+"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If "
+"packages are recompiled and/or republished with the same version again, this "
+"will lead to problems as the now outdated cached metadata like size and "
+"checksums will be used. With this option enabled this will no longer happen "
+"as it will be checked if the file was changed. Note that this option is set "
+"to \"<literal>false</literal>\" by default as it is not recommend to upload "
+"multiply versions/builds of a package with the same versionnumber, so in "
+"theory nobody will have these problems and therefore all these extra checks "
+"are useless."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:559
+msgid "<option>APT::FTPArchive::LongDescription</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:561
+msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
"only be set to <literal>\"false\"</literal> if the Archive generated with "
"&apt-ftparchive; also provides <filename>Translation</filename> files. Note "
@@ -2696,26 +2772,26 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462
+#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469
#: sources.list.5.xml:193
msgid "Examples"
msgstr ""
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:567
+#: apt-ftparchive.1.xml:579
#, no-wrap
msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:563
+#: apt-ftparchive.1.xml:575
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:577
+#: apt-ftparchive.1.xml:589
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -2786,7 +2862,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:135 apt-key.8.xml:123
+#: apt-get.8.xml:135 apt-key.8.xml:124
#, fuzzy
msgid "update"
msgstr "upgrade"
@@ -3116,15 +3192,15 @@ msgstr ""
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
-"to deduce a likely solution. Any Package that are specified must completely "
-"correct the problem. The option is sometimes necessary when running APT for "
-"the first time; APT itself does not allow broken package dependencies to "
-"exist on a system. It is possible that a system's dependency structure can "
-"be so corrupt as to require manual intervention (which usually means using "
-"&dselect; or <command>dpkg --remove</command> to eliminate some of the "
-"offending packages). Use of this option together with <option>-m</option> "
-"may produce an error in some situations. Configuration Item: <literal>APT::"
-"Get::Fix-Broken</literal>."
+"to deduce a likely solution. If packages are specified, these have to "
+"completely correct the problem. The option is sometimes necessary when "
+"running APT for the first time; APT itself does not allow broken package "
+"dependencies to exist on a system. It is possible that a system's dependency "
+"structure can be so corrupt as to require manual intervention (which usually "
+"means using &dselect; or <command>dpkg --remove</command> to eliminate some "
+"of the offending packages). Use of this option together with <option>-m</"
+"option> may produce an error in some situations. Configuration Item: "
+"<literal>APT::Get::Fix-Broken</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -3379,7 +3455,7 @@ msgstr ""
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> "
+"<option>remove --purge</option> is equivalent to the <option>purge</option> "
"command. Configuration Item: <literal>APT::Get::Purge</literal>."
msgstr ""
@@ -3596,13 +3672,14 @@ msgstr ""
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-key.8.xml:28
msgid ""
-"<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> "
+"<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
+"replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
"<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></"
"arg>"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:36
+#: apt-key.8.xml:37
msgid ""
"<command>apt-key</command> is used to manage the list of keys used by apt to "
"authenticate packages. Packages which have been authenticated using these "
@@ -3610,17 +3687,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:42
+#: apt-key.8.xml:43
msgid "Commands"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:44
+#: apt-key.8.xml:45
msgid "add <replaceable>filename</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:48
+#: apt-key.8.xml:49
msgid ""
"Add a new key to the list of trusted keys. The key is read from "
"<replaceable>filename</replaceable>, or standard input if "
@@ -3628,117 +3705,135 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:56
+#: apt-key.8.xml:57
msgid "del <replaceable>keyid</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:60
+#: apt-key.8.xml:61
msgid "Remove a key from the list of trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:67
+#: apt-key.8.xml:68
msgid "export <replaceable>keyid</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:71
+#: apt-key.8.xml:72
msgid "Output the key <replaceable>keyid</replaceable> to standard output."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:78
+#: apt-key.8.xml:79
msgid "exportall"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:82
+#: apt-key.8.xml:83
msgid "Output all trusted keys to standard output."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:89
+#: apt-key.8.xml:90
msgid "list"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:93
+#: apt-key.8.xml:94
msgid "List trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:100
+#: apt-key.8.xml:101
msgid "finger"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:104
+#: apt-key.8.xml:105
msgid "List fingerprints of trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:111
+#: apt-key.8.xml:112
msgid "adv"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:115
+#: apt-key.8.xml:116
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:127
+#: apt-key.8.xml:128
msgid ""
"Update the local keyring with the keyring of Debian archive keys and removes "
"from the keyring the archive keys which are no longer valid."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><para>
#: apt-key.8.xml:140
-msgid "<filename>/etc/apt/trusted.gpg</filename>"
+msgid ""
+"Note that options need to be defined before the commands described in the "
+"previous section."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml:142
+msgid "--keyring <replaceable>filename</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:141
-msgid "Keyring of local trusted keys, new keys will be added here."
+#: apt-key.8.xml:143
+msgid ""
+"With this option it is possible to specify a specific keyring file the "
+"command should operate on. The default is that a command is executed on the "
+"<filename>trusted.gpg</filename> file as well as on all parts in the "
+"<filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</"
+"filename> is the primary keyring which means that e.g. new keys are added to "
+"this one."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist>
+#: apt-key.8.xml:156
+msgid "&file-trustedgpg;"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:144
+#: apt-key.8.xml:158
msgid "<filename>/etc/apt/trustdb.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:145
+#: apt-key.8.xml:159
msgid "Local trust database of archive keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:148
+#: apt-key.8.xml:162
msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:149
+#: apt-key.8.xml:163
msgid "Keyring of Debian archive trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:152
+#: apt-key.8.xml:166
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:153
+#: apt-key.8.xml:167
msgid "Keyring of Debian archive removed trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:164
+#: apt-key.8.xml:176
msgid "&apt-get;, &apt-secure;"
msgstr ""
@@ -4187,7 +4282,7 @@ 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>18 September 2009</date>"
+"&apt-product; <date>16 January 2010</date>"
msgstr ""
#. type: Content of: <refentry><refnamediv><refname>
@@ -4209,18 +4304,54 @@ msgstr ""
#: 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 "
-"command line parser to provide a uniform environment. When an APT tool "
-"starts up it will read the configuration specified by the <envar>APT_CONFIG</"
-"envar> environment variable (if any) and then read the files in "
-"<literal>Dir::Etc::Parts</literal> then read the main configuration file "
-"specified by <literal>Dir::Etc::main</literal> then finally apply the "
-"command line options to override the configuration directives, possibly "
-"loading even more config files."
+"suite of tools, but by far not the only place changes to options can be "
+"made. All tools therefore share the configuration files and also use a "
+"common command line parser to provide a uniform environment."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><para>
+#: apt.conf.5.xml:45
+msgid ""
+"When an APT tool starts up it will read the configuration files in the "
+"following order:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:47
+msgid ""
+"the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
+"any)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:49
+msgid ""
+"all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
+"order which have no or \"<literal>conf</literal>\" as filename extension and "
+"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
+"characters - otherwise they will be silently ignored."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:54
+msgid ""
+"the main configuration file specified by <literal>Dir::Etc::main</literal>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:56
+msgid ""
+"the command line options are applied to override the configuration "
+"directives or to load even more configuration files."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.conf.5.xml:60
+msgid "Syntax"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:50
+#: apt.conf.5.xml:61
msgid ""
"The configuration file is organized in a tree with options organized into "
"functional groups. Option specification is given with a double colon "
@@ -4230,7 +4361,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:56
+#: apt.conf.5.xml:67
msgid ""
"Syntactically the configuration language is modeled after what the ISC tools "
"such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@ -4246,7 +4377,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:70
+#: apt.conf.5.xml:81
#, no-wrap
msgid ""
"APT {\n"
@@ -4258,7 +4389,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:78
+#: apt.conf.5.xml:89
msgid ""
"with newlines placed to make it more readable. Lists can be created by "
"opening a scope and including a single string enclosed in quotes followed by "
@@ -4266,27 +4397,27 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:83
+#: apt.conf.5.xml:94
#, no-wrap
msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:86
+#: apt.conf.5.xml:97
msgid ""
"In general the sample configuration file in <filename>&docdir;examples/apt."
"conf</filename> &configureindex; is a good guide for how it should look."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:90
+#: apt.conf.5.xml:101
msgid ""
"The names of the configuration items are not case-sensitive. So in the "
"previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:93
+#: apt.conf.5.xml:104
msgid ""
"Names for the configuration items are optional if a list is defined as it "
"can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. "
@@ -4296,7 +4427,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:98
+#: apt.conf.5.xml:109
msgid ""
"Two specials are allowed, <literal>#include</literal> (which is deprecated "
"and not supported by alternative implementations) and <literal>#clear</"
@@ -4308,7 +4439,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:106
+#: apt.conf.5.xml:117
msgid ""
"The #clear command is the only way to delete a list or a complete scope. "
"Reopening a scope or the ::-style described below will <emphasis>not</"
@@ -4318,7 +4449,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:111
+#: apt.conf.5.xml:122
msgid ""
"All of the APT tools take a -o option which allows an arbitrary "
"configuration directive to be specified on the command line. The syntax is a "
@@ -4329,7 +4460,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:118
+#: apt.conf.5.xml:129
msgid ""
"Note that you can use :: only for appending one item per line to a list and "
"that you should not use it in combination with the scope syntax. (The scope "
@@ -4346,24 +4477,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:130
+#: apt.conf.5.xml:141
msgid "The APT Group"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:131
+#: apt.conf.5.xml:142
msgid ""
"This group of options controls general APT behavior as well as holding the "
"options for all of the tools."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:135
+#: apt.conf.5.xml:146
msgid "Architecture"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:136
+#: apt.conf.5.xml:147
msgid ""
"System Architecture; sets the architecture to use when fetching files and "
"parsing package lists. The internal default is the architecture apt was "
@@ -4371,12 +4502,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:141
+#: apt.conf.5.xml:152
msgid "Default-Release"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:142
+#: apt.conf.5.xml:153
msgid ""
"Default release to install packages from if more than one version available. "
"Contains release name, codename or release version. Examples: 'stable', "
@@ -4385,24 +4516,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:146
+#: apt.conf.5.xml:157
msgid "Ignore-Hold"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:147
+#: apt.conf.5.xml:158
msgid ""
"Ignore Held packages; This global option causes the problem resolver to "
"ignore held packages in its decision making."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:151
+#: apt.conf.5.xml:162
msgid "Clean-Installed"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:152
+#: apt.conf.5.xml:163
msgid ""
"Defaults to on. When turned on the autoclean feature will remove any "
"packages which can no longer be downloaded from the cache. If turned off "
@@ -4411,12 +4542,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:158
+#: apt.conf.5.xml:169
msgid "Immediate-Configure"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:159
+#: apt.conf.5.xml:170
msgid ""
"Defaults to on which will cause APT to install essential and important "
"packages as fast as possible in the install/upgrade operation. This is done "
@@ -4432,13 +4563,13 @@ msgid ""
"dependencies which can generate a problem if the dependencies e.g. form a "
"circle as a dependency with the immediate flag is comparable with a Pre-"
"Dependency. So in theory it is possible that APT encounters a situation in "
-"which it is unable to perform immediate configuration, error out and refers "
+"which it is unable to perform immediate configuration, errors out and refers "
"to this option so the user can deactivate the immediate configuration "
-"temporary to be able to perform an install/upgrade again. Note the use of "
+"temporarily to be able to perform an install/upgrade again. Note the use of "
"the word \"theory\" here as this problem was only encountered by now in real "
-"world a few times in non-stable distribution versions and caused by wrong "
-"dependencies of the package in question or by a system in an already broken "
-"state, so you should not blindly disable this option as the mentioned "
+"world a few times in non-stable distribution versions and was caused by "
+"wrong dependencies of the package in question or by a system in an already "
+"broken state, so you should not blindly disable this option as the mentioned "
"scenario above is not the only problem immediate configuration can help to "
"prevent in the first place. Before a big operation like <literal>dist-"
"upgrade</literal> is run with this option disabled it should be tried to "
@@ -4449,12 +4580,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:181
+#: apt.conf.5.xml:192
msgid "Force-LoopBreak"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:182
+#: apt.conf.5.xml:193
msgid ""
"Never Enable this option unless you -really- know what you are doing. It "
"permits APT to temporarily remove an essential package to break a Conflicts/"
@@ -4465,87 +4596,98 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:190
+#: apt.conf.5.xml:201
msgid "Cache-Limit"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:191
+#: apt.conf.5.xml:202
msgid ""
"APT uses a fixed size memory mapped cache file to store the 'available' "
"information. This sets the size of that cache (in bytes)."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:195
+#: apt.conf.5.xml:206
msgid "Build-Essential"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:196
+#: apt.conf.5.xml:207
msgid "Defines which package(s) are considered essential build dependencies."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:210
msgid "Get"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:200
+#: apt.conf.5.xml:211
msgid ""
"The Get subsection controls the &apt-get; tool, please see its documentation "
"for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:204
+#: apt.conf.5.xml:215
msgid "Cache"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:205
+#: apt.conf.5.xml:216
msgid ""
"The Cache subsection controls the &apt-cache; tool, please see its "
"documentation for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:209
+#: apt.conf.5.xml:220
msgid "CDROM"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:210
+#: apt.conf.5.xml:221
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool, please see its "
"documentation for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:216
+#: apt.conf.5.xml:227
msgid "The Acquire Group"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:232
msgid "PDiffs"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:222
+#: apt.conf.5.xml:233
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for Packages or "
"Sources files instead of downloading whole ones. True by default."
msgstr ""
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:236
+msgid ""
+"Two sub-options to limit the use of PDiffs are also available: With "
+"<literal>FileLimit</literal> can be specified how many PDiff files are "
+"downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
+"other hand is the maximum precentage of the size of all patches compared to "
+"the size of the targeted file. If one of these limits is exceeded the "
+"complete file is downloaded instead of the patches."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:227
+#: apt.conf.5.xml:245
msgid "Queue-Mode"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:228
+#: apt.conf.5.xml:246
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
"literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -4555,36 +4697,36 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:235
+#: apt.conf.5.xml:253
msgid "Retries"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:254
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:240
+#: apt.conf.5.xml:258
msgid "Source-Symlinks"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:241
+#: apt.conf.5.xml:259
msgid ""
"Use symlinks for source archives. If set to true then source archives will "
"be symlinked when possible instead of copying. True is the default."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:245 sources.list.5.xml:139
+#: apt.conf.5.xml:263 sources.list.5.xml:139
msgid "http"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:246
+#: apt.conf.5.xml:264
msgid ""
"HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
"standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@ -4595,7 +4737,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:254
+#: apt.conf.5.xml:272
msgid ""
"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
"caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@ -4609,7 +4751,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:264 apt.conf.5.xml:328
+#: apt.conf.5.xml:282 apt.conf.5.xml:346
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method, this applies to all things including connection timeout and data "
@@ -4617,7 +4759,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:267
+#: apt.conf.5.xml:285
msgid ""
"One setting is provided to control the pipeline depth in cases where the "
"remote server is not RFC conforming or buggy (such as Squid 2.0.2). "
@@ -4629,7 +4771,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:275
+#: apt.conf.5.xml:293
msgid ""
"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
"literal> which accepts integer values in kilobyte. The default value is 0 "
@@ -4639,7 +4781,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:280
+#: apt.conf.5.xml:298
msgid ""
"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
"User-Agent for the http download method as some proxies allow access for "
@@ -4647,12 +4789,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:286
+#: apt.conf.5.xml:304
msgid "https"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:287
+#: apt.conf.5.xml:305
msgid ""
"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
"options are the same as for <literal>http</literal> method and will also "
@@ -4662,7 +4804,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:311
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -4683,12 +4825,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:311 sources.list.5.xml:150
+#: apt.conf.5.xml:329 sources.list.5.xml:150
msgid "ftp"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:312
+#: apt.conf.5.xml:330
msgid ""
"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@ -4707,7 +4849,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#: apt.conf.5.xml:349
msgid ""
"Several settings are provided to control passive mode. Generally it is safe "
"to leave passive mode on, it works in nearly every environment. However "
@@ -4717,7 +4859,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:338
+#: apt.conf.5.xml:356
msgid ""
"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
"envar> environment variable to a http url - see the discussion of the http "
@@ -4726,7 +4868,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:343
+#: apt.conf.5.xml:361
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4736,18 +4878,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:350 sources.list.5.xml:132
+#: apt.conf.5.xml:368 sources.list.5.xml:132
msgid "cdrom"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:356
+#: apt.conf.5.xml:374
#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:369
msgid ""
"CDROM URIs; the only setting for CDROM URIs is the mount point, "
"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@ -4760,12 +4902,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:361
+#: apt.conf.5.xml:379
msgid "gpgv"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:362
+#: apt.conf.5.xml:380
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
@@ -4773,18 +4915,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:385
msgid "CompressionTypes"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:373
+#: apt.conf.5.xml:391
#, no-wrap
msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:368
+#: apt.conf.5.xml:386
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -4796,19 +4938,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:378
+#: apt.conf.5.xml:396
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:381
+#: apt.conf.5.xml:399
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:374
+#: apt.conf.5.xml:392
msgid ""
"Also the <literal>Order</literal> subgroup can be used to define in which "
"order the acquire system will try to download the compressed files. The "
@@ -4825,13 +4967,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:385
+#: apt.conf.5.xml:403
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:383
+#: apt.conf.5.xml:401
msgid ""
"Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
"replaceable></literal> will be checked: If this setting exists the method "
@@ -4846,7 +4988,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:408
msgid ""
"While it is possible to add an empty compression type to the order list, but "
"APT in its current version doesn't understand it correctly and will display "
@@ -4856,36 +4998,36 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:396
+#: apt.conf.5.xml:414
msgid "Languages"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:397
+#: apt.conf.5.xml:415
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the Description-"
-"Translations. APT will try to display the first available Description for "
-"the Language which is listed at first. Languages can be defined with their "
-"short or long Languagecodes. Note that not all archives provide "
+"Translations. APT will try to display the first available Description in the "
+"Language which is listed at first. Languages can be defined with their short "
+"or long Languagecodes. Note that not all archives provide "
"<filename>Translation</filename> files for every Language - especially the "
"long Languagecodes are rare, so please inform you which ones are available "
"before you set here impossible values."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:413
+#: apt.conf.5.xml:431
#, no-wrap
msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:421
msgid ""
"The default list includes \"environment\" and \"en\". "
"\"<literal>environment</literal>\" has a special meaning here: It will be "
"replaced at runtime with the languagecodes extracted from the "
-"<literal>LC_MESSAGES</literal> enviroment variable. It will also ensure "
+"<literal>LC_MESSAGES</literal> environment variable. It will also ensure "
"that these codes are not included twice in the list. If "
"<literal>LC_MESSAGES</literal> is set to \"C\" only the "
"<filename>Translation-en</filename> file (if available) will be used. To "
@@ -4894,7 +5036,7 @@ msgid ""
"meaning code which will stop the search for a fitting <filename>Translation</"
"filename> file. This can be used by the system administrator to let APT "
"know that it should download also this files without actually use them if "
-"not the environment specifies this languages. So the following example "
+"the environment doesn't specify this languages. So the following example "
"configuration will result in the order \"en, de\" in an english and in \"de, "
"en\" in a german localization. Note that \"fr\" is downloaded, but not used "
"if APT is not used in a french localization, in such an environment the "
@@ -4903,19 +5045,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:217
+#: apt.conf.5.xml:228
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:438
msgid "Directories"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:422
+#: apt.conf.5.xml:440
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -4927,7 +5069,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:429
+#: apt.conf.5.xml:447
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4940,7 +5082,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:438
+#: apt.conf.5.xml:456
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4950,7 +5092,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:444
+#: apt.conf.5.xml:462
msgid ""
"The <literal>Dir::Parts</literal> setting reads in all the config fragments "
"in lexical order from the directory specified. After this is done then the "
@@ -4958,7 +5100,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:448
+#: apt.conf.5.xml:466
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4969,7 +5111,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:456
+#: apt.conf.5.xml:474
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4982,13 +5124,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:469
+#: apt.conf.5.xml:487
#, fuzzy
msgid "APT in DSelect"
msgstr "DSelect"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:471
+#: apt.conf.5.xml:489
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -4996,12 +5138,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:475
+#: apt.conf.5.xml:493
msgid "Clean"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:476
+#: apt.conf.5.xml:494
msgid ""
"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
"and never. always and prompt will remove all packages from the cache after "
@@ -5012,50 +5154,50 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:485
+#: apt.conf.5.xml:503
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the install phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:489
+#: apt.conf.5.xml:507
msgid "Updateoptions"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:508
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the update phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:494
+#: apt.conf.5.xml:512
msgid "PromptAfterUpdate"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:495
+#: apt.conf.5.xml:513
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:501
+#: apt.conf.5.xml:519
msgid "How APT calls dpkg"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:520
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:507
+#: apt.conf.5.xml:525
msgid ""
"This is a list of options to pass to dpkg. The options must be specified "
"using the list notation and each list item is passed as a single argument to "
@@ -5063,17 +5205,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:530
msgid "Pre-Invoke"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:530
msgid "Post-Invoke"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:513
+#: apt.conf.5.xml:531
msgid ""
"This is a list of shell commands to run before/after invoking &dpkg;. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -5082,12 +5224,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:519
+#: apt.conf.5.xml:537
msgid "Pre-Install-Pkgs"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:520
+#: apt.conf.5.xml:538
msgid ""
"This is a list of shell commands to run before invoking dpkg. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -5097,7 +5239,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:526
+#: apt.conf.5.xml:544
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -5107,36 +5249,36 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:533
+#: apt.conf.5.xml:551
msgid "Run-Directory"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:534
+#: apt.conf.5.xml:552
msgid ""
"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
"</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:556
msgid "Build-options"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:557
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages, the "
"default is to disable signing and produce all binaries."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:544
+#: apt.conf.5.xml:562
msgid "dpkg trigger usage (and related options)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:545
+#: apt.conf.5.xml:563
msgid ""
"APT can call dpkg in a way so it can make aggressive use of triggers over "
"multiply calls of dpkg. Without further options dpkg will use triggers only "
@@ -5151,7 +5293,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:578
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -5161,7 +5303,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:554
+#: apt.conf.5.xml:572
msgid ""
"Note that it is not guaranteed that APT will support these options or that "
"these options will not cause (big) trouble in the future. If you have "
@@ -5175,12 +5317,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:584
msgid "DPkg::NoTriggers"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:567
+#: apt.conf.5.xml:585
msgid ""
"Add the no triggers flag to all dpkg calls (except the ConfigurePending "
"call). See &dpkg; if you are interested in what this actually means. In "
@@ -5192,12 +5334,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:574
+#: apt.conf.5.xml:592
msgid "PackageManager::Configure"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:575
+#: apt.conf.5.xml:593
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
@@ -5213,12 +5355,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:603
msgid "DPkg::ConfigurePending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:586
+#: apt.conf.5.xml:604
msgid ""
"If this option is set apt will call <command>dpkg --configure --pending</"
"command> to let dpkg handle all required configurations and triggers. This "
@@ -5229,12 +5371,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:592
+#: apt.conf.5.xml:610
msgid "DPkg::TriggersPending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:593
+#: apt.conf.5.xml:611
msgid ""
"Useful for <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -5244,12 +5386,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:616
msgid "PackageManager::UnpackAll"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:599
+#: apt.conf.5.xml:617
msgid ""
"As the configuration can be deferred to be done at the end by dpkg it can be "
"tried to order the unpack series only by critical needs, e.g. by Pre-"
@@ -5261,12 +5403,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:606
+#: apt.conf.5.xml:624
msgid "OrderList::Score::Immediate"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:632
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -5278,7 +5420,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:625
msgid ""
"Essential packages (and there dependencies) should be configured immediately "
"after unpacking. It will be a good idea to do this quite early in the "
@@ -5292,12 +5434,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:627
+#: apt.conf.5.xml:645
msgid "Periodic and Archives options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:628
+#: apt.conf.5.xml:646
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -5306,12 +5448,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:636
+#: apt.conf.5.xml:654
msgid "Debug options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:638
+#: apt.conf.5.xml:656
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -5322,7 +5464,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:667
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -5330,7 +5472,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:657
+#: apt.conf.5.xml:675
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -5338,7 +5480,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:666
+#: apt.conf.5.xml:684
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -5348,111 +5490,111 @@ msgstr ""
#. motivating example, except I haven't a clue why you'd want
#. to do this.
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:674
+#: apt.conf.5.xml:692
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CDROM IDs."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:702
msgid "A full list of debugging options to apt follows."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:689
+#: apt.conf.5.xml:707
msgid "<literal>Debug::Acquire::cdrom</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:711
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:700
+#: apt.conf.5.xml:718
msgid "<literal>Debug::Acquire::ftp</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:704
+#: apt.conf.5.xml:722
msgid "Print information related to downloading packages using FTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:729
msgid "<literal>Debug::Acquire::http</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:733
msgid "Print information related to downloading packages using HTTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:722
+#: apt.conf.5.xml:740
msgid "<literal>Debug::Acquire::https</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:744
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:751
msgid "<literal>Debug::Acquire::gpgv</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:755
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:744
+#: apt.conf.5.xml:762
msgid "<literal>Debug::aptcdrom</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:748
+#: apt.conf.5.xml:766
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:755
+#: apt.conf.5.xml:773
msgid "<literal>Debug::BuildDeps</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:776
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:783
msgid "<literal>Debug::Hashes</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:768
+#: apt.conf.5.xml:786
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:775
+#: apt.conf.5.xml:793
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:778
+#: apt.conf.5.xml:796
msgid ""
"Do not include information from <literal>statfs</literal>, namely the number "
"of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -5460,93 +5602,93 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:786
+#: apt.conf.5.xml:804
msgid "<literal>Debug::NoLocking</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:807
msgid ""
"Disable all file locking. For instance, this will allow two instances of "
"<quote><literal>apt-get update</literal></quote> to run at the same time."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:815
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:819
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:808
+#: apt.conf.5.xml:826
msgid "<literal>Debug::pkgAcquire::Auth</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:811
+#: apt.conf.5.xml:829
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:818
+#: apt.conf.5.xml:836
msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:821
+#: apt.conf.5.xml:839
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:829
+#: apt.conf.5.xml:847
msgid "<literal>Debug::pkgAcquire::RRed</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:833
+#: apt.conf.5.xml:851
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:840
+#: apt.conf.5.xml:858
msgid "<literal>Debug::pkgAcquire::Worker</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:844
+#: apt.conf.5.xml:862
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:851
+#: apt.conf.5.xml:869
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:873
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:862
+#: apt.conf.5.xml:880
msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:883
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -5556,12 +5698,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:876
+#: apt.conf.5.xml:894
msgid "<literal>Debug::pkgDepCache::Marker</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:897
msgid ""
"Generate debug messages describing which package is marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -5578,91 +5720,91 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:898
+#: apt.conf.5.xml:916
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:901
+#: apt.conf.5.xml:919
msgid "Dump the default configuration to standard error on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:908
+#: apt.conf.5.xml:926
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:911
+#: apt.conf.5.xml:929
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:919
+#: apt.conf.5.xml:937
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:922
+#: apt.conf.5.xml:940
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:947
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:933
+#: apt.conf.5.xml:951
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:941
+#: apt.conf.5.xml:959
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:945
+#: apt.conf.5.xml:963
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:952
+#: apt.conf.5.xml:970
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:974
msgid "Output the priority of each package list on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:962
+#: apt.conf.5.xml:980
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:966
+#: apt.conf.5.xml:984
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:974
+#: apt.conf.5.xml:992
msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:977
+#: apt.conf.5.xml:995
msgid ""
"Display a list of all installed packages with their calculated score used by "
"the pkgProblemResolver. The description of the package is the same as "
@@ -5670,32 +5812,32 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:985
+#: apt.conf.5.xml:1003
msgid "<literal>Debug::sourceList</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:989
+#: apt.conf.5.xml:1007
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1012
+#: apt.conf.5.xml:1030
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1019
+#: apt.conf.5.xml:1037
msgid "&file-aptconf;"
msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:1042
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr ""
@@ -5747,25 +5889,36 @@ msgid ""
"choice of instance, only the choice of version."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><title>
+#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:56
+msgid ""
+"Note that the files in the <filename>/etc/apt/preferences.d</filename> "
+"directory are parsed in alphanumeric ascending order and need to obey the "
+"following naming convention: The files have no or \"<literal>pref</literal>"
+"\" as filename extension and which only contain alphanumeric, hyphen (-), "
+"underscore (_) and period (.) characters - otherwise they will be silently "
+"ignored."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt_preferences.5.xml:63
msgid "APT's Default Priority Assignments"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:71
+#: apt_preferences.5.xml:78
#, no-wrap
msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:74
+#: apt_preferences.5.xml:81
#, no-wrap
msgid "APT::Default-Release \"stable\";\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:58
+#: apt_preferences.5.xml:65
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 "
@@ -5781,40 +5934,40 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:83
+#: apt_preferences.5.xml:90
msgid "priority 100"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:84
+#: apt_preferences.5.xml:91
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:88
+#: apt_preferences.5.xml:95
msgid "priority 500"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:89
+#: apt_preferences.5.xml:96
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:93
+#: apt_preferences.5.xml:100
msgid "priority 990"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:94
+#: apt_preferences.5.xml:101
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:78
+#: apt_preferences.5.xml:85
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: "
@@ -5822,7 +5975,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:99
+#: apt_preferences.5.xml:106
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 "
@@ -5830,14 +5983,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml:110
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:106
+#: apt_preferences.5.xml:113
msgid ""
"Never downgrade unless the priority of an available version exceeds 1000. "
"(\"Downgrading\" is installing a less recent version of a package in place "
@@ -5847,19 +6000,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:112
+#: apt_preferences.5.xml:119
msgid "Install the highest priority version."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:113
+#: apt_preferences.5.xml:120
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:116
+#: apt_preferences.5.xml:123
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</"
@@ -5867,7 +6020,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:122
+#: apt_preferences.5.xml:129
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 "
@@ -5877,7 +6030,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml:136
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 "
@@ -5886,7 +6039,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:141
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 "
@@ -5898,12 +6051,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:143
+#: apt_preferences.5.xml:150
msgid "The Effect of APT Preferences"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:145
+#: apt_preferences.5.xml:152
msgid ""
"The APT preferences file allows the system administrator to control the "
"assignment of priorities. The file consists of one or more multi-line "
@@ -5912,7 +6065,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:151
+#: apt_preferences.5.xml:158
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 "
@@ -5922,7 +6075,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:158
+#: apt_preferences.5.xml:165
#, no-wrap
msgid ""
"Package: perl\n"
@@ -5931,7 +6084,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:164
+#: apt_preferences.5.xml:171
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 "
@@ -5941,7 +6094,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:170
+#: apt_preferences.5.xml:177
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 "
@@ -5949,7 +6102,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:175
+#: apt_preferences.5.xml:182
#, no-wrap
msgid ""
"Package: *\n"
@@ -5958,7 +6111,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:180
+#: apt_preferences.5.xml:187
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 "
@@ -5968,7 +6121,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:186
+#: apt_preferences.5.xml:193
msgid ""
"The following record assigns a low priority to all package versions "
"belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -5976,7 +6129,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:190
+#: apt_preferences.5.xml:197
#, no-wrap
msgid ""
"Package: *\n"
@@ -5985,7 +6138,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:195
+#: apt_preferences.5.xml:202
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is \"<literal>squeeze</literal>"
@@ -5993,7 +6146,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:199
+#: apt_preferences.5.xml:206
#, no-wrap
msgid ""
"Package: *\n"
@@ -6002,7 +6155,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:204
+#: apt_preferences.5.xml:211
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -6010,7 +6163,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:209
+#: apt_preferences.5.xml:216
#, no-wrap
msgid ""
"Package: *\n"
@@ -6019,82 +6172,82 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:220
+#: apt_preferences.5.xml:227
msgid "How APT Interprets Priorities"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:228
+#: apt_preferences.5.xml:235
msgid "P &gt; 1000"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:229
+#: apt_preferences.5.xml:236
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:233
+#: apt_preferences.5.xml:240
msgid "990 &lt; P &lt;=1000"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:234
+#: apt_preferences.5.xml:241
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:239
+#: apt_preferences.5.xml:246
msgid "500 &lt; P &lt;=990"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:240
+#: apt_preferences.5.xml:247
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:245
+#: apt_preferences.5.xml:252
msgid "100 &lt; P &lt;=500"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:246
+#: apt_preferences.5.xml:253
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:251
+#: apt_preferences.5.xml:258
msgid "0 &lt; P &lt;=100"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:252
+#: apt_preferences.5.xml:259
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:256
+#: apt_preferences.5.xml:263
msgid "P &lt; 0"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:257
+#: apt_preferences.5.xml:264
msgid "prevents the version from being installed"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:223
+#: apt_preferences.5.xml:230
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -6102,7 +6255,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:262
+#: apt_preferences.5.xml:269
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -6111,14 +6264,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:268
+#: apt_preferences.5.xml:275
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:272
+#: apt_preferences.5.xml:279
#, no-wrap
msgid ""
"Package: perl\n"
@@ -6135,12 +6288,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:285
+#: apt_preferences.5.xml:292
msgid "Then:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:294
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 "
@@ -6150,7 +6303,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:292
+#: apt_preferences.5.xml:299
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -6158,7 +6311,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:296
+#: apt_preferences.5.xml:303
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</"
@@ -6167,12 +6320,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:313
msgid "Determination of Package Version and Distribution Properties"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:308
+#: apt_preferences.5.xml:315
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -6180,27 +6333,27 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:320
+#: apt_preferences.5.xml:327
msgid "the <literal>Package:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:321
+#: apt_preferences.5.xml:328
msgid "gives the package name"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:324 apt_preferences.5.xml:374
+#: apt_preferences.5.xml:331 apt_preferences.5.xml:381
msgid "the <literal>Version:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:325
+#: apt_preferences.5.xml:332
msgid "gives the version number for the named package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:319
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -6213,12 +6366,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:341
+#: apt_preferences.5.xml:348
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:342
+#: apt_preferences.5.xml:349
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -6229,18 +6382,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:352
+#: apt_preferences.5.xml:359
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:358
+#: apt_preferences.5.xml:365
msgid "the <literal>Codename:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:359
+#: apt_preferences.5.xml:366
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 "
@@ -6250,13 +6403,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:368
+#: apt_preferences.5.xml:375
#, no-wrap
msgid "Pin: release n=squeeze\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:375
+#: apt_preferences.5.xml:382
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 "
@@ -6266,7 +6419,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:384
+#: apt_preferences.5.xml:391
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -6275,12 +6428,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:393
+#: apt_preferences.5.xml:400
msgid "the <literal>Component:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:394
+#: apt_preferences.5.xml:401
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -6291,18 +6444,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:403
+#: apt_preferences.5.xml:410
#, no-wrap
msgid "Pin: release c=main\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:416
msgid "the <literal>Origin:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:410
+#: apt_preferences.5.xml:417
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -6311,18 +6464,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:416
+#: apt_preferences.5.xml:423
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:422
+#: apt_preferences.5.xml:429
msgid "the <literal>Label:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:423
+#: apt_preferences.5.xml:430
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -6331,13 +6484,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:429
+#: apt_preferences.5.xml:436
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:330
+#: apt_preferences.5.xml:337
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -6350,7 +6503,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:436
+#: apt_preferences.5.xml:443
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -6365,12 +6518,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:449
+#: apt_preferences.5.xml:456
msgid "Optional Lines in an APT Preferences Record"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:451
+#: apt_preferences.5.xml:458
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -6378,7 +6531,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:455
+#: apt_preferences.5.xml:462
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 "
@@ -6387,12 +6540,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:471
msgid "Tracking Stable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:472
+#: apt_preferences.5.xml:479
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6407,7 +6560,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:466
+#: apt_preferences.5.xml:473
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 "
@@ -6417,8 +6570,8 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:489 apt_preferences.5.xml:535
-#: apt_preferences.5.xml:593
+#: apt_preferences.5.xml:496 apt_preferences.5.xml:542
+#: apt_preferences.5.xml:600
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -6427,7 +6580,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:484
+#: apt_preferences.5.xml:491
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 "
@@ -6436,13 +6589,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:501
+#: apt_preferences.5.xml:508
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:495
+#: apt_preferences.5.xml:502
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -6451,12 +6604,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:507
+#: apt_preferences.5.xml:514
msgid "Tracking Testing or Unstable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:516
+#: apt_preferences.5.xml:523
#, no-wrap
msgid ""
"Package: *\n"
@@ -6473,7 +6626,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:509
+#: apt_preferences.5.xml:516
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -6484,7 +6637,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:530
+#: apt_preferences.5.xml:537
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 "
@@ -6493,13 +6646,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:550
+#: apt_preferences.5.xml:557
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:541
+#: apt_preferences.5.xml:548
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -6511,12 +6664,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:564
msgid "Tracking the evolution of a codename release"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:571
+#: apt_preferences.5.xml:578
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -6536,7 +6689,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:559
+#: apt_preferences.5.xml:566
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 "
@@ -6551,7 +6704,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:588
+#: apt_preferences.5.xml:595
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 "
@@ -6560,13 +6713,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:608
+#: apt_preferences.5.xml:615
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:599
+#: apt_preferences.5.xml:606
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -6578,12 +6731,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:617
+#: apt_preferences.5.xml:624
msgid "&file-preferences;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:623
+#: apt_preferences.5.xml:630
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr ""
@@ -6812,7 +6965,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
#: sources.list.5.xml:178
-msgid "more recongnizable URI types"
+msgid "more recognizable URI types"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
@@ -6820,9 +6973,9 @@ msgstr ""
msgid ""
"APT can be extended with more methods shipped in other optional packages "
"which should follow the nameing scheme <literal>apt-transport-"
-"<replaceable>method</replaceable></literal>. The APT team e.g. maintain "
+"<replaceable>method</replaceable></literal>. The APT team e.g. maintains "
"also the <literal>apt-transport-https</literal> package which provides "
-"access methods for https-URIs with features similiar to the http method, but "
+"access methods for https-URIs with features similar to the http method, but "
"other methods for using e.g. debtorrent are also available, see "
"<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></"
"refentrytitle> <manvolnum>1</manvolnum></citerefentry>."
@@ -7075,7 +7228,7 @@ msgstr ""
#, fuzzy
msgid ""
"For instance, mailcrypt is an emacs extension that aids in encrypting email "
-"with GPG. Without GPGP installed mail-crypt is useless, so mailcrypt has a "
+"with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
"simple dependency on GPG. Also, because it is an emacs extension it has a "
"simple dependency on emacs, without emacs it is completely useless."
msgstr ""
@@ -7315,8 +7468,8 @@ msgstr ""
#: guide.sgml:184
#, fuzzy
msgid ""
-"To enable the APT method you need to to select [A]ccess in <prgn>dselect</"
-"prgn> and then choose the APT method. You will be prompted for a set of "
+"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
+"and then choose the APT method. You will be prompted for a set of "
"<em>Sources</em> which are places to fetch archives from. These can be "
"remote Internet sites, local Debian mirrors or CDROMs. Each source can "
"provide a fragment of the total Debian archive, APT will automatically "
@@ -7456,7 +7609,7 @@ msgstr ""
#, fuzzy
msgid ""
"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a super-set of "
+"available list by selecting [U]pdate from the menu. This is a superset of "
"<tt>apt-get update</tt> that makes the fetched information available to "
"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
"tt> has been run before."
@@ -8169,7 +8322,7 @@ msgstr ""
#: offline.sgml:57
msgid ""
"This is achieved by creatively manipulating the APT configuration file. The "
-"essential premis to tell APT to look on a disc for it's archive files. Note "
+"essential premise to tell APT to look on a disc for it's archive files. Note "
"that the disc should be formated with a filesystem that can handle long file "
"names such as ext2, fat32 or vfat."
msgstr ""
@@ -8267,8 +8420,8 @@ msgid ""
"On the target machine the first thing to do is mount the disc and copy <em>/"
"var/lib/dpkg/status</em> to it. You will also need to create the directories "
"outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
-"em> Then take the disc to the remote machine and configure the sources.list. "
-"On the remote machine execute the following:"
+"em>. Then take the disc to the remote machine and configure the sources."
+"list. On the remote machine execute the following:"
msgstr ""
#. type: <example></example>
@@ -8285,9 +8438,9 @@ msgstr ""
#. type: </example></p>
#: offline.sgml:149
msgid ""
-"The dist-upgrade command can be replaced with any-other standard APT "
+"The dist-upgrade command can be replaced with any other standard APT "
"commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em> However this presents a problem in communicating "
+"such as <em>dselect</em>. However this presents a problem in communicating "
"your selections back to the local computer."
msgstr ""
diff --git a/doc/po/ja.po b/doc/po/ja.po
index ba04b200f..f1a766d97 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-27 00:05+0100\n"
+"POT-Creation-Date: 2010-01-20 12:18+0100\n"
"PO-Revision-Date: 2009-07-30 22:55+0900\n"
"Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1061,7 +1061,7 @@ msgstr "&sources-list; に指定した、パッケージリソースごとの状
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Plain text
-#: apt.ent:355
+#: apt.ent:356
#, fuzzy, no-wrap
#| msgid "Storage area for state information in transit. Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial)."
msgid ""
@@ -1072,6 +1072,69 @@ msgid ""
"\">\n"
msgstr "取得中状態情報格納エリア。設定項目 - <literal>Dir::State::Lists</literal> (必然的に不完全)"
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Plain text
+#: apt.ent:362
+#, 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-trustedgpg \"\n"
+" <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n"
+" <listitem><para>Keyring of local trusted keys, new keys will be added here.\n"
+" Configuration Item: <literal>Dir::Etc::Trusted</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:369
+#, fuzzy, no-wrap
+#| msgid "Storage area for state information in transit. Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial)."
+msgid ""
+" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
+" <listitem><para>File fragments for the trusted keys, additional keyrings can\n"
+" be stored here (by other packages or the administrator).\n"
+" Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+"\">\n"
+msgstr "取得中状態情報格納エリア。設定項目 - <literal>Dir::State::Lists</literal> (必然的に不完全)"
+
+#. type: Plain text
+#: apt.ent:371
+msgid "<!ENTITY translation-title \"TRANSLATION\">"
+msgstr "<!ENTITY translation-title \"訳者\">"
+
+#. type: Plain text
+#: apt.ent:380
+#, no-wrap
+msgid ""
+"<!-- TRANSLATOR: This is a placeholder. You should write here who has constributed\n"
+" to the translation in the past, who is responsible now and maybe further information\n"
+" specially related to your translation. -->\n"
+"<!ENTITY translation-holder \"\n"
+" The english translation was done by John Doe <email>john@doe.org</email> in 2009,\n"
+" 2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together with the\n"
+" Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>.\n"
+"\">\n"
+msgstr ""
+"<!ENTITY translation-holder \"\n"
+" 倉澤 望 <email>nabetaro@debian.or.jp</email> (2003-2006,2009),\n"
+" Debian JP Documentation ML <email>debian-doc@debian.or.jp</email>\n"
+"\">\n"
+
+#. type: Plain text
+#: apt.ent:387
+#, no-wrap
+msgid ""
+"<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
+" in a shipped manpage will maybe appear english parts. -->\n"
+"<!ENTITY translation-english \"\n"
+" Note that this translated document may contain untranslated parts.\n"
+" This is done on purpose, to avoid losing content when the\n"
+" translation is lagging behind the original content.\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
@@ -1160,7 +1223,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: 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-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40
#: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33
#: sources.list.5.xml:33
msgid "Description"
@@ -1724,7 +1787,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89
-#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:484 apt.conf.5.xml:506
+#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524
msgid "options"
msgstr "オプション"
@@ -1966,15 +2029,15 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:556 apt-get.8.xml:554
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 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:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122
-#: apt.conf.5.xml:1017 apt_preferences.5.xml:615
+#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122
+#: apt.conf.5.xml:1035 apt_preferences.5.xml:622
msgid "Files"
msgstr "ファイル"
@@ -1986,9 +2049,9 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569
-#: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569
+#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629
#: sources.list.5.xml:233
msgid "See Also"
msgstr "関連項目"
@@ -2002,7 +2065,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:576 apt-get.8.xml:575
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575
#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
msgstr "診断メッセージ"
@@ -2140,7 +2203,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:91
+#: apt-cdrom.8.xml:91 apt-key.8.xml:139
msgid "Options"
msgstr "オプション"
@@ -2403,7 +2466,7 @@ msgstr "設定箇所の内容を表示するだけです。"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585
#: apt-sortpkgs.1.xml:70
msgid "&apt-conf;"
msgstr "&apt-conf;"
@@ -3166,8 +3229,12 @@ 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:288
+#, fuzzy
+#| msgid ""
+#| "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
+#| "source/Sources</filename>"
msgid ""
-"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
+"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
"source/Sources</filename>"
msgstr ""
"Packages ファイルの出力先を設定します。デフォルトは <filename>$(DIST)/"
@@ -3318,29 +3385,39 @@ msgstr ""
"<literal>TreeDefault</literal> セクションで定義される設定はすべて、3 個の新し"
"い変数と同様に、<literal>Tree</literal> セクションで使用できます。"
-# type: Content of: <refentry><refsect1><refsect2><para><informalexample>
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:351
-msgid ""
-"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
-"command> performs an operation similar to:"
-msgstr ""
-"<literal>Tree</literal> セクションを処理する際、<command>apt-ftparchive</"
-"command> は以下のような操作を行います。"
-
# type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting>
-#. type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting>
+#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt-ftparchive.1.xml:354
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "for i in Sections do \n"
+#| " for j in Architectures do\n"
+#| " Generate for DIST=scope SECTION=i ARCH=j\n"
msgid ""
"for i in Sections do \n"
" for j in Architectures do\n"
" Generate for DIST=scope SECTION=i ARCH=j\n"
+" "
msgstr ""
"for i in Sections do \n"
" for j in Architectures do\n"
" Generate for DIST=scope SECTION=i ARCH=j\n"
+# type: Content of: <refentry><refsect1><refsect2><para><informalexample>
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-ftparchive.1.xml:351
+#, fuzzy
+#| msgid ""
+#| "When processing a <literal>Tree</literal> section <command>apt-"
+#| "ftparchive</command> performs an operation similar to:"
+msgid ""
+"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
+"command> performs an operation similar to: <placeholder type=\"programlisting"
+"\" id=\"0\"/>"
+msgstr ""
+"<literal>Tree</literal> セクションを処理する際、<command>apt-ftparchive</"
+"command> は以下のような操作を行います。"
+
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:360
@@ -3723,12 +3800,33 @@ msgstr ""
#: apt-ftparchive.1.xml:547
#, fuzzy
#| msgid "<option>--version</option>"
-msgid "<option>APT::FTPArchive::LongDescription</option>"
+msgid "<option>APT::FTPArchive::AlwaysStat</option>"
msgstr "<option>--version</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:549
msgid ""
+"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If "
+"packages are recompiled and/or republished with the same version again, this "
+"will lead to problems as the now outdated cached metadata like size and "
+"checksums will be used. With this option enabled this will no longer happen "
+"as it will be checked if the file was changed. Note that this option is set "
+"to \"<literal>false</literal>\" by default as it is not recommend to upload "
+"multiply versions/builds of a package with the same versionnumber, so in "
+"theory nobody will have these problems and therefore all these extra checks "
+"are useless."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:559
+#, fuzzy
+#| msgid "<option>--version</option>"
+msgid "<option>APT::FTPArchive::LongDescription</option>"
+msgstr "<option>--version</option>"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:561
+msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
"only be set to <literal>\"false\"</literal> if the Archive generated with "
"&apt-ftparchive; also provides <filename>Translation</filename> files. Note "
@@ -3738,21 +3836,21 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462
+#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469
#: sources.list.5.xml:193
msgid "Examples"
msgstr "サンプル"
# type: Content of: <refentry><refsect1><para><programlisting>
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:567
+#: apt-ftparchive.1.xml:579
#, 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:563
+#: apt-ftparchive.1.xml:575
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3762,7 +3860,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:577
+#: apt-ftparchive.1.xml:589
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -3903,7 +4001,7 @@ msgstr ""
"&gnome-apt;, &wajig; などがあります。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:135 apt-key.8.xml:123
+#: apt-get.8.xml:135 apt-key.8.xml:124
msgid "update"
msgstr "update"
@@ -4366,18 +4464,31 @@ 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:334
+#, fuzzy
+#| msgid ""
+#| "Fix; attempt to correct a system with broken dependencies in place. This "
+#| "option, when used with install/remove, can omit any packages to permit "
+#| "APT to deduce a likely solution. Any Package that are specified must "
+#| "completely correct the problem. The option is sometimes necessary when "
+#| "running APT for the first time; APT itself does not allow broken package "
+#| "dependencies to exist on a system. It is possible that a system's "
+#| "dependency structure can be so corrupt as to require manual intervention "
+#| "(which usually means using &dselect; or <command>dpkg --remove</command> "
+#| "to eliminate some of the offending packages). Use of this option together "
+#| "with <option>-m</option> may produce an error in some situations. "
+#| "Configuration Item: <literal>APT::Get::Fix-Broken</literal>."
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
-"to deduce a likely solution. Any Package that are specified must completely "
-"correct the problem. The option is sometimes necessary when running APT for "
-"the first time; APT itself does not allow broken package dependencies to "
-"exist on a system. It is possible that a system's dependency structure can "
-"be so corrupt as to require manual intervention (which usually means using "
-"&dselect; or <command>dpkg --remove</command> to eliminate some of the "
-"offending packages). Use of this option together with <option>-m</option> "
-"may produce an error in some situations. Configuration Item: <literal>APT::"
-"Get::Fix-Broken</literal>."
+"to deduce a likely solution. If packages are specified, these have to "
+"completely correct the problem. The option is sometimes necessary when "
+"running APT for the first time; APT itself does not allow broken package "
+"dependencies to exist on a system. It is possible that a system's dependency "
+"structure can be so corrupt as to require manual intervention (which usually "
+"means using &dselect; or <command>dpkg --remove</command> to eliminate some "
+"of the offending packages). Use of this option together with <option>-m</"
+"option> may produce an error in some situations. Configuration Item: "
+"<literal>APT::Get::Fix-Broken</literal>."
msgstr ""
"修復 - 依存関係が壊れたシステムの修正を試みます。このオプションを install や "
"remove と一緒に使うときは、パッケージを指定しなくてもかまいません。どのパッ"
@@ -4710,10 +4821,17 @@ 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:467
+#, fuzzy
+#| 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>."
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> "
+"<option>remove --purge</option> is equivalent to the <option>purge</option> "
"command. Configuration Item: <literal>APT::Get::Purge</literal>."
msgstr ""
"削除する際、「削除」ではなく「完全削除」を行います。「完全削除」を行うと指示"
@@ -4991,8 +5109,14 @@ msgstr "APT キー管理ユーティリティ"
# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-key.8.xml:28
+#, fuzzy
+#| msgid ""
+#| "<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> "
+#| "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></"
+#| "option></arg>"
msgid ""
-"<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> "
+"<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
+"replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
"<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></"
"arg>"
msgstr ""
@@ -5002,7 +5126,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:36
+#: apt-key.8.xml:37
msgid ""
"<command>apt-key</command> is used to manage the list of keys used by apt to "
"authenticate packages. Packages which have been authenticated using these "
@@ -5014,19 +5138,19 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:42
+#: apt-key.8.xml:43
msgid "Commands"
msgstr "コマンド"
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:44
+#: apt-key.8.xml:45
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:48
+#: apt-key.8.xml:49
msgid ""
"Add a new key to the list of trusted keys. The key is read from "
"<replaceable>filename</replaceable>, or standard input if "
@@ -5038,70 +5162,70 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:56
+#: apt-key.8.xml:57
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:60
+#: apt-key.8.xml:61
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:67
+#: apt-key.8.xml:68
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:71
+#: apt-key.8.xml:72
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:78
+#: apt-key.8.xml:79
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:82
+#: apt-key.8.xml:83
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:89
+#: apt-key.8.xml:90
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:93
+#: apt-key.8.xml:94
msgid "List trusted keys."
msgstr "信頼キーを一覧表示します。"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:100
+#: apt-key.8.xml:101
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:104
+#: apt-key.8.xml:105
msgid "List fingerprints of trusted keys."
msgstr "信頼キーのフィンガープリントを一覧表示します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:111
+#: apt-key.8.xml:112
msgid "adv"
msgstr "adv"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:115
+#: apt-key.8.xml:116
msgid ""
"Pass advanced options to gpg. With adv --recv-key you can download the "
"public key."
@@ -5111,7 +5235,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:127
+#: apt-key.8.xml:128
msgid ""
"Update the local keyring with the keyring of Debian archive keys and removes "
"from the keyring the archive keys which are no longer valid."
@@ -5119,43 +5243,62 @@ msgstr ""
"Debian アーカイブキーで、ローカルキーリングを更新し、もう有効でないキーをキー"
"リングから削除します。"
-# type: Content of: <refentry><refsect1><para>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><para>
#: apt-key.8.xml:140
-msgid "<filename>/etc/apt/trusted.gpg</filename>"
-msgstr "<filename>/etc/apt/trusted.gpg</filename>"
+msgid ""
+"Note that options need to be defined before the commands described in the "
+"previous section."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml:142
+#, fuzzy
+#| msgid "add <replaceable>filename</replaceable>"
+msgid "--keyring <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:141
-msgid "Keyring of local trusted keys, new keys will be added here."
-msgstr "ローカル信頼キーのキーリング。新しいキーはここに追加されます。"
+#: apt-key.8.xml:143
+msgid ""
+"With this option it is possible to specify a specific keyring file the "
+"command should operate on. The default is that a command is executed on the "
+"<filename>trusted.gpg</filename> file as well as on all parts in the "
+"<filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</"
+"filename> is the primary keyring which means that e.g. new keys are added to "
+"this one."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist>
+#: apt-key.8.xml:156
+msgid "&file-trustedgpg;"
+msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:144
+#: apt-key.8.xml:158
msgid "<filename>/etc/apt/trustdb.gpg</filename>"
msgstr "<filename>/etc/apt/trustdb.gpg</filename>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:145
+#: apt-key.8.xml:159
msgid "Local trust database of archive keys."
msgstr "アーカイブキーのローカル信頼データベースです。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:148
+#: apt-key.8.xml:162
msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:149
+#: apt-key.8.xml:163
msgid "Keyring of Debian archive trusted keys."
msgstr "Debian アーカイブ信頼キーのキーリングです。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:152
+#: apt-key.8.xml:166
msgid ""
"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
msgstr ""
@@ -5163,13 +5306,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:153
+#: apt-key.8.xml:167
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:164
+#: apt-key.8.xml:176
msgid "&apt-get;, &apt-secure;"
msgstr "&apt-get;, &apt-secure;"
@@ -5856,7 +5999,7 @@ 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>18 September 2009</date>"
+"&apt-product; <date>16 January 2010</date>"
msgstr ""
"&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
"firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
@@ -5880,31 +6023,64 @@ msgstr "5"
msgid "Configuration file for APT"
msgstr "APT の設定ファイル"
-# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:40
msgid ""
"<filename>apt.conf</filename> is the main configuration file for the APT "
-"suite of tools, all tools make use of the configuration file and a common "
-"command line parser to provide a uniform environment. When an APT tool "
-"starts up it will read the configuration specified by the <envar>APT_CONFIG</"
-"envar> environment variable (if any) and then read the files in "
-"<literal>Dir::Etc::Parts</literal> then read the main configuration file "
-"specified by <literal>Dir::Etc::main</literal> then finally apply the "
-"command line options to override the configuration directives, possibly "
-"loading even more config files."
-msgstr ""
-"<filename>apt.conf</filename> は、APT ツール集のメイン設定ファイルです。この"
-"設定ファイルと共通のコマンドラインパーサを使って、すべてのツールを統一環境で"
-"使用できます。APT ツールの起動時には、<envar>APT_CONFIG</envar> 環境変数に指"
-"定した設定を (存在すれば) 読み込みます。次に <literal>Dir::Etc::Parts</"
-"literal> のファイルを読み込みます。次に <literal>Dir::Etc::main</literal> で"
-"指定した主設定ファイルを読み込み、最後にコマンドラインオプションで、設定ファ"
-"イルより取得した値を上書きします。"
+"suite of tools, but by far not the only place changes to options can be "
+"made. All tools therefore share the configuration files and also use a "
+"common command line parser to provide a uniform environment."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><para>
+#: apt.conf.5.xml:45
+msgid ""
+"When an APT tool starts up it will read the configuration files in the "
+"following order:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:47
+msgid ""
+"the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
+"any)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:49
+msgid ""
+"all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
+"order which have no or \"<literal>conf</literal>\" as filename extension and "
+"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
+"characters - otherwise they will be silently ignored."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:54
+#, fuzzy
+#| msgid ""
+#| "APT configuration file. Configuration Item: <literal>Dir::Etc::Main</"
+#| "literal>."
+msgid ""
+"the main configuration file specified by <literal>Dir::Etc::main</literal>"
+msgstr "APT 設定ファイル。設定項目 - <literal>Dir::Etc::Main</literal>"
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:56
+msgid ""
+"the command line options are applied to override the configuration "
+"directives or to load even more configuration files."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.conf.5.xml:60
+msgid "Syntax"
+msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:50
+#: apt.conf.5.xml:61
#, fuzzy
#| msgid ""
#| "The configuration file is organized in a tree with options organized into "
@@ -5926,7 +6102,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:56
+#: apt.conf.5.xml:67
#, fuzzy
#| msgid ""
#| "Syntactically the configuration language is modeled after what the ISC "
@@ -5959,7 +6135,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><informalexample><programlisting>
#. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:70
+#: apt.conf.5.xml:81
#, no-wrap
msgid ""
"APT {\n"
@@ -5978,7 +6154,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:78
+#: apt.conf.5.xml:89
msgid ""
"with newlines placed to make it more readable. Lists can be created by "
"opening a scope and including a single string enclosed in quotes followed by "
@@ -5990,14 +6166,14 @@ msgstr ""
# type: Content of: <refentry><refsect1><informalexample><programlisting>
#. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:83
+#: apt.conf.5.xml:94
#, no-wrap
msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:86
+#: apt.conf.5.xml:97
msgid ""
"In general the sample configuration file in <filename>&docdir;examples/apt."
"conf</filename> &configureindex; is a good guide for how it should look."
@@ -6006,7 +6182,7 @@ msgstr ""
"定ファイルのサンプルです。どのように設定するか参考になるでしょう。"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:90
+#: apt.conf.5.xml:101
msgid ""
"The names of the configuration items are not case-sensitive. So in the "
"previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
@@ -6015,7 +6191,7 @@ msgstr ""
"<literal>dpkg::pre-install-pkgs</literal> とできます。"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:93
+#: apt.conf.5.xml:104
msgid ""
"Names for the configuration items are optional if a list is defined as it "
"can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. "
@@ -6026,7 +6202,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:98
+#: apt.conf.5.xml:109
#, fuzzy
#| msgid ""
#| "Two specials are allowed, <literal>#include</literal> and "
@@ -6051,7 +6227,7 @@ msgstr ""
"指定した要素と、それ以下の要素を削除します。"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:106
+#: apt.conf.5.xml:117
msgid ""
"The #clear command is the only way to delete a list or a complete scope. "
"Reopening a scope or the ::-style described below will <emphasis>not</"
@@ -6062,7 +6238,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:111
+#: apt.conf.5.xml:122
#, fuzzy
#| msgid ""
#| "All of the APT tools take a -o option which allows an arbitrary "
@@ -6084,7 +6260,7 @@ msgstr ""
"ることで、リストを追加することができます。"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:118
+#: apt.conf.5.xml:129
msgid ""
"Note that you can use :: only for appending one item per line to a list and "
"that you should not use it in combination with the scope syntax. (The scope "
@@ -6102,13 +6278,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:130
+#: apt.conf.5.xml:141
msgid "The APT Group"
msgstr "APT グループ"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:131
+#: apt.conf.5.xml:142
msgid ""
"This group of options controls general APT behavior as well as holding the "
"options for all of the tools."
@@ -6118,13 +6294,13 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:135
+#: apt.conf.5.xml:146
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:136
+#: apt.conf.5.xml:147
msgid ""
"System Architecture; sets the architecture to use when fetching files and "
"parsing package lists. The internal default is the architecture apt was "
@@ -6136,12 +6312,12 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:141
+#: apt.conf.5.xml:152
msgid "Default-Release"
msgstr "Default-Release"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:142
+#: apt.conf.5.xml:153
msgid ""
"Default release to install packages from if more than one version available. "
"Contains release name, codename or release version. Examples: 'stable', "
@@ -6154,13 +6330,13 @@ msgstr ""
"す。 &apt-preferences; も参照してください。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:146
+#: apt.conf.5.xml:157
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:147
+#: apt.conf.5.xml:158
msgid ""
"Ignore Held packages; This global option causes the problem resolver to "
"ignore held packages in its decision making."
@@ -6170,13 +6346,13 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:151
+#: apt.conf.5.xml:162
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:152
+#: apt.conf.5.xml:163
msgid ""
"Defaults to on. When turned on the autoclean feature will remove any "
"packages which can no longer be downloaded from the cache. If turned off "
@@ -6191,12 +6367,12 @@ msgstr ""
# type: Content of: <refentry><refnamediv><refname>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:158
+#: apt.conf.5.xml:169
msgid "Immediate-Configure"
msgstr "Immediate-Configure"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:159
+#: apt.conf.5.xml:170
msgid ""
"Defaults to on which will cause APT to install essential and important "
"packages as fast as possible in the install/upgrade operation. This is done "
@@ -6212,13 +6388,13 @@ msgid ""
"dependencies which can generate a problem if the dependencies e.g. form a "
"circle as a dependency with the immediate flag is comparable with a Pre-"
"Dependency. So in theory it is possible that APT encounters a situation in "
-"which it is unable to perform immediate configuration, error out and refers "
+"which it is unable to perform immediate configuration, errors out and refers "
"to this option so the user can deactivate the immediate configuration "
-"temporary to be able to perform an install/upgrade again. Note the use of "
+"temporarily to be able to perform an install/upgrade again. Note the use of "
"the word \"theory\" here as this problem was only encountered by now in real "
-"world a few times in non-stable distribution versions and caused by wrong "
-"dependencies of the package in question or by a system in an already broken "
-"state, so you should not blindly disable this option as the mentioned "
+"world a few times in non-stable distribution versions and was caused by "
+"wrong dependencies of the package in question or by a system in an already "
+"broken state, so you should not blindly disable this option as the mentioned "
"scenario above is not the only problem immediate configuration can help to "
"prevent in the first place. Before a big operation like <literal>dist-"
"upgrade</literal> is run with this option disabled it should be tried to "
@@ -6229,13 +6405,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:181
+#: apt.conf.5.xml:192
msgid "Force-LoopBreak"
msgstr "Force-LoopBreak"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:182
+#: apt.conf.5.xml:193
msgid ""
"Never Enable this option unless you -really- know what you are doing. It "
"permits APT to temporarily remove an essential package to break a Conflicts/"
@@ -6253,13 +6429,13 @@ msgstr ""
"不可欠パッケージで動作します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:190
+#: apt.conf.5.xml:201
msgid "Cache-Limit"
msgstr "Cache-Limit"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:191
+#: apt.conf.5.xml:202
msgid ""
"APT uses a fixed size memory mapped cache file to store the 'available' "
"information. This sets the size of that cache (in bytes)."
@@ -6268,24 +6444,24 @@ msgstr ""
"ファイルを使用します。このオプションは、そのキャッシュサイズを指定します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:195
+#: apt.conf.5.xml:206
msgid "Build-Essential"
msgstr "Build-Essential"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:196
+#: apt.conf.5.xml:207
msgid "Defines which package(s) are considered essential build dependencies."
msgstr "構築依存関係で不可欠なパッケージを定義します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:210
msgid "Get"
msgstr "Get"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:200
+#: apt.conf.5.xml:211
msgid ""
"The Get subsection controls the &apt-get; tool, please see its documentation "
"for more information about the options here."
@@ -6294,13 +6470,13 @@ msgstr ""
"&apt-get; の文書を参照してください。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:204
+#: apt.conf.5.xml:215
msgid "Cache"
msgstr "Cache"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:205
+#: apt.conf.5.xml:216
msgid ""
"The Cache subsection controls the &apt-cache; tool, please see its "
"documentation for more information about the options here."
@@ -6309,13 +6485,13 @@ msgstr ""
"は &apt-cache; の文書を参照してください。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:209
+#: apt.conf.5.xml:220
msgid "CDROM"
msgstr "CDROM"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:210
+#: apt.conf.5.xml:221
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool, please see its "
"documentation for more information about the options here."
@@ -6325,17 +6501,17 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:216
+#: apt.conf.5.xml:227
msgid "The Acquire Group"
msgstr "Acquire グループ"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:232
msgid "PDiffs"
msgstr "PDiffs"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:222
+#: apt.conf.5.xml:233
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for Packages or "
"Sources files instead of downloading whole ones. True by default."
@@ -6344,14 +6520,25 @@ msgstr ""
"<literal>PDiffs</literal> と呼ばれる差分をダウンロードしようとします。デフォ"
"ルトでは True です。"
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:236
+msgid ""
+"Two sub-options to limit the use of PDiffs are also available: With "
+"<literal>FileLimit</literal> can be specified how many PDiff files are "
+"downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
+"other hand is the maximum precentage of the size of all patches compared to "
+"the size of the targeted file. If one of these limits is exceeded the "
+"complete file is downloaded instead of the patches."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:227
+#: apt.conf.5.xml:245
msgid "Queue-Mode"
msgstr "Queue-Mode"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:228
+#: apt.conf.5.xml:246
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
"literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -6366,13 +6553,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:235
+#: apt.conf.5.xml:253
msgid "Retries"
msgstr "Retries"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:254
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
@@ -6381,13 +6568,13 @@ msgstr ""
"えられた回数だけリトライを行います。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:240
+#: apt.conf.5.xml:258
msgid "Source-Symlinks"
msgstr "Source-Symlinks"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:241
+#: apt.conf.5.xml:259
msgid ""
"Use symlinks for source archives. If set to true then source archives will "
"be symlinked when possible instead of copying. True is the default."
@@ -6398,13 +6585,13 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:245 sources.list.5.xml:139
+#: apt.conf.5.xml:263 sources.list.5.xml:139
msgid "http"
msgstr "http"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:246
+#: apt.conf.5.xml:264
#, fuzzy
#| msgid ""
#| "HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
@@ -6430,7 +6617,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:254
+#: apt.conf.5.xml:272
msgid ""
"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
"caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@ -6455,7 +6642,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:264 apt.conf.5.xml:328
+#: apt.conf.5.xml:282 apt.conf.5.xml:346
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method, this applies to all things including connection timeout and data "
@@ -6467,7 +6654,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:267
+#: apt.conf.5.xml:285
#, fuzzy
#| msgid ""
#| "One setting is provided to control the pipeline depth in cases where the "
@@ -6495,7 +6682,7 @@ msgstr ""
"ます。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:275
+#: apt.conf.5.xml:293
msgid ""
"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
"literal> which accepts integer values in kilobyte. The default value is 0 "
@@ -6505,7 +6692,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:280
+#: apt.conf.5.xml:298
msgid ""
"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
"User-Agent for the http download method as some proxies allow access for "
@@ -6514,12 +6701,12 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:286
+#: apt.conf.5.xml:304
msgid "https"
msgstr "https"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:287
+#: apt.conf.5.xml:305
#, fuzzy
#| msgid ""
#| "HTTPS URIs. Cache-control and proxy options are the same as for "
@@ -6537,7 +6724,7 @@ msgstr ""
"していません。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:311
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -6559,13 +6746,13 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:311 sources.list.5.xml:150
+#: apt.conf.5.xml:329 sources.list.5.xml:150
msgid "ftp"
msgstr "ftp"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:312
+#: apt.conf.5.xml:330
#, fuzzy
#| msgid ""
#| "FTP URIs; ftp::Proxy is the default proxy server to use. It is in the "
@@ -6608,7 +6795,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#: apt.conf.5.xml:349
msgid ""
"Several settings are provided to control passive mode. Generally it is safe "
"to leave passive mode on, it works in nearly every environment. However "
@@ -6624,7 +6811,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:338
+#: apt.conf.5.xml:356
msgid ""
"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
"envar> environment variable to a http url - see the discussion of the http "
@@ -6638,7 +6825,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:343
+#: apt.conf.5.xml:361
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -6655,12 +6842,12 @@ msgstr ""
# type: Content of: <refentry><refnamediv><refname>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:350 sources.list.5.xml:132
+#: apt.conf.5.xml:368 sources.list.5.xml:132
msgid "cdrom"
msgstr "cdrom"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:356
+#: apt.conf.5.xml:374
#, fuzzy, no-wrap
#| msgid "\"/cdrom/\"::Mount \"foo\";"
msgid "/cdrom/::Mount \"foo\";"
@@ -6668,7 +6855,7 @@ msgstr "\"/cdrom/\"::Mount \"foo\";"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:369
msgid ""
"CDROM URIs; the only setting for CDROM URIs is the mount point, "
"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@ -6689,13 +6876,13 @@ msgstr ""
"す。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:361
+#: apt.conf.5.xml:379
msgid "gpgv"
msgstr "gpgv"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:362
+#: apt.conf.5.xml:380
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
@@ -6706,18 +6893,18 @@ msgstr ""
"す。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:385
msgid "CompressionTypes"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:373
+#: apt.conf.5.xml:391
#, no-wrap
msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:368
+#: apt.conf.5.xml:386
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -6729,19 +6916,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:378
+#: apt.conf.5.xml:396
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:381
+#: apt.conf.5.xml:399
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:374
+#: apt.conf.5.xml:392
msgid ""
"Also the <literal>Order</literal> subgroup can be used to define in which "
"order the acquire system will try to download the compressed files. The "
@@ -6758,13 +6945,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:385
+#: apt.conf.5.xml:403
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:383
+#: apt.conf.5.xml:401
msgid ""
"Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
"replaceable></literal> will be checked: If this setting exists the method "
@@ -6779,7 +6966,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:408
msgid ""
"While it is possible to add an empty compression type to the order list, but "
"APT in its current version doesn't understand it correctly and will display "
@@ -6789,36 +6976,36 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:396
+#: apt.conf.5.xml:414
msgid "Languages"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:397
+#: apt.conf.5.xml:415
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the Description-"
-"Translations. APT will try to display the first available Description for "
-"the Language which is listed at first. Languages can be defined with their "
-"short or long Languagecodes. Note that not all archives provide "
+"Translations. APT will try to display the first available Description in the "
+"Language which is listed at first. Languages can be defined with their short "
+"or long Languagecodes. Note that not all archives provide "
"<filename>Translation</filename> files for every Language - especially the "
"long Languagecodes are rare, so please inform you which ones are available "
"before you set here impossible values."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:413
+#: apt.conf.5.xml:431
#, no-wrap
msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:421
msgid ""
"The default list includes \"environment\" and \"en\". "
"\"<literal>environment</literal>\" has a special meaning here: It will be "
"replaced at runtime with the languagecodes extracted from the "
-"<literal>LC_MESSAGES</literal> enviroment variable. It will also ensure "
+"<literal>LC_MESSAGES</literal> environment variable. It will also ensure "
"that these codes are not included twice in the list. If "
"<literal>LC_MESSAGES</literal> is set to \"C\" only the "
"<filename>Translation-en</filename> file (if available) will be used. To "
@@ -6827,7 +7014,7 @@ msgid ""
"meaning code which will stop the search for a fitting <filename>Translation</"
"filename> file. This can be used by the system administrator to let APT "
"know that it should download also this files without actually use them if "
-"not the environment specifies this languages. So the following example "
+"the environment doesn't specify this languages. So the following example "
"configuration will result in the order \"en, de\" in an english and in \"de, "
"en\" in a german localization. Note that \"fr\" is downloaded, but not used "
"if APT is not used in a french localization, in such an environment the "
@@ -6837,7 +7024,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:217
+#: apt.conf.5.xml:228
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>"
@@ -6848,13 +7035,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:438
msgid "Directories"
msgstr "ディレクトリ"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:422
+#: apt.conf.5.xml:440
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -6874,7 +7061,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:429
+#: apt.conf.5.xml:447
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -6896,7 +7083,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:438
+#: apt.conf.5.xml:456
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -6911,7 +7098,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:444
+#: apt.conf.5.xml:462
msgid ""
"The <literal>Dir::Parts</literal> setting reads in all the config fragments "
"in lexical order from the directory specified. After this is done then the "
@@ -6923,7 +7110,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:448
+#: apt.conf.5.xml:466
#, fuzzy
#| msgid ""
#| "Binary programs are pointed to by <literal>Dir::Bin</literal>. "
@@ -6948,7 +7135,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:456
+#: apt.conf.5.xml:474
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -6969,13 +7156,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:469
+#: apt.conf.5.xml:487
msgid "APT in DSelect"
msgstr "DSelect での APT"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:471
+#: apt.conf.5.xml:489
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -6985,13 +7172,13 @@ msgstr ""
"設定項目で、デフォルトの動作を制御します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:475
+#: apt.conf.5.xml:493
msgid "Clean"
msgstr "Clean"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:476
+#: apt.conf.5.xml:494
msgid ""
"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
"and never. always and prompt will remove all packages from the cache after "
@@ -7008,7 +7195,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:485
+#: apt.conf.5.xml:503
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the install phase."
@@ -7018,13 +7205,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:489
+#: apt.conf.5.xml:507
msgid "Updateoptions"
msgstr "Updateoptions"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:508
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the update phase."
@@ -7033,13 +7220,13 @@ msgstr ""
"されます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:494
+#: apt.conf.5.xml:512
msgid "PromptAfterUpdate"
msgstr "PromptAfterUpdate"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:495
+#: apt.conf.5.xml:513
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
@@ -7049,13 +7236,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:501
+#: apt.conf.5.xml:519
msgid "How APT calls dpkg"
msgstr "APT が dpkg を呼ぶ方法"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:520
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
@@ -7065,7 +7252,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:507
+#: apt.conf.5.xml:525
msgid ""
"This is a list of options to pass to dpkg. The options must be specified "
"using the list notation and each list item is passed as a single argument to "
@@ -7075,18 +7262,18 @@ msgstr ""
"ければなりません。また、各リストは単一の引数として &dpkg; に渡されます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:530
msgid "Pre-Invoke"
msgstr "Pre-Invoke"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:530
msgid "Post-Invoke"
msgstr "Post-Invoke"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:513
+#: apt.conf.5.xml:531
msgid ""
"This is a list of shell commands to run before/after invoking &dpkg;. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -7100,13 +7287,13 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:519
+#: apt.conf.5.xml:537
msgid "Pre-Install-Pkgs"
msgstr "Pre-Install-Pkgs"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:520
+#: apt.conf.5.xml:538
msgid ""
"This is a list of shell commands to run before invoking dpkg. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -7122,7 +7309,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:526
+#: apt.conf.5.xml:544
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -7138,13 +7325,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:533
+#: apt.conf.5.xml:551
msgid "Run-Directory"
msgstr "Run-Directory"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:534
+#: apt.conf.5.xml:552
msgid ""
"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
"</filename>."
@@ -7154,13 +7341,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:556
msgid "Build-options"
msgstr "Build-options"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:557
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages, the "
"default is to disable signing and produce all binaries."
@@ -7169,12 +7356,12 @@ msgstr ""
"ます。デフォルトでは署名を無効にし、全バイナリを生成します。"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:544
+#: apt.conf.5.xml:562
msgid "dpkg trigger usage (and related options)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:545
+#: apt.conf.5.xml:563
msgid ""
"APT can call dpkg in a way so it can make aggressive use of triggers over "
"multiply calls of dpkg. Without further options dpkg will use triggers only "
@@ -7189,7 +7376,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:578
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -7199,7 +7386,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:554
+#: apt.conf.5.xml:572
msgid ""
"Note that it is not guaranteed that APT will support these options or that "
"these options will not cause (big) trouble in the future. If you have "
@@ -7213,12 +7400,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:584
msgid "DPkg::NoTriggers"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:567
+#: apt.conf.5.xml:585
msgid ""
"Add the no triggers flag to all dpkg calls (except the ConfigurePending "
"call). See &dpkg; if you are interested in what this actually means. In "
@@ -7231,14 +7418,14 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:574
+#: apt.conf.5.xml:592
#, fuzzy
#| msgid "Packages::Compress"
msgid "PackageManager::Configure"
msgstr "Packages::Compress"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:575
+#: apt.conf.5.xml:593
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
@@ -7255,13 +7442,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:603
#, fuzzy
msgid "DPkg::ConfigurePending"
msgstr "ユーザの設定"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:586
+#: apt.conf.5.xml:604
msgid ""
"If this option is set apt will call <command>dpkg --configure --pending</"
"command> to let dpkg handle all required configurations and triggers. This "
@@ -7272,12 +7459,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:592
+#: apt.conf.5.xml:610
msgid "DPkg::TriggersPending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:593
+#: apt.conf.5.xml:611
msgid ""
"Useful for <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -7287,12 +7474,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:616
msgid "PackageManager::UnpackAll"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:599
+#: apt.conf.5.xml:617
msgid ""
"As the configuration can be deferred to be done at the end by dpkg it can be "
"tried to order the unpack series only by critical needs, e.g. by Pre-"
@@ -7304,12 +7491,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:606
+#: apt.conf.5.xml:624
msgid "OrderList::Score::Immediate"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:632
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -7321,7 +7508,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:625
msgid ""
"Essential packages (and there dependencies) should be configured immediately "
"after unpacking. It will be a good idea to do this quite early in the "
@@ -7335,12 +7522,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:627
+#: apt.conf.5.xml:645
msgid "Periodic and Archives options"
msgstr "Periodic オプションと Archives オプション"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:628
+#: apt.conf.5.xml:646
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -7354,12 +7541,12 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:636
+#: apt.conf.5.xml:654
msgid "Debug options"
msgstr "デバッグオプション"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:638
+#: apt.conf.5.xml:656
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -7370,7 +7557,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:667
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -7381,7 +7568,7 @@ msgstr ""
"にします。"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:657
+#: apt.conf.5.xml:675
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -7392,7 +7579,7 @@ msgstr ""
"literal>) を行う場合に使用します。"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:666
+#: apt.conf.5.xml:684
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -7402,66 +7589,66 @@ msgstr ""
#. motivating example, except I haven't a clue why you'd want
#. to do this.
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:674
+#: apt.conf.5.xml:692
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CDROM IDs."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:702
msgid "A full list of debugging options to apt follows."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:689
+#: apt.conf.5.xml:707
msgid "<literal>Debug::Acquire::cdrom</literal>"
msgstr "<literal>Debug::Acquire::cdrom</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:711
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
"<literal>cdrom://</literal> ソースへのアクセスに関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:700
+#: apt.conf.5.xml:718
msgid "<literal>Debug::Acquire::ftp</literal>"
msgstr "<literal>Debug::Acquire::ftp</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:704
+#: apt.conf.5.xml:722
msgid "Print information related to downloading packages using FTP."
msgstr "FTP を用いたパッケージのダウンロードに関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:729
msgid "<literal>Debug::Acquire::http</literal>"
msgstr "<literal>Debug::Acquire::http</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:733
msgid "Print information related to downloading packages using HTTP."
msgstr "HTTP を用いたパッケージのダウンロードに関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:722
+#: apt.conf.5.xml:740
msgid "<literal>Debug::Acquire::https</literal>"
msgstr "<literal>Debug::Acquire::https</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:744
msgid "Print information related to downloading packages using HTTPS."
msgstr "HTTPS を用いたパッケージのダウンロードに関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:751
msgid "<literal>Debug::Acquire::gpgv</literal>"
msgstr "<literal>Debug::Acquire::gpgv</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:755
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
@@ -7469,46 +7656,46 @@ msgstr ""
"<literal>gpg</literal> を用いた暗号署名の検証に関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:744
+#: apt.conf.5.xml:762
msgid "<literal>Debug::aptcdrom</literal>"
msgstr "<literal>Debug::aptcdrom</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:748
+#: apt.conf.5.xml:766
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:755
+#: apt.conf.5.xml:773
msgid "<literal>Debug::BuildDeps</literal>"
msgstr "<literal>Debug::BuildDeps</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:776
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:783
msgid "<literal>Debug::Hashes</literal>"
msgstr "<literal>Debug::Hashes</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:768
+#: apt.conf.5.xml:786
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:775
+#: apt.conf.5.xml:793
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr "<literal>Debug::IdentCDROM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:778
+#: apt.conf.5.xml:796
msgid ""
"Do not include information from <literal>statfs</literal>, namely the number "
"of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -7516,93 +7703,93 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:786
+#: apt.conf.5.xml:804
msgid "<literal>Debug::NoLocking</literal>"
msgstr "<literal>Debug::NoLocking</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:807
msgid ""
"Disable all file locking. For instance, this will allow two instances of "
"<quote><literal>apt-get update</literal></quote> to run at the same time."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:815
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr "<literal>Debug::pkgAcquire</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:819
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:808
+#: apt.conf.5.xml:826
msgid "<literal>Debug::pkgAcquire::Auth</literal>"
msgstr "<literal>Debug::pkgAcquire::Auth</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:811
+#: apt.conf.5.xml:829
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:818
+#: apt.conf.5.xml:836
msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
msgstr "<literal>Debug::pkgAcquire::Diffs</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:821
+#: apt.conf.5.xml:839
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:829
+#: apt.conf.5.xml:847
msgid "<literal>Debug::pkgAcquire::RRed</literal>"
msgstr "<literal>Debug::pkgAcquire::RRed</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:833
+#: apt.conf.5.xml:851
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:840
+#: apt.conf.5.xml:858
msgid "<literal>Debug::pkgAcquire::Worker</literal>"
msgstr "<literal>Debug::pkgAcquire::Worker</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:844
+#: apt.conf.5.xml:862
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:851
+#: apt.conf.5.xml:869
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr "<literal>Debug::pkgAutoRemove</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:873
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:862
+#: apt.conf.5.xml:880
msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:883
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -7612,12 +7799,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:876
+#: apt.conf.5.xml:894
msgid "<literal>Debug::pkgDepCache::Marker</literal>"
msgstr "<literal>Debug::pkgDepCache::Marker</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:897
msgid ""
"Generate debug messages describing which package is marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -7634,91 +7821,91 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:898
+#: apt.conf.5.xml:916
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr "<literal>Debug::pkgInitConfig</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:901
+#: apt.conf.5.xml:919
msgid "Dump the default configuration to standard error on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:908
+#: apt.conf.5.xml:926
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr "<literal>Debug::pkgDPkgPM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:911
+#: apt.conf.5.xml:929
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:919
+#: apt.conf.5.xml:937
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:922
+#: apt.conf.5.xml:940
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:947
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr "<literal>Debug::pkgOrderList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:933
+#: apt.conf.5.xml:951
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:941
+#: apt.conf.5.xml:959
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr "<literal>Debug::pkgPackageManager</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:945
+#: apt.conf.5.xml:963
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:952
+#: apt.conf.5.xml:970
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr "<literal>Debug::pkgPolicy</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:974
msgid "Output the priority of each package list on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:962
+#: apt.conf.5.xml:980
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr "<literal>Debug::pkgProblemResolver</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:966
+#: apt.conf.5.xml:984
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:974
+#: apt.conf.5.xml:992
msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:977
+#: apt.conf.5.xml:995
msgid ""
"Display a list of all installed packages with their calculated score used by "
"the pkgProblemResolver. The description of the package is the same as "
@@ -7726,12 +7913,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:985
+#: apt.conf.5.xml:1003
msgid "<literal>Debug::sourceList</literal>"
msgstr "<literal>Debug::sourceList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:989
+#: apt.conf.5.xml:1007
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
@@ -7739,7 +7926,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1012
+#: apt.conf.5.xml:1030
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -7749,7 +7936,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1019
+#: apt.conf.5.xml:1037
#, fuzzy
#| msgid "&apt-conf;"
msgid "&file-aptconf;"
@@ -7758,7 +7945,7 @@ msgstr "&apt-conf;"
# type: Content of: <refentry><refsect1><para>
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:1042
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
@@ -7835,29 +8022,40 @@ msgstr ""
"ダウンロードします。APT 設定ファイルはバージョンの選択にのみ影響し、インスタ"
"ンスの選択には影響しません。"
+#. type: Content of: <refentry><refsect1><para>
+#: apt_preferences.5.xml:56
+msgid ""
+"Note that the files in the <filename>/etc/apt/preferences.d</filename> "
+"directory are parsed in alphanumeric ascending order and need to obey the "
+"following naming convention: The files have no or \"<literal>pref</literal>"
+"\" as filename extension and which only contain alphanumeric, hyphen (-), "
+"underscore (_) and period (.) characters - otherwise they will be silently "
+"ignored."
+msgstr ""
+
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:56
+#: apt_preferences.5.xml:63
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:71
+#: apt_preferences.5.xml:78
#, 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:74
+#: apt_preferences.5.xml:81
#, 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:58
+#: apt_preferences.5.xml:65
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 "
@@ -7882,25 +8080,25 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:83
+#: apt_preferences.5.xml:90
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:84
+#: apt_preferences.5.xml:91
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:88
+#: apt_preferences.5.xml:95
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:89
+#: apt_preferences.5.xml:96
msgid ""
"to the versions that are not installed and do not belong to the target "
"release."
@@ -7908,20 +8106,20 @@ msgstr "インストールされておらず、ターゲットリリースに含
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:93
+#: apt_preferences.5.xml:100
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:94
+#: apt_preferences.5.xml:101
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:78
+#: apt_preferences.5.xml:85
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: "
@@ -7933,7 +8131,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:99
+#: apt_preferences.5.xml:106
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 "
@@ -7945,7 +8143,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml:110
msgid ""
"APT then applies the following rules, listed in order of precedence, to "
"determine which version of a package to install."
@@ -7955,7 +8153,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:106
+#: apt_preferences.5.xml:113
msgid ""
"Never downgrade unless the priority of an available version exceeds 1000. "
"(\"Downgrading\" is installing a less recent version of a package in place "
@@ -7971,13 +8169,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:112
+#: apt_preferences.5.xml:119
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:113
+#: apt_preferences.5.xml:120
msgid ""
"If two or more versions have the same priority, install the most recent one "
"(that is, the one with the higher version number)."
@@ -7987,7 +8185,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:116
+#: apt_preferences.5.xml:123
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</"
@@ -7999,7 +8197,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:122
+#: apt_preferences.5.xml:129
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 "
@@ -8015,7 +8213,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml:136
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 "
@@ -8029,7 +8227,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:141
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 "
@@ -8049,13 +8247,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:143
+#: apt_preferences.5.xml:150
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:145
+#: apt_preferences.5.xml:152
msgid ""
"The APT preferences file allows the system administrator to control the "
"assignment of priorities. The file consists of one or more multi-line "
@@ -8068,7 +8266,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:151
+#: apt_preferences.5.xml:158
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 "
@@ -8083,7 +8281,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:158
+#: apt_preferences.5.xml:165
#, no-wrap
msgid ""
"Package: perl\n"
@@ -8096,7 +8294,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:164
+#: apt_preferences.5.xml:171
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 "
@@ -8111,7 +8309,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:170
+#: apt_preferences.5.xml:177
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 "
@@ -8123,7 +8321,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:175
+#: apt_preferences.5.xml:182
#, no-wrap
msgid ""
"Package: *\n"
@@ -8136,7 +8334,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:180
+#: apt_preferences.5.xml:187
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 "
@@ -8152,7 +8350,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:186
+#: apt_preferences.5.xml:193
msgid ""
"The following record assigns a low priority to all package versions "
"belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -8163,7 +8361,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:190
+#: apt_preferences.5.xml:197
#, no-wrap
msgid ""
"Package: *\n"
@@ -8176,7 +8374,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:195
+#: apt_preferences.5.xml:202
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is \"<literal>squeeze</literal>"
@@ -8187,7 +8385,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:199
+#: apt_preferences.5.xml:206
#, no-wrap
msgid ""
"Package: *\n"
@@ -8200,7 +8398,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:204
+#: apt_preferences.5.xml:211
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -8212,7 +8410,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:209
+#: apt_preferences.5.xml:216
#, no-wrap
msgid ""
"Package: *\n"
@@ -8225,18 +8423,18 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:220
+#: apt_preferences.5.xml:227
msgid "How APT Interprets Priorities"
msgstr "APT が優先度に割り込む方法"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:228
+#: apt_preferences.5.xml:235
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:229
+#: apt_preferences.5.xml:236
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
@@ -8244,13 +8442,13 @@ msgstr ""
"パッケージがダウングレードしても、このバージョンのパッケージをインストール"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:233
+#: apt_preferences.5.xml:240
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:234
+#: apt_preferences.5.xml:241
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
@@ -8259,13 +8457,13 @@ msgstr ""
"含まれなくても、このバージョンのパッケージをインストール"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:239
+#: apt_preferences.5.xml:246
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:240
+#: apt_preferences.5.xml:247
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"
@@ -8274,13 +8472,13 @@ msgstr ""
"ジョンの方が新しいのでなければ、このバージョンのパッケージをインストール"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:245
+#: apt_preferences.5.xml:252
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:246
+#: apt_preferences.5.xml:253
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"
@@ -8290,13 +8488,13 @@ msgstr ""
"ル"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:251
+#: apt_preferences.5.xml:258
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:252
+#: apt_preferences.5.xml:259
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
@@ -8305,19 +8503,19 @@ msgstr ""
"ンストール"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:256
+#: apt_preferences.5.xml:263
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:257
+#: apt_preferences.5.xml:264
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:223
+#: apt_preferences.5.xml:230
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -8329,7 +8527,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:262
+#: apt_preferences.5.xml:269
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -8343,7 +8541,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:268
+#: apt_preferences.5.xml:275
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
@@ -8353,7 +8551,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:272
+#: apt_preferences.5.xml:279
#, no-wrap
msgid ""
"Package: perl\n"
@@ -8382,13 +8580,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:285
+#: apt_preferences.5.xml:292
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:287
+#: apt_preferences.5.xml:294
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 "
@@ -8403,7 +8601,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:292
+#: apt_preferences.5.xml:299
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -8415,7 +8613,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:296
+#: apt_preferences.5.xml:303
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</"
@@ -8429,13 +8627,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:313
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:308
+#: apt_preferences.5.xml:315
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -8446,30 +8644,30 @@ msgstr ""
"filename> ファイルを提供します。"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:320
+#: apt_preferences.5.xml:327
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:321
+#: apt_preferences.5.xml:328
msgid "gives the package name"
msgstr "パッケージ名"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:324 apt_preferences.5.xml:374
+#: apt_preferences.5.xml:331 apt_preferences.5.xml:381
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:325
+#: apt_preferences.5.xml:332
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:312
+#: apt_preferences.5.xml:319
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -8489,13 +8687,13 @@ msgstr ""
"type=\"variablelist\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:341
+#: apt_preferences.5.xml:348
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:342
+#: apt_preferences.5.xml:349
#, fuzzy
msgid ""
"names the archive to which all the packages in the directory tree belong. "
@@ -8513,19 +8711,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:352
+#: apt_preferences.5.xml:359
#, 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:358
+#: apt_preferences.5.xml:365
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:359
+#: apt_preferences.5.xml:366
#, fuzzy
msgid ""
"names the codename to which all the packages in the directory tree belong. "
@@ -8542,14 +8740,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:368
+#: apt_preferences.5.xml:375
#, 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:375
+#: apt_preferences.5.xml:382
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 "
@@ -8565,7 +8763,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:384
+#: apt_preferences.5.xml:391
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -8577,13 +8775,13 @@ msgstr ""
"Pin: release 3.0\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:393
+#: apt_preferences.5.xml:400
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:394
+#: apt_preferences.5.xml:401
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -8601,19 +8799,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:403
+#: apt_preferences.5.xml:410
#, 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:409
+#: apt_preferences.5.xml:416
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:410
+#: apt_preferences.5.xml:417
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8626,19 +8824,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:416
+#: apt_preferences.5.xml:423
#, 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:422
+#: apt_preferences.5.xml:429
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:423
+#: apt_preferences.5.xml:430
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -8651,14 +8849,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:429
+#: apt_preferences.5.xml:436
#, 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:330
+#: apt_preferences.5.xml:337
#, fuzzy
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
@@ -8680,7 +8878,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:436
+#: apt_preferences.5.xml:443
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -8706,13 +8904,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:449
+#: apt_preferences.5.xml:456
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:451
+#: apt_preferences.5.xml:458
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -8723,7 +8921,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:455
+#: apt_preferences.5.xml:462
#, fuzzy
msgid ""
"The <literal>Pin-Priority:</literal> line in each APT preferences record is "
@@ -8737,13 +8935,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:471
msgid "Tracking Stable"
msgstr "安定版の追跡"
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:472
+#: apt_preferences.5.xml:479
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -8768,7 +8966,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:466
+#: apt_preferences.5.xml:473
#, fuzzy
msgid ""
"The following APT preferences file will cause APT to assign a priority "
@@ -8784,8 +8982,8 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:489 apt_preferences.5.xml:535
-#: apt_preferences.5.xml:593
+#: apt_preferences.5.xml:496 apt_preferences.5.xml:542
+#: apt_preferences.5.xml:600
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -8798,7 +8996,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:484
+#: apt_preferences.5.xml:491
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -8811,14 +9009,14 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:501
+#: apt_preferences.5.xml:508
#, 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:495
+#: apt_preferences.5.xml:502
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -8832,13 +9030,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:507
+#: apt_preferences.5.xml:514
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:516
+#: apt_preferences.5.xml:523
#, no-wrap
msgid ""
"Package: *\n"
@@ -8867,7 +9065,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:509
+#: apt_preferences.5.xml:516
#, fuzzy
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
@@ -8885,7 +9083,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:530
+#: apt_preferences.5.xml:537
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -8898,14 +9096,14 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:550
+#: apt_preferences.5.xml:557
#, 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:541
+#: apt_preferences.5.xml:548
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -8924,13 +9122,13 @@ msgstr ""
"の最新版にアップグレードします。"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:564
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:571
+#: apt_preferences.5.xml:578
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -8964,7 +9162,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:559
+#: apt_preferences.5.xml:566
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 "
@@ -8980,7 +9178,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:588
+#: apt_preferences.5.xml:595
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -8993,14 +9191,14 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:608
+#: apt_preferences.5.xml:615
#, 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:599
+#: apt_preferences.5.xml:606
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -9020,7 +9218,7 @@ msgstr ""
# type: Content of: <refentry><refnamediv><refname>
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:617
+#: apt_preferences.5.xml:624
#, fuzzy
#| msgid "apt_preferences"
msgid "&file-preferences;"
@@ -9028,7 +9226,7 @@ msgstr "apt_preferences"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:623
+#: apt_preferences.5.xml:630
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -9411,7 +9609,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
#: sources.list.5.xml:178
-msgid "more recongnizable URI types"
+msgid "more recognizable URI types"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
@@ -9419,9 +9617,9 @@ msgstr ""
msgid ""
"APT can be extended with more methods shipped in other optional packages "
"which should follow the nameing scheme <literal>apt-transport-"
-"<replaceable>method</replaceable></literal>. The APT team e.g. maintain "
+"<replaceable>method</replaceable></literal>. The APT team e.g. maintains "
"also the <literal>apt-transport-https</literal> package which provides "
-"access methods for https-URIs with features similiar to the http method, but "
+"access methods for https-URIs with features similar to the http method, but "
"other methods for using e.g. debtorrent are also available, see "
"<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></"
"refentrytitle> <manvolnum>1</manvolnum></citerefentry>."
@@ -9683,7 +9881,7 @@ msgstr ""
#: guide.sgml:63
msgid ""
"For instance, mailcrypt is an emacs extension that aids in encrypting email "
-"with GPG. Without GPGP installed mail-crypt is useless, so mailcrypt has a "
+"with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
"simple dependency on GPG. Also, because it is an emacs extension it has a "
"simple dependency on emacs, without emacs it is completely useless."
msgstr ""
@@ -9832,8 +10030,8 @@ msgstr ""
#. type: <p></p>
#: guide.sgml:184
msgid ""
-"To enable the APT method you need to to select [A]ccess in <prgn>dselect</"
-"prgn> and then choose the APT method. You will be prompted for a set of "
+"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
+"and then choose the APT method. You will be prompted for a set of "
"<em>Sources</em> which are places to fetch archives from. These can be "
"remote Internet sites, local Debian mirrors or CDROMs. Each source can "
"provide a fragment of the total Debian archive, APT will automatically "
@@ -9921,7 +10119,7 @@ msgstr ""
#: guide.sgml:247
msgid ""
"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a super-set of "
+"available list by selecting [U]pdate from the menu. This is a superset of "
"<tt>apt-get update</tt> that makes the fetched information available to "
"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
"tt> has been run before."
@@ -10415,7 +10613,7 @@ msgstr ""
#: offline.sgml:57
msgid ""
"This is achieved by creatively manipulating the APT configuration file. The "
-"essential premis to tell APT to look on a disc for it's archive files. Note "
+"essential premise to tell APT to look on a disc for it's archive files. Note "
"that the disc should be formated with a filesystem that can handle long file "
"names such as ext2, fat32 or vfat."
msgstr ""
@@ -10550,8 +10748,8 @@ msgid ""
"On the target machine the first thing to do is mount the disc and copy <em>/"
"var/lib/dpkg/status</em> to it. You will also need to create the directories "
"outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
-"em> Then take the disc to the remote machine and configure the sources.list. "
-"On the remote machine execute the following:"
+"em>. Then take the disc to the remote machine and configure the sources."
+"list. On the remote machine execute the following:"
msgstr ""
# type: <example></example>
@@ -10574,9 +10772,9 @@ msgstr ""
#. type: </example></p>
#: offline.sgml:149
msgid ""
-"The dist-upgrade command can be replaced with any-other standard APT "
+"The dist-upgrade command can be replaced with any other standard APT "
"commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em> However this presents a problem in communicating "
+"such as <em>dselect</em>. However this presents a problem in communicating "
"your selections back to the local computer."
msgstr ""
@@ -10717,6 +10915,34 @@ msgstr ""
msgid "Which will use the already fetched archives on the disc."
msgstr ""
+# type: Content of: <refentry><refsect1><para>
+#~ msgid ""
+#~ "<filename>apt.conf</filename> is the main configuration file for the APT "
+#~ "suite of tools, all tools make use of the configuration file and a common "
+#~ "command line parser to provide a uniform environment. When an APT tool "
+#~ "starts up it will read the configuration specified by the "
+#~ "<envar>APT_CONFIG</envar> environment variable (if any) and then read the "
+#~ "files in <literal>Dir::Etc::Parts</literal> then read the main "
+#~ "configuration file specified by <literal>Dir::Etc::main</literal> then "
+#~ "finally apply the command line options to override the configuration "
+#~ "directives, possibly loading even more config files."
+#~ msgstr ""
+#~ "<filename>apt.conf</filename> は、APT ツール集のメイン設定ファイルです。こ"
+#~ "の設定ファイルと共通のコマンドラインパーサを使って、すべてのツールを統一環"
+#~ "境で使用できます。APT ツールの起動時には、<envar>APT_CONFIG</envar> 環境変"
+#~ "数に指定した設定を (存在すれば) 読み込みます。次に <literal>Dir::Etc::"
+#~ "Parts</literal> のファイルを読み込みます。次に <literal>Dir::Etc::main</"
+#~ "literal> で指定した主設定ファイルを読み込み、最後にコマンドラインオプショ"
+#~ "ンで、設定ファイルより取得した値を上書きします。"
+
+# type: Content of: <refentry><refsect1><para>
+#~ msgid "<filename>/etc/apt/trusted.gpg</filename>"
+#~ msgstr "<filename>/etc/apt/trusted.gpg</filename>"
+
+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#~ msgid "Keyring of local trusted keys, new keys will be added here."
+#~ msgstr "ローカル信頼キーのキーリング。新しいキーはここに追加されます。"
+
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#~ msgid ""
#~ "Disable Immediate Configuration; This dangerous option disables some of "
@@ -10759,12 +10985,6 @@ msgstr ""
#~ 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>"
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 27b7a8a7b..a3936cff2 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: apt\n"
-"POT-Creation-Date: 2009-11-27 00:05+0100\n"
+"POT-Creation-Date: 2010-01-20 12:18+0100\n"
"PO-Revision-Date: 2004-02-12 15:06+0100\n"
"Last-Translator: Krzysztof Fiertek <akfedux@megapolis.pl>\n"
"Language-Team: <debian-l10n-polish@lists.debian.org>\n"
@@ -739,7 +739,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:355
+#: apt.ent:356
#, no-wrap
msgid ""
" <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
@@ -749,6 +749,61 @@ msgid ""
"\">\n"
msgstr ""
+#. type: Plain text
+#: apt.ent:362
+#, no-wrap
+msgid ""
+"<!ENTITY file-trustedgpg \"\n"
+" <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n"
+" <listitem><para>Keyring of local trusted keys, new keys will be added here.\n"
+" Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:369
+#, no-wrap
+msgid ""
+" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
+" <listitem><para>File fragments for the trusted keys, additional keyrings can\n"
+" be stored here (by other packages or the administrator).\n"
+" Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+"\">\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:371
+msgid "<!ENTITY translation-title \"TRANSLATION\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:380
+#, no-wrap
+msgid ""
+"<!-- TRANSLATOR: This is a placeholder. You should write here who has constributed\n"
+" to the translation in the past, who is responsible now and maybe further information\n"
+" specially related to your translation. -->\n"
+"<!ENTITY translation-holder \"\n"
+" The english translation was done by John Doe <email>john@doe.org</email> in 2009,\n"
+" 2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together with the\n"
+" Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>.\n"
+"\">\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:387
+#, no-wrap
+msgid ""
+"<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
+" in a shipped manpage will maybe appear english parts. -->\n"
+"<!ENTITY translation-english \"\n"
+" Note that this translated document may contain untranslated parts.\n"
+" This is done on purpose, to avoid losing content when the\n"
+" translation is lagging behind the original content.\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
@@ -811,7 +866,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: 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-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40
#: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33
#: sources.list.5.xml:33
#, fuzzy
@@ -1203,7 +1258,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89
-#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:484 apt.conf.5.xml:506
+#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524
#, fuzzy
msgid "options"
msgstr "Kolejne kroki"
@@ -1398,14 +1453,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:556 apt-get.8.xml:554
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554
#: apt-sortpkgs.1.xml:64
msgid "&apt-commonoptions;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122
-#: apt.conf.5.xml:1017 apt_preferences.5.xml:615
+#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122
+#: apt.conf.5.xml:1035 apt_preferences.5.xml:622
msgid "Files"
msgstr ""
@@ -1416,9 +1471,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569
-#: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569
+#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629
#: sources.list.5.xml:233
msgid "See Also"
msgstr ""
@@ -1430,7 +1485,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:576 apt-get.8.xml:575
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575
#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
msgstr ""
@@ -1530,7 +1585,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:91
+#: apt-cdrom.8.xml:91 apt-key.8.xml:139
#, fuzzy
msgid "Options"
msgstr "Kolejne kroki"
@@ -1732,7 +1787,7 @@ msgid "Just show the contents of the configuration space."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585
#: apt-sortpkgs.1.xml:70
msgid "&apt-conf;"
msgstr ""
@@ -2267,7 +2322,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:288
msgid ""
-"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
+"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
"source/Sources</filename>"
msgstr ""
@@ -2379,20 +2434,22 @@ msgid ""
"variables."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: 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>
+#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt-ftparchive.1.xml:354
#, no-wrap
msgid ""
"for i in Sections do \n"
" for j in Architectures do\n"
" Generate for DIST=scope SECTION=i ARCH=j\n"
+" "
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-ftparchive.1.xml:351
+msgid ""
+"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
+"command> performs an operation similar to: <placeholder type=\"programlisting"
+"\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
@@ -2688,12 +2745,31 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:547
-msgid "<option>APT::FTPArchive::LongDescription</option>"
+msgid "<option>APT::FTPArchive::AlwaysStat</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:549
msgid ""
+"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If "
+"packages are recompiled and/or republished with the same version again, this "
+"will lead to problems as the now outdated cached metadata like size and "
+"checksums will be used. With this option enabled this will no longer happen "
+"as it will be checked if the file was changed. Note that this option is set "
+"to \"<literal>false</literal>\" by default as it is not recommend to upload "
+"multiply versions/builds of a package with the same versionnumber, so in "
+"theory nobody will have these problems and therefore all these extra checks "
+"are useless."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:559
+msgid "<option>APT::FTPArchive::LongDescription</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:561
+msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
"only be set to <literal>\"false\"</literal> if the Archive generated with "
"&apt-ftparchive; also provides <filename>Translation</filename> files. Note "
@@ -2702,26 +2778,26 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462
+#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469
#: sources.list.5.xml:193
msgid "Examples"
msgstr ""
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:567
+#: apt-ftparchive.1.xml:579
#, no-wrap
msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:563
+#: apt-ftparchive.1.xml:575
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:577
+#: apt-ftparchive.1.xml:589
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -2791,7 +2867,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:135 apt-key.8.xml:123
+#: apt-get.8.xml:135 apt-key.8.xml:124
msgid "update"
msgstr ""
@@ -3116,15 +3192,15 @@ msgstr ""
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
-"to deduce a likely solution. Any Package that are specified must completely "
-"correct the problem. The option is sometimes necessary when running APT for "
-"the first time; APT itself does not allow broken package dependencies to "
-"exist on a system. It is possible that a system's dependency structure can "
-"be so corrupt as to require manual intervention (which usually means using "
-"&dselect; or <command>dpkg --remove</command> to eliminate some of the "
-"offending packages). Use of this option together with <option>-m</option> "
-"may produce an error in some situations. Configuration Item: <literal>APT::"
-"Get::Fix-Broken</literal>."
+"to deduce a likely solution. If packages are specified, these have to "
+"completely correct the problem. The option is sometimes necessary when "
+"running APT for the first time; APT itself does not allow broken package "
+"dependencies to exist on a system. It is possible that a system's dependency "
+"structure can be so corrupt as to require manual intervention (which usually "
+"means using &dselect; or <command>dpkg --remove</command> to eliminate some "
+"of the offending packages). Use of this option together with <option>-m</"
+"option> may produce an error in some situations. Configuration Item: "
+"<literal>APT::Get::Fix-Broken</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -3379,7 +3455,7 @@ msgstr ""
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> "
+"<option>remove --purge</option> is equivalent to the <option>purge</option> "
"command. Configuration Item: <literal>APT::Get::Purge</literal>."
msgstr ""
@@ -3595,13 +3671,14 @@ msgstr ""
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-key.8.xml:28
msgid ""
-"<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> "
+"<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
+"replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
"<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></"
"arg>"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:36
+#: apt-key.8.xml:37
msgid ""
"<command>apt-key</command> is used to manage the list of keys used by apt to "
"authenticate packages. Packages which have been authenticated using these "
@@ -3609,17 +3686,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:42
+#: apt-key.8.xml:43
msgid "Commands"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:44
+#: apt-key.8.xml:45
msgid "add <replaceable>filename</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:48
+#: apt-key.8.xml:49
msgid ""
"Add a new key to the list of trusted keys. The key is read from "
"<replaceable>filename</replaceable>, or standard input if "
@@ -3627,117 +3704,135 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:56
+#: apt-key.8.xml:57
msgid "del <replaceable>keyid</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:60
+#: apt-key.8.xml:61
msgid "Remove a key from the list of trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:67
+#: apt-key.8.xml:68
msgid "export <replaceable>keyid</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:71
+#: apt-key.8.xml:72
msgid "Output the key <replaceable>keyid</replaceable> to standard output."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:78
+#: apt-key.8.xml:79
msgid "exportall"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:82
+#: apt-key.8.xml:83
msgid "Output all trusted keys to standard output."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:89
+#: apt-key.8.xml:90
msgid "list"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:93
+#: apt-key.8.xml:94
msgid "List trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:100
+#: apt-key.8.xml:101
msgid "finger"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:104
+#: apt-key.8.xml:105
msgid "List fingerprints of trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:111
+#: apt-key.8.xml:112
msgid "adv"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:115
+#: apt-key.8.xml:116
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:127
+#: apt-key.8.xml:128
msgid ""
"Update the local keyring with the keyring of Debian archive keys and removes "
"from the keyring the archive keys which are no longer valid."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><para>
#: apt-key.8.xml:140
-msgid "<filename>/etc/apt/trusted.gpg</filename>"
+msgid ""
+"Note that options need to be defined before the commands described in the "
+"previous section."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml:142
+msgid "--keyring <replaceable>filename</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:141
-msgid "Keyring of local trusted keys, new keys will be added here."
+#: apt-key.8.xml:143
+msgid ""
+"With this option it is possible to specify a specific keyring file the "
+"command should operate on. The default is that a command is executed on the "
+"<filename>trusted.gpg</filename> file as well as on all parts in the "
+"<filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</"
+"filename> is the primary keyring which means that e.g. new keys are added to "
+"this one."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist>
+#: apt-key.8.xml:156
+msgid "&file-trustedgpg;"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:144
+#: apt-key.8.xml:158
msgid "<filename>/etc/apt/trustdb.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:145
+#: apt-key.8.xml:159
msgid "Local trust database of archive keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:148
+#: apt-key.8.xml:162
msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:149
+#: apt-key.8.xml:163
msgid "Keyring of Debian archive trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:152
+#: apt-key.8.xml:166
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:153
+#: apt-key.8.xml:167
msgid "Keyring of Debian archive removed trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:164
+#: apt-key.8.xml:176
msgid "&apt-get;, &apt-secure;"
msgstr ""
@@ -4188,7 +4283,7 @@ 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>18 September 2009</date>"
+"&apt-product; <date>16 January 2010</date>"
msgstr ""
#. type: Content of: <refentry><refnamediv><refname>
@@ -4211,18 +4306,54 @@ msgstr "Plik konfiguracyjny"
#: 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 "
-"command line parser to provide a uniform environment. When an APT tool "
-"starts up it will read the configuration specified by the <envar>APT_CONFIG</"
-"envar> environment variable (if any) and then read the files in "
-"<literal>Dir::Etc::Parts</literal> then read the main configuration file "
-"specified by <literal>Dir::Etc::main</literal> then finally apply the "
-"command line options to override the configuration directives, possibly "
-"loading even more config files."
+"suite of tools, but by far not the only place changes to options can be "
+"made. All tools therefore share the configuration files and also use a "
+"common command line parser to provide a uniform environment."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><para>
+#: apt.conf.5.xml:45
+msgid ""
+"When an APT tool starts up it will read the configuration files in the "
+"following order:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:47
+msgid ""
+"the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
+"any)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:49
+msgid ""
+"all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
+"order which have no or \"<literal>conf</literal>\" as filename extension and "
+"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
+"characters - otherwise they will be silently ignored."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:54
+msgid ""
+"the main configuration file specified by <literal>Dir::Etc::main</literal>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:56
+msgid ""
+"the command line options are applied to override the configuration "
+"directives or to load even more configuration files."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.conf.5.xml:60
+msgid "Syntax"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:50
+#: apt.conf.5.xml:61
msgid ""
"The configuration file is organized in a tree with options organized into "
"functional groups. Option specification is given with a double colon "
@@ -4232,7 +4363,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:56
+#: apt.conf.5.xml:67
msgid ""
"Syntactically the configuration language is modeled after what the ISC tools "
"such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@ -4248,7 +4379,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:70
+#: apt.conf.5.xml:81
#, no-wrap
msgid ""
"APT {\n"
@@ -4260,7 +4391,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:78
+#: apt.conf.5.xml:89
msgid ""
"with newlines placed to make it more readable. Lists can be created by "
"opening a scope and including a single string enclosed in quotes followed by "
@@ -4268,27 +4399,27 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:83
+#: apt.conf.5.xml:94
#, no-wrap
msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:86
+#: apt.conf.5.xml:97
msgid ""
"In general the sample configuration file in <filename>&docdir;examples/apt."
"conf</filename> &configureindex; is a good guide for how it should look."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:90
+#: apt.conf.5.xml:101
msgid ""
"The names of the configuration items are not case-sensitive. So in the "
"previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:93
+#: apt.conf.5.xml:104
msgid ""
"Names for the configuration items are optional if a list is defined as it "
"can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. "
@@ -4298,7 +4429,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:98
+#: apt.conf.5.xml:109
msgid ""
"Two specials are allowed, <literal>#include</literal> (which is deprecated "
"and not supported by alternative implementations) and <literal>#clear</"
@@ -4310,7 +4441,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:106
+#: apt.conf.5.xml:117
msgid ""
"The #clear command is the only way to delete a list or a complete scope. "
"Reopening a scope or the ::-style described below will <emphasis>not</"
@@ -4320,7 +4451,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:111
+#: apt.conf.5.xml:122
msgid ""
"All of the APT tools take a -o option which allows an arbitrary "
"configuration directive to be specified on the command line. The syntax is a "
@@ -4331,7 +4462,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:118
+#: apt.conf.5.xml:129
msgid ""
"Note that you can use :: only for appending one item per line to a list and "
"that you should not use it in combination with the scope syntax. (The scope "
@@ -4348,24 +4479,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:130
+#: apt.conf.5.xml:141
msgid "The APT Group"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:131
+#: apt.conf.5.xml:142
msgid ""
"This group of options controls general APT behavior as well as holding the "
"options for all of the tools."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:135
+#: apt.conf.5.xml:146
msgid "Architecture"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:136
+#: apt.conf.5.xml:147
msgid ""
"System Architecture; sets the architecture to use when fetching files and "
"parsing package lists. The internal default is the architecture apt was "
@@ -4373,12 +4504,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:141
+#: apt.conf.5.xml:152
msgid "Default-Release"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:142
+#: apt.conf.5.xml:153
msgid ""
"Default release to install packages from if more than one version available. "
"Contains release name, codename or release version. Examples: 'stable', "
@@ -4387,24 +4518,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:146
+#: apt.conf.5.xml:157
msgid "Ignore-Hold"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:147
+#: apt.conf.5.xml:158
msgid ""
"Ignore Held packages; This global option causes the problem resolver to "
"ignore held packages in its decision making."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:151
+#: apt.conf.5.xml:162
msgid "Clean-Installed"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:152
+#: apt.conf.5.xml:163
msgid ""
"Defaults to on. When turned on the autoclean feature will remove any "
"packages which can no longer be downloaded from the cache. If turned off "
@@ -4413,12 +4544,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:158
+#: apt.conf.5.xml:169
msgid "Immediate-Configure"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:159
+#: apt.conf.5.xml:170
msgid ""
"Defaults to on which will cause APT to install essential and important "
"packages as fast as possible in the install/upgrade operation. This is done "
@@ -4434,13 +4565,13 @@ msgid ""
"dependencies which can generate a problem if the dependencies e.g. form a "
"circle as a dependency with the immediate flag is comparable with a Pre-"
"Dependency. So in theory it is possible that APT encounters a situation in "
-"which it is unable to perform immediate configuration, error out and refers "
+"which it is unable to perform immediate configuration, errors out and refers "
"to this option so the user can deactivate the immediate configuration "
-"temporary to be able to perform an install/upgrade again. Note the use of "
+"temporarily to be able to perform an install/upgrade again. Note the use of "
"the word \"theory\" here as this problem was only encountered by now in real "
-"world a few times in non-stable distribution versions and caused by wrong "
-"dependencies of the package in question or by a system in an already broken "
-"state, so you should not blindly disable this option as the mentioned "
+"world a few times in non-stable distribution versions and was caused by "
+"wrong dependencies of the package in question or by a system in an already "
+"broken state, so you should not blindly disable this option as the mentioned "
"scenario above is not the only problem immediate configuration can help to "
"prevent in the first place. Before a big operation like <literal>dist-"
"upgrade</literal> is run with this option disabled it should be tried to "
@@ -4451,12 +4582,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:181
+#: apt.conf.5.xml:192
msgid "Force-LoopBreak"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:182
+#: apt.conf.5.xml:193
msgid ""
"Never Enable this option unless you -really- know what you are doing. It "
"permits APT to temporarily remove an essential package to break a Conflicts/"
@@ -4467,87 +4598,98 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:190
+#: apt.conf.5.xml:201
msgid "Cache-Limit"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:191
+#: apt.conf.5.xml:202
msgid ""
"APT uses a fixed size memory mapped cache file to store the 'available' "
"information. This sets the size of that cache (in bytes)."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:195
+#: apt.conf.5.xml:206
msgid "Build-Essential"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:196
+#: apt.conf.5.xml:207
msgid "Defines which package(s) are considered essential build dependencies."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:210
msgid "Get"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:200
+#: apt.conf.5.xml:211
msgid ""
"The Get subsection controls the &apt-get; tool, please see its documentation "
"for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:204
+#: apt.conf.5.xml:215
msgid "Cache"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:205
+#: apt.conf.5.xml:216
msgid ""
"The Cache subsection controls the &apt-cache; tool, please see its "
"documentation for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:209
+#: apt.conf.5.xml:220
msgid "CDROM"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:210
+#: apt.conf.5.xml:221
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool, please see its "
"documentation for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:216
+#: apt.conf.5.xml:227
msgid "The Acquire Group"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:232
msgid "PDiffs"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:222
+#: apt.conf.5.xml:233
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for Packages or "
"Sources files instead of downloading whole ones. True by default."
msgstr ""
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:236
+msgid ""
+"Two sub-options to limit the use of PDiffs are also available: With "
+"<literal>FileLimit</literal> can be specified how many PDiff files are "
+"downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
+"other hand is the maximum precentage of the size of all patches compared to "
+"the size of the targeted file. If one of these limits is exceeded the "
+"complete file is downloaded instead of the patches."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:227
+#: apt.conf.5.xml:245
msgid "Queue-Mode"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:228
+#: apt.conf.5.xml:246
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
"literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -4557,36 +4699,36 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:235
+#: apt.conf.5.xml:253
msgid "Retries"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:254
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:240
+#: apt.conf.5.xml:258
msgid "Source-Symlinks"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:241
+#: apt.conf.5.xml:259
msgid ""
"Use symlinks for source archives. If set to true then source archives will "
"be symlinked when possible instead of copying. True is the default."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:245 sources.list.5.xml:139
+#: apt.conf.5.xml:263 sources.list.5.xml:139
msgid "http"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:246
+#: apt.conf.5.xml:264
msgid ""
"HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
"standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@ -4597,7 +4739,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:254
+#: apt.conf.5.xml:272
msgid ""
"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
"caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@ -4611,7 +4753,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:264 apt.conf.5.xml:328
+#: apt.conf.5.xml:282 apt.conf.5.xml:346
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method, this applies to all things including connection timeout and data "
@@ -4619,7 +4761,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:267
+#: apt.conf.5.xml:285
msgid ""
"One setting is provided to control the pipeline depth in cases where the "
"remote server is not RFC conforming or buggy (such as Squid 2.0.2). "
@@ -4631,7 +4773,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:275
+#: apt.conf.5.xml:293
msgid ""
"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
"literal> which accepts integer values in kilobyte. The default value is 0 "
@@ -4641,7 +4783,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:280
+#: apt.conf.5.xml:298
msgid ""
"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
"User-Agent for the http download method as some proxies allow access for "
@@ -4649,12 +4791,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:286
+#: apt.conf.5.xml:304
msgid "https"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:287
+#: apt.conf.5.xml:305
msgid ""
"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
"options are the same as for <literal>http</literal> method and will also "
@@ -4664,7 +4806,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:311
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -4685,12 +4827,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:311 sources.list.5.xml:150
+#: apt.conf.5.xml:329 sources.list.5.xml:150
msgid "ftp"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:312
+#: apt.conf.5.xml:330
msgid ""
"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@ -4709,7 +4851,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#: apt.conf.5.xml:349
msgid ""
"Several settings are provided to control passive mode. Generally it is safe "
"to leave passive mode on, it works in nearly every environment. However "
@@ -4719,7 +4861,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:338
+#: apt.conf.5.xml:356
msgid ""
"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
"envar> environment variable to a http url - see the discussion of the http "
@@ -4728,7 +4870,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:343
+#: apt.conf.5.xml:361
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4738,18 +4880,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:350 sources.list.5.xml:132
+#: apt.conf.5.xml:368 sources.list.5.xml:132
msgid "cdrom"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:356
+#: apt.conf.5.xml:374
#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:369
msgid ""
"CDROM URIs; the only setting for CDROM URIs is the mount point, "
"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@ -4762,12 +4904,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:361
+#: apt.conf.5.xml:379
msgid "gpgv"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:362
+#: apt.conf.5.xml:380
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
@@ -4775,18 +4917,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:385
msgid "CompressionTypes"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:373
+#: apt.conf.5.xml:391
#, no-wrap
msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:368
+#: apt.conf.5.xml:386
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -4798,19 +4940,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:378
+#: apt.conf.5.xml:396
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:381
+#: apt.conf.5.xml:399
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:374
+#: apt.conf.5.xml:392
msgid ""
"Also the <literal>Order</literal> subgroup can be used to define in which "
"order the acquire system will try to download the compressed files. The "
@@ -4827,13 +4969,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:385
+#: apt.conf.5.xml:403
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:383
+#: apt.conf.5.xml:401
msgid ""
"Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
"replaceable></literal> will be checked: If this setting exists the method "
@@ -4848,7 +4990,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:408
msgid ""
"While it is possible to add an empty compression type to the order list, but "
"APT in its current version doesn't understand it correctly and will display "
@@ -4858,36 +5000,36 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:396
+#: apt.conf.5.xml:414
msgid "Languages"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:397
+#: apt.conf.5.xml:415
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the Description-"
-"Translations. APT will try to display the first available Description for "
-"the Language which is listed at first. Languages can be defined with their "
-"short or long Languagecodes. Note that not all archives provide "
+"Translations. APT will try to display the first available Description in the "
+"Language which is listed at first. Languages can be defined with their short "
+"or long Languagecodes. Note that not all archives provide "
"<filename>Translation</filename> files for every Language - especially the "
"long Languagecodes are rare, so please inform you which ones are available "
"before you set here impossible values."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:413
+#: apt.conf.5.xml:431
#, no-wrap
msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:421
msgid ""
"The default list includes \"environment\" and \"en\". "
"\"<literal>environment</literal>\" has a special meaning here: It will be "
"replaced at runtime with the languagecodes extracted from the "
-"<literal>LC_MESSAGES</literal> enviroment variable. It will also ensure "
+"<literal>LC_MESSAGES</literal> environment variable. It will also ensure "
"that these codes are not included twice in the list. If "
"<literal>LC_MESSAGES</literal> is set to \"C\" only the "
"<filename>Translation-en</filename> file (if available) will be used. To "
@@ -4896,7 +5038,7 @@ msgid ""
"meaning code which will stop the search for a fitting <filename>Translation</"
"filename> file. This can be used by the system administrator to let APT "
"know that it should download also this files without actually use them if "
-"not the environment specifies this languages. So the following example "
+"the environment doesn't specify this languages. So the following example "
"configuration will result in the order \"en, de\" in an english and in \"de, "
"en\" in a german localization. Note that \"fr\" is downloaded, but not used "
"if APT is not used in a french localization, in such an environment the "
@@ -4905,19 +5047,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:217
+#: apt.conf.5.xml:228
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:438
msgid "Directories"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:422
+#: apt.conf.5.xml:440
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -4929,7 +5071,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:429
+#: apt.conf.5.xml:447
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4942,7 +5084,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:438
+#: apt.conf.5.xml:456
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4952,7 +5094,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:444
+#: apt.conf.5.xml:462
msgid ""
"The <literal>Dir::Parts</literal> setting reads in all the config fragments "
"in lexical order from the directory specified. After this is done then the "
@@ -4960,7 +5102,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:448
+#: apt.conf.5.xml:466
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -4971,7 +5113,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:456
+#: apt.conf.5.xml:474
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4984,12 +5126,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:469
+#: apt.conf.5.xml:487
msgid "APT in DSelect"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:471
+#: apt.conf.5.xml:489
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -4997,12 +5139,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:475
+#: apt.conf.5.xml:493
msgid "Clean"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:476
+#: apt.conf.5.xml:494
msgid ""
"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
"and never. always and prompt will remove all packages from the cache after "
@@ -5013,50 +5155,50 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:485
+#: apt.conf.5.xml:503
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the install phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:489
+#: apt.conf.5.xml:507
msgid "Updateoptions"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:508
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the update phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:494
+#: apt.conf.5.xml:512
msgid "PromptAfterUpdate"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:495
+#: apt.conf.5.xml:513
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:501
+#: apt.conf.5.xml:519
msgid "How APT calls dpkg"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:520
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:507
+#: apt.conf.5.xml:525
msgid ""
"This is a list of options to pass to dpkg. The options must be specified "
"using the list notation and each list item is passed as a single argument to "
@@ -5064,17 +5206,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:530
msgid "Pre-Invoke"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:530
msgid "Post-Invoke"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:513
+#: apt.conf.5.xml:531
msgid ""
"This is a list of shell commands to run before/after invoking &dpkg;. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -5083,12 +5225,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:519
+#: apt.conf.5.xml:537
msgid "Pre-Install-Pkgs"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:520
+#: apt.conf.5.xml:538
msgid ""
"This is a list of shell commands to run before invoking dpkg. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -5098,7 +5240,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:526
+#: apt.conf.5.xml:544
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -5108,36 +5250,36 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:533
+#: apt.conf.5.xml:551
msgid "Run-Directory"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:534
+#: apt.conf.5.xml:552
msgid ""
"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
"</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:556
msgid "Build-options"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:557
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages, the "
"default is to disable signing and produce all binaries."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:544
+#: apt.conf.5.xml:562
msgid "dpkg trigger usage (and related options)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:545
+#: apt.conf.5.xml:563
msgid ""
"APT can call dpkg in a way so it can make aggressive use of triggers over "
"multiply calls of dpkg. Without further options dpkg will use triggers only "
@@ -5152,7 +5294,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:578
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -5162,7 +5304,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:554
+#: apt.conf.5.xml:572
msgid ""
"Note that it is not guaranteed that APT will support these options or that "
"these options will not cause (big) trouble in the future. If you have "
@@ -5176,12 +5318,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:584
msgid "DPkg::NoTriggers"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:567
+#: apt.conf.5.xml:585
msgid ""
"Add the no triggers flag to all dpkg calls (except the ConfigurePending "
"call). See &dpkg; if you are interested in what this actually means. In "
@@ -5193,12 +5335,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:574
+#: apt.conf.5.xml:592
msgid "PackageManager::Configure"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:575
+#: apt.conf.5.xml:593
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
@@ -5214,12 +5356,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:603
msgid "DPkg::ConfigurePending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:586
+#: apt.conf.5.xml:604
msgid ""
"If this option is set apt will call <command>dpkg --configure --pending</"
"command> to let dpkg handle all required configurations and triggers. This "
@@ -5230,12 +5372,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:592
+#: apt.conf.5.xml:610
msgid "DPkg::TriggersPending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:593
+#: apt.conf.5.xml:611
msgid ""
"Useful for <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -5245,12 +5387,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:616
msgid "PackageManager::UnpackAll"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:599
+#: apt.conf.5.xml:617
msgid ""
"As the configuration can be deferred to be done at the end by dpkg it can be "
"tried to order the unpack series only by critical needs, e.g. by Pre-"
@@ -5262,12 +5404,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:606
+#: apt.conf.5.xml:624
msgid "OrderList::Score::Immediate"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:632
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -5279,7 +5421,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:625
msgid ""
"Essential packages (and there dependencies) should be configured immediately "
"after unpacking. It will be a good idea to do this quite early in the "
@@ -5293,12 +5435,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:627
+#: apt.conf.5.xml:645
msgid "Periodic and Archives options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:628
+#: apt.conf.5.xml:646
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -5307,12 +5449,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:636
+#: apt.conf.5.xml:654
msgid "Debug options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:638
+#: apt.conf.5.xml:656
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -5323,7 +5465,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:667
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -5331,7 +5473,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:657
+#: apt.conf.5.xml:675
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -5339,7 +5481,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:666
+#: apt.conf.5.xml:684
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -5349,111 +5491,111 @@ msgstr ""
#. motivating example, except I haven't a clue why you'd want
#. to do this.
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:674
+#: apt.conf.5.xml:692
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CDROM IDs."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:702
msgid "A full list of debugging options to apt follows."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:689
+#: apt.conf.5.xml:707
msgid "<literal>Debug::Acquire::cdrom</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:711
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:700
+#: apt.conf.5.xml:718
msgid "<literal>Debug::Acquire::ftp</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:704
+#: apt.conf.5.xml:722
msgid "Print information related to downloading packages using FTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:729
msgid "<literal>Debug::Acquire::http</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:733
msgid "Print information related to downloading packages using HTTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:722
+#: apt.conf.5.xml:740
msgid "<literal>Debug::Acquire::https</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:744
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:751
msgid "<literal>Debug::Acquire::gpgv</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:755
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:744
+#: apt.conf.5.xml:762
msgid "<literal>Debug::aptcdrom</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:748
+#: apt.conf.5.xml:766
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:755
+#: apt.conf.5.xml:773
msgid "<literal>Debug::BuildDeps</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:776
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:783
msgid "<literal>Debug::Hashes</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:768
+#: apt.conf.5.xml:786
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:775
+#: apt.conf.5.xml:793
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:778
+#: apt.conf.5.xml:796
msgid ""
"Do not include information from <literal>statfs</literal>, namely the number "
"of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -5461,93 +5603,93 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:786
+#: apt.conf.5.xml:804
msgid "<literal>Debug::NoLocking</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:807
msgid ""
"Disable all file locking. For instance, this will allow two instances of "
"<quote><literal>apt-get update</literal></quote> to run at the same time."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:815
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:819
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:808
+#: apt.conf.5.xml:826
msgid "<literal>Debug::pkgAcquire::Auth</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:811
+#: apt.conf.5.xml:829
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:818
+#: apt.conf.5.xml:836
msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:821
+#: apt.conf.5.xml:839
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:829
+#: apt.conf.5.xml:847
msgid "<literal>Debug::pkgAcquire::RRed</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:833
+#: apt.conf.5.xml:851
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:840
+#: apt.conf.5.xml:858
msgid "<literal>Debug::pkgAcquire::Worker</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:844
+#: apt.conf.5.xml:862
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:851
+#: apt.conf.5.xml:869
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:873
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:862
+#: apt.conf.5.xml:880
msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:883
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -5557,12 +5699,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:876
+#: apt.conf.5.xml:894
msgid "<literal>Debug::pkgDepCache::Marker</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:897
msgid ""
"Generate debug messages describing which package is marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -5579,91 +5721,91 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:898
+#: apt.conf.5.xml:916
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:901
+#: apt.conf.5.xml:919
msgid "Dump the default configuration to standard error on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:908
+#: apt.conf.5.xml:926
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:911
+#: apt.conf.5.xml:929
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:919
+#: apt.conf.5.xml:937
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:922
+#: apt.conf.5.xml:940
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:947
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:933
+#: apt.conf.5.xml:951
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:941
+#: apt.conf.5.xml:959
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:945
+#: apt.conf.5.xml:963
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:952
+#: apt.conf.5.xml:970
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:974
msgid "Output the priority of each package list on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:962
+#: apt.conf.5.xml:980
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:966
+#: apt.conf.5.xml:984
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:974
+#: apt.conf.5.xml:992
msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:977
+#: apt.conf.5.xml:995
msgid ""
"Display a list of all installed packages with their calculated score used by "
"the pkgProblemResolver. The description of the package is the same as "
@@ -5671,32 +5813,32 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:985
+#: apt.conf.5.xml:1003
msgid "<literal>Debug::sourceList</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:989
+#: apt.conf.5.xml:1007
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1012
+#: apt.conf.5.xml:1030
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1019
+#: apt.conf.5.xml:1037
msgid "&file-aptconf;"
msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:1042
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr ""
@@ -5748,25 +5890,36 @@ msgid ""
"choice of instance, only the choice of version."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><title>
+#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:56
+msgid ""
+"Note that the files in the <filename>/etc/apt/preferences.d</filename> "
+"directory are parsed in alphanumeric ascending order and need to obey the "
+"following naming convention: The files have no or \"<literal>pref</literal>"
+"\" as filename extension and which only contain alphanumeric, hyphen (-), "
+"underscore (_) and period (.) characters - otherwise they will be silently "
+"ignored."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt_preferences.5.xml:63
msgid "APT's Default Priority Assignments"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:71
+#: apt_preferences.5.xml:78
#, no-wrap
msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:74
+#: apt_preferences.5.xml:81
#, no-wrap
msgid "APT::Default-Release \"stable\";\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:58
+#: apt_preferences.5.xml:65
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 "
@@ -5782,40 +5935,40 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:83
+#: apt_preferences.5.xml:90
msgid "priority 100"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:84
+#: apt_preferences.5.xml:91
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:88
+#: apt_preferences.5.xml:95
msgid "priority 500"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:89
+#: apt_preferences.5.xml:96
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:93
+#: apt_preferences.5.xml:100
msgid "priority 990"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:94
+#: apt_preferences.5.xml:101
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:78
+#: apt_preferences.5.xml:85
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: "
@@ -5823,7 +5976,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:99
+#: apt_preferences.5.xml:106
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 "
@@ -5831,14 +5984,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml:110
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:106
+#: apt_preferences.5.xml:113
msgid ""
"Never downgrade unless the priority of an available version exceeds 1000. "
"(\"Downgrading\" is installing a less recent version of a package in place "
@@ -5848,19 +6001,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:112
+#: apt_preferences.5.xml:119
msgid "Install the highest priority version."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:113
+#: apt_preferences.5.xml:120
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:116
+#: apt_preferences.5.xml:123
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</"
@@ -5868,7 +6021,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:122
+#: apt_preferences.5.xml:129
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 "
@@ -5878,7 +6031,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml:136
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 "
@@ -5887,7 +6040,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:141
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 "
@@ -5899,12 +6052,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:143
+#: apt_preferences.5.xml:150
msgid "The Effect of APT Preferences"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:145
+#: apt_preferences.5.xml:152
msgid ""
"The APT preferences file allows the system administrator to control the "
"assignment of priorities. The file consists of one or more multi-line "
@@ -5913,7 +6066,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:151
+#: apt_preferences.5.xml:158
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 "
@@ -5923,7 +6076,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:158
+#: apt_preferences.5.xml:165
#, no-wrap
msgid ""
"Package: perl\n"
@@ -5932,7 +6085,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:164
+#: apt_preferences.5.xml:171
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 "
@@ -5942,7 +6095,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:170
+#: apt_preferences.5.xml:177
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 "
@@ -5950,7 +6103,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:175
+#: apt_preferences.5.xml:182
#, no-wrap
msgid ""
"Package: *\n"
@@ -5959,7 +6112,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:180
+#: apt_preferences.5.xml:187
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 "
@@ -5969,7 +6122,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:186
+#: apt_preferences.5.xml:193
msgid ""
"The following record assigns a low priority to all package versions "
"belonging to any distribution whose Archive name is \"<literal>unstable</"
@@ -5977,7 +6130,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:190
+#: apt_preferences.5.xml:197
#, no-wrap
msgid ""
"Package: *\n"
@@ -5986,7 +6139,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:195
+#: apt_preferences.5.xml:202
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is \"<literal>squeeze</literal>"
@@ -5994,7 +6147,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:199
+#: apt_preferences.5.xml:206
#, no-wrap
msgid ""
"Package: *\n"
@@ -6003,7 +6156,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:204
+#: apt_preferences.5.xml:211
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -6011,7 +6164,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:209
+#: apt_preferences.5.xml:216
#, no-wrap
msgid ""
"Package: *\n"
@@ -6020,82 +6173,82 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:220
+#: apt_preferences.5.xml:227
msgid "How APT Interprets Priorities"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:228
+#: apt_preferences.5.xml:235
msgid "P &gt; 1000"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:229
+#: apt_preferences.5.xml:236
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:233
+#: apt_preferences.5.xml:240
msgid "990 &lt; P &lt;=1000"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:234
+#: apt_preferences.5.xml:241
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:239
+#: apt_preferences.5.xml:246
msgid "500 &lt; P &lt;=990"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:240
+#: apt_preferences.5.xml:247
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:245
+#: apt_preferences.5.xml:252
msgid "100 &lt; P &lt;=500"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:246
+#: apt_preferences.5.xml:253
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:251
+#: apt_preferences.5.xml:258
msgid "0 &lt; P &lt;=100"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:252
+#: apt_preferences.5.xml:259
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:256
+#: apt_preferences.5.xml:263
msgid "P &lt; 0"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:257
+#: apt_preferences.5.xml:264
msgid "prevents the version from being installed"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:223
+#: apt_preferences.5.xml:230
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -6103,7 +6256,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:262
+#: apt_preferences.5.xml:269
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -6112,14 +6265,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:268
+#: apt_preferences.5.xml:275
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:272
+#: apt_preferences.5.xml:279
#, no-wrap
msgid ""
"Package: perl\n"
@@ -6136,12 +6289,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:285
+#: apt_preferences.5.xml:292
msgid "Then:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:294
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 "
@@ -6151,7 +6304,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:292
+#: apt_preferences.5.xml:299
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -6159,7 +6312,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:296
+#: apt_preferences.5.xml:303
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</"
@@ -6168,12 +6321,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:313
msgid "Determination of Package Version and Distribution Properties"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:308
+#: apt_preferences.5.xml:315
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -6181,27 +6334,27 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:320
+#: apt_preferences.5.xml:327
msgid "the <literal>Package:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:321
+#: apt_preferences.5.xml:328
msgid "gives the package name"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:324 apt_preferences.5.xml:374
+#: apt_preferences.5.xml:331 apt_preferences.5.xml:381
msgid "the <literal>Version:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:325
+#: apt_preferences.5.xml:332
msgid "gives the version number for the named package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:319
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -6214,12 +6367,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:341
+#: apt_preferences.5.xml:348
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:342
+#: apt_preferences.5.xml:349
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -6230,18 +6383,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:352
+#: apt_preferences.5.xml:359
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:358
+#: apt_preferences.5.xml:365
msgid "the <literal>Codename:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:359
+#: apt_preferences.5.xml:366
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 "
@@ -6251,13 +6404,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:368
+#: apt_preferences.5.xml:375
#, no-wrap
msgid "Pin: release n=squeeze\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:375
+#: apt_preferences.5.xml:382
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 "
@@ -6267,7 +6420,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:384
+#: apt_preferences.5.xml:391
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -6276,12 +6429,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:393
+#: apt_preferences.5.xml:400
msgid "the <literal>Component:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:394
+#: apt_preferences.5.xml:401
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -6292,18 +6445,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:403
+#: apt_preferences.5.xml:410
#, no-wrap
msgid "Pin: release c=main\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:416
msgid "the <literal>Origin:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:410
+#: apt_preferences.5.xml:417
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -6312,18 +6465,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:416
+#: apt_preferences.5.xml:423
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:422
+#: apt_preferences.5.xml:429
msgid "the <literal>Label:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:423
+#: apt_preferences.5.xml:430
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is <literal>Debian</"
@@ -6332,13 +6485,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:429
+#: apt_preferences.5.xml:436
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:330
+#: apt_preferences.5.xml:337
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -6351,7 +6504,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:436
+#: apt_preferences.5.xml:443
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -6366,12 +6519,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:449
+#: apt_preferences.5.xml:456
msgid "Optional Lines in an APT Preferences Record"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:451
+#: apt_preferences.5.xml:458
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -6379,7 +6532,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:455
+#: apt_preferences.5.xml:462
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 "
@@ -6388,12 +6541,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:471
msgid "Tracking Stable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:472
+#: apt_preferences.5.xml:479
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6408,7 +6561,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:466
+#: apt_preferences.5.xml:473
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 "
@@ -6418,8 +6571,8 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:489 apt_preferences.5.xml:535
-#: apt_preferences.5.xml:593
+#: apt_preferences.5.xml:496 apt_preferences.5.xml:542
+#: apt_preferences.5.xml:600
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -6428,7 +6581,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:484
+#: apt_preferences.5.xml:491
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 "
@@ -6437,13 +6590,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:501
+#: apt_preferences.5.xml:508
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:495
+#: apt_preferences.5.xml:502
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -6452,12 +6605,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:507
+#: apt_preferences.5.xml:514
msgid "Tracking Testing or Unstable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:516
+#: apt_preferences.5.xml:523
#, no-wrap
msgid ""
"Package: *\n"
@@ -6474,7 +6627,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:509
+#: apt_preferences.5.xml:516
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -6485,7 +6638,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:530
+#: apt_preferences.5.xml:537
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 "
@@ -6494,13 +6647,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:550
+#: apt_preferences.5.xml:557
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:541
+#: apt_preferences.5.xml:548
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -6512,12 +6665,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:564
msgid "Tracking the evolution of a codename release"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:571
+#: apt_preferences.5.xml:578
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -6537,7 +6690,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:559
+#: apt_preferences.5.xml:566
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 "
@@ -6552,7 +6705,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:588
+#: apt_preferences.5.xml:595
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 "
@@ -6561,13 +6714,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:608
+#: apt_preferences.5.xml:615
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:599
+#: apt_preferences.5.xml:606
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -6579,12 +6732,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:617
+#: apt_preferences.5.xml:624
msgid "&file-preferences;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:623
+#: apt_preferences.5.xml:630
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr ""
@@ -6813,7 +6966,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
#: sources.list.5.xml:178
-msgid "more recongnizable URI types"
+msgid "more recognizable URI types"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
@@ -6821,9 +6974,9 @@ msgstr ""
msgid ""
"APT can be extended with more methods shipped in other optional packages "
"which should follow the nameing scheme <literal>apt-transport-"
-"<replaceable>method</replaceable></literal>. The APT team e.g. maintain "
+"<replaceable>method</replaceable></literal>. The APT team e.g. maintains "
"also the <literal>apt-transport-https</literal> package which provides "
-"access methods for https-URIs with features similiar to the http method, but "
+"access methods for https-URIs with features similar to the http method, but "
"other methods for using e.g. debtorrent are also available, see "
"<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></"
"refentrytitle> <manvolnum>1</manvolnum></citerefentry>."
@@ -7052,7 +7205,7 @@ msgstr ""
#: guide.sgml:63
msgid ""
"For instance, mailcrypt is an emacs extension that aids in encrypting email "
-"with GPG. Without GPGP installed mail-crypt is useless, so mailcrypt has a "
+"with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
"simple dependency on GPG. Also, because it is an emacs extension it has a "
"simple dependency on emacs, without emacs it is completely useless."
msgstr ""
@@ -7200,8 +7353,8 @@ msgstr ""
#. type: <p></p>
#: guide.sgml:184
msgid ""
-"To enable the APT method you need to to select [A]ccess in <prgn>dselect</"
-"prgn> and then choose the APT method. You will be prompted for a set of "
+"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
+"and then choose the APT method. You will be prompted for a set of "
"<em>Sources</em> which are places to fetch archives from. These can be "
"remote Internet sites, local Debian mirrors or CDROMs. Each source can "
"provide a fragment of the total Debian archive, APT will automatically "
@@ -7289,7 +7442,7 @@ msgstr ""
#: guide.sgml:247
msgid ""
"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a super-set of "
+"available list by selecting [U]pdate from the menu. This is a superset of "
"<tt>apt-get update</tt> that makes the fetched information available to "
"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
"tt> has been run before."
@@ -7793,7 +7946,7 @@ msgstr ""
#, fuzzy
msgid ""
"This is achieved by creatively manipulating the APT configuration file. The "
-"essential premis to tell APT to look on a disc for it's archive files. Note "
+"essential premise to tell APT to look on a disc for it's archive files. Note "
"that the disc should be formated with a filesystem that can handle long file "
"names such as ext2, fat32 or vfat."
msgstr ""
@@ -7951,8 +8104,8 @@ msgid ""
"On the target machine the first thing to do is mount the disc and copy <em>/"
"var/lib/dpkg/status</em> to it. You will also need to create the directories "
"outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
-"em> Then take the disc to the remote machine and configure the sources.list. "
-"On the remote machine execute the following:"
+"em>. Then take the disc to the remote machine and configure the sources."
+"list. On the remote machine execute the following:"
msgstr ""
"Pierwsz± rzecz±, jak± nale¿y zrobiæ na oddalonym komputerze z Debianem to "
"zamontowaæ dysk i przekopiowaæ na niego plik <em>/var/lib/dpkg/status</em>. "
@@ -7981,9 +8134,9 @@ msgstr ""
#: offline.sgml:149
#, fuzzy
msgid ""
-"The dist-upgrade command can be replaced with any-other standard APT "
+"The dist-upgrade command can be replaced with any other standard APT "
"commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em> However this presents a problem in communicating "
+"such as <em>dselect</em>. However this presents a problem in communicating "
"your selections back to the local computer."
msgstr ""
"Polecenie dist-upgrade mo¿na zast±piæ ka¿dym innym podstawowym poleceniem "
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index ea410fc4d..e6225eb67 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: apt\n"
-"POT-Creation-Date: 2009-11-27 00:05+0100\n"
+"POT-Creation-Date: 2010-01-20 12:18+0100\n"
"PO-Revision-Date: 2004-09-20 17:02+0000\n"
"Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
"Language-Team: <debian-l10n-portuguese@lists.debian.org>\n"
@@ -782,7 +782,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:355
+#: apt.ent:356
#, no-wrap
msgid ""
" <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
@@ -792,6 +792,66 @@ msgid ""
"\">\n"
msgstr ""
+#. type: Plain text
+#: apt.ent:362
+#, no-wrap
+msgid ""
+"<!ENTITY file-trustedgpg \"\n"
+" <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n"
+" <listitem><para>Keyring of local trusted keys, new keys will be added here.\n"
+" Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:369
+#, no-wrap
+msgid ""
+" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
+" <listitem><para>File fragments for the trusted keys, additional keyrings can\n"
+" be stored here (by other packages or the administrator).\n"
+" Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n"
+" </varlistentry>\n"
+"\">\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:371
+#, fuzzy
+msgid "<!ENTITY translation-title \"TRANSLATION\">"
+msgstr "<!ENTITY translation-title \"Tradução\">"
+
+#. type: Plain text
+#: apt.ent:380
+#, no-wrap, fuzzy
+msgid ""
+"<!-- TRANSLATOR: This is a placeholder. You should write here who has constributed\n"
+" to the translation in the past, who is responsible now and maybe further information\n"
+" specially related to your translation. -->\n"
+"<!ENTITY translation-holder \"\n"
+" The english translation was done by John Doe <email>john@doe.org</email> in 2009,\n"
+" 2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together with the\n"
+" Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>.\n"
+"\">\n"
+msgstr ""
+"<!ENTITY translation-holder \"\n"
+" Esta página de manual foi traduzida para o Português do Brasil por\n"
+" André Luís Lopes <email>andrelop@ig.com.br</email>.\n"
+"\">\n"
+
+#. type: Plain text
+#: apt.ent:387
+#, no-wrap
+msgid ""
+"<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
+" in a shipped manpage will maybe appear english parts. -->\n"
+"<!ENTITY translation-english \"\n"
+" Note that this translated document may contain untranslated parts.\n"
+" This is done on purpose, to avoid losing content when the\n"
+" translation is lagging behind the original content.\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
@@ -854,7 +914,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: 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-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40
#: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33
#: sources.list.5.xml:33
#, fuzzy
@@ -1249,7 +1309,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89
-#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:484 apt.conf.5.xml:506
+#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524
msgid "options"
msgstr ""
@@ -1443,14 +1503,14 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:556 apt-get.8.xml:554
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554
#: apt-sortpkgs.1.xml:64
msgid "&apt-commonoptions;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122
-#: apt.conf.5.xml:1017 apt_preferences.5.xml:615
+#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122
+#: apt.conf.5.xml:1035 apt_preferences.5.xml:622
msgid "Files"
msgstr ""
@@ -1461,9 +1521,9 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569
-#: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569
+#: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629
#: sources.list.5.xml:233
#, fuzzy
msgid "See Also"
@@ -1476,7 +1536,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><title>
#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:576 apt-get.8.xml:575
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575
#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
msgstr ""
@@ -1576,7 +1636,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:91
+#: apt-cdrom.8.xml:91 apt-key.8.xml:139
msgid "Options"
msgstr ""
@@ -1777,7 +1837,7 @@ msgid "Just show the contents of the configuration space."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585
#: apt-sortpkgs.1.xml:70
#, fuzzy
msgid "&apt-conf;"
@@ -2315,7 +2375,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:288
msgid ""
-"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
+"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
"source/Sources</filename>"
msgstr ""
@@ -2427,20 +2487,22 @@ msgid ""
"variables."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: 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>
+#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt-ftparchive.1.xml:354
#, no-wrap
msgid ""
"for i in Sections do \n"
" for j in Architectures do\n"
" Generate for DIST=scope SECTION=i ARCH=j\n"
+" "
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-ftparchive.1.xml:351
+msgid ""
+"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
+"command> performs an operation similar to: <placeholder type=\"programlisting"
+"\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
@@ -2735,12 +2797,31 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:547
-msgid "<option>APT::FTPArchive::LongDescription</option>"
+msgid "<option>APT::FTPArchive::AlwaysStat</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:549
msgid ""
+"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If "
+"packages are recompiled and/or republished with the same version again, this "
+"will lead to problems as the now outdated cached metadata like size and "
+"checksums will be used. With this option enabled this will no longer happen "
+"as it will be checked if the file was changed. Note that this option is set "
+"to \"<literal>false</literal>\" by default as it is not recommend to upload "
+"multiply versions/builds of a package with the same versionnumber, so in "
+"theory nobody will have these problems and therefore all these extra checks "
+"are useless."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:559
+msgid "<option>APT::FTPArchive::LongDescription</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:561
+msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
"only be set to <literal>\"false\"</literal> if the Archive generated with "
"&apt-ftparchive; also provides <filename>Translation</filename> files. Note "
@@ -2749,27 +2830,27 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462
+#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469
#: sources.list.5.xml:193
#, fuzzy
msgid "Examples"
msgstr "Exemplos"
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:567
+#: apt-ftparchive.1.xml:579
#, no-wrap
msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:563
+#: apt-ftparchive.1.xml:575
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:577
+#: apt-ftparchive.1.xml:589
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
@@ -2839,7 +2920,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:135 apt-key.8.xml:123
+#: apt-get.8.xml:135 apt-key.8.xml:124
msgid "update"
msgstr ""
@@ -3164,15 +3245,15 @@ msgstr ""
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
-"to deduce a likely solution. Any Package that are specified must completely "
-"correct the problem. The option is sometimes necessary when running APT for "
-"the first time; APT itself does not allow broken package dependencies to "
-"exist on a system. It is possible that a system's dependency structure can "
-"be so corrupt as to require manual intervention (which usually means using "
-"&dselect; or <command>dpkg --remove</command> to eliminate some of the "
-"offending packages). Use of this option together with <option>-m</option> "
-"may produce an error in some situations. Configuration Item: <literal>APT::"
-"Get::Fix-Broken</literal>."
+"to deduce a likely solution. If packages are specified, these have to "
+"completely correct the problem. The option is sometimes necessary when "
+"running APT for the first time; APT itself does not allow broken package "
+"dependencies to exist on a system. It is possible that a system's dependency "
+"structure can be so corrupt as to require manual intervention (which usually "
+"means using &dselect; or <command>dpkg --remove</command> to eliminate some "
+"of the offending packages). Use of this option together with <option>-m</"
+"option> may produce an error in some situations. Configuration Item: "
+"<literal>APT::Get::Fix-Broken</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -3427,7 +3508,7 @@ msgstr ""
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> "
+"<option>remove --purge</option> is equivalent to the <option>purge</option> "
"command. Configuration Item: <literal>APT::Get::Purge</literal>."
msgstr ""
@@ -3643,13 +3724,14 @@ msgstr ""
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-key.8.xml:28
msgid ""
-"<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> "
+"<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
+"replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
"<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></"
"arg>"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:36
+#: apt-key.8.xml:37
msgid ""
"<command>apt-key</command> is used to manage the list of keys used by apt to "
"authenticate packages. Packages which have been authenticated using these "
@@ -3657,17 +3739,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:42
+#: apt-key.8.xml:43
msgid "Commands"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:44
+#: apt-key.8.xml:45
msgid "add <replaceable>filename</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:48
+#: apt-key.8.xml:49
msgid ""
"Add a new key to the list of trusted keys. The key is read from "
"<replaceable>filename</replaceable>, or standard input if "
@@ -3675,119 +3757,139 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:56
+#: apt-key.8.xml:57
msgid "del <replaceable>keyid</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:60
+#: apt-key.8.xml:61
msgid "Remove a key from the list of trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:67
+#: apt-key.8.xml:68
msgid "export <replaceable>keyid</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:71
+#: apt-key.8.xml:72
msgid "Output the key <replaceable>keyid</replaceable> to standard output."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:78
+#: apt-key.8.xml:79
msgid "exportall"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:82
+#: apt-key.8.xml:83
msgid "Output all trusted keys to standard output."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:89
+#: apt-key.8.xml:90
msgid "list"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:93
+#: apt-key.8.xml:94
msgid "List trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:100
+#: apt-key.8.xml:101
msgid "finger"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:104
+#: apt-key.8.xml:105
msgid "List fingerprints of trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:111
+#: apt-key.8.xml:112
msgid "adv"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:115
+#: apt-key.8.xml:116
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:127
+#: apt-key.8.xml:128
msgid ""
"Update the local keyring with the keyring of Debian archive keys and removes "
"from the keyring the archive keys which are no longer valid."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><para>
#: apt-key.8.xml:140
+msgid ""
+"Note that options need to be defined before the commands described in the "
+"previous section."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml:142
#, fuzzy
-msgid "<filename>/etc/apt/trusted.gpg</filename>"
-msgstr "<filename>/etc/apt.conf</>"
+msgid "--keyring <replaceable>filename</replaceable>"
+msgstr ""
+"<programlisting>\n"
+"apt-get install <replaceable>pacote</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:141
-msgid "Keyring of local trusted keys, new keys will be added here."
+#: apt-key.8.xml:143
+msgid ""
+"With this option it is possible to specify a specific keyring file the "
+"command should operate on. The default is that a command is executed on the "
+"<filename>trusted.gpg</filename> file as well as on all parts in the "
+"<filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</"
+"filename> is the primary keyring which means that e.g. new keys are added to "
+"this one."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist>
+#: apt-key.8.xml:156
+msgid "&file-trustedgpg;"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:144
+#: apt-key.8.xml:158
#, fuzzy
msgid "<filename>/etc/apt/trustdb.gpg</filename>"
msgstr "<filename>/etc/apt.conf</>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:145
+#: apt-key.8.xml:159
msgid "Local trust database of archive keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:148
+#: apt-key.8.xml:162
msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:149
+#: apt-key.8.xml:163
msgid "Keyring of Debian archive trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:152
+#: apt-key.8.xml:166
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:153
+#: apt-key.8.xml:167
msgid "Keyring of Debian archive removed trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:164
+#: apt-key.8.xml:176
#, fuzzy
msgid "&apt-get;, &apt-secure;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -4238,7 +4340,7 @@ 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>18 September 2009</date>"
+"&apt-product; <date>16 January 2010</date>"
msgstr ""
#. type: Content of: <refentry><refnamediv><refname>
@@ -4260,18 +4362,54 @@ msgstr ""
#: 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 "
-"command line parser to provide a uniform environment. When an APT tool "
-"starts up it will read the configuration specified by the <envar>APT_CONFIG</"
-"envar> environment variable (if any) and then read the files in "
-"<literal>Dir::Etc::Parts</literal> then read the main configuration file "
-"specified by <literal>Dir::Etc::main</literal> then finally apply the "
-"command line options to override the configuration directives, possibly "
-"loading even more config files."
+"suite of tools, but by far not the only place changes to options can be "
+"made. All tools therefore share the configuration files and also use a "
+"common command line parser to provide a uniform environment."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><para>
+#: apt.conf.5.xml:45
+msgid ""
+"When an APT tool starts up it will read the configuration files in the "
+"following order:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:47
+msgid ""
+"the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
+"any)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:49
+msgid ""
+"all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
+"order which have no or \"<literal>conf</literal>\" as filename extension and "
+"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
+"characters - otherwise they will be silently ignored."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:54
+msgid ""
+"the main configuration file specified by <literal>Dir::Etc::main</literal>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:56
+msgid ""
+"the command line options are applied to override the configuration "
+"directives or to load even more configuration files."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.conf.5.xml:60
+msgid "Syntax"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:50
+#: apt.conf.5.xml:61
msgid ""
"The configuration file is organized in a tree with options organized into "
"functional groups. Option specification is given with a double colon "
@@ -4281,7 +4419,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:56
+#: apt.conf.5.xml:67
msgid ""
"Syntactically the configuration language is modeled after what the ISC tools "
"such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@ -4297,7 +4435,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:70
+#: apt.conf.5.xml:81
#, no-wrap
msgid ""
"APT {\n"
@@ -4309,7 +4447,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:78
+#: apt.conf.5.xml:89
msgid ""
"with newlines placed to make it more readable. Lists can be created by "
"opening a scope and including a single string enclosed in quotes followed by "
@@ -4317,27 +4455,27 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:83
+#: apt.conf.5.xml:94
#, no-wrap
msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:86
+#: apt.conf.5.xml:97
msgid ""
"In general the sample configuration file in <filename>&docdir;examples/apt."
"conf</filename> &configureindex; is a good guide for how it should look."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:90
+#: apt.conf.5.xml:101
msgid ""
"The names of the configuration items are not case-sensitive. So in the "
"previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:93
+#: apt.conf.5.xml:104
msgid ""
"Names for the configuration items are optional if a list is defined as it "
"can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. "
@@ -4347,7 +4485,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:98
+#: apt.conf.5.xml:109
msgid ""
"Two specials are allowed, <literal>#include</literal> (which is deprecated "
"and not supported by alternative implementations) and <literal>#clear</"
@@ -4359,7 +4497,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:106
+#: apt.conf.5.xml:117
msgid ""
"The #clear command is the only way to delete a list or a complete scope. "
"Reopening a scope or the ::-style described below will <emphasis>not</"
@@ -4369,7 +4507,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:111
+#: apt.conf.5.xml:122
msgid ""
"All of the APT tools take a -o option which allows an arbitrary "
"configuration directive to be specified on the command line. The syntax is a "
@@ -4380,7 +4518,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:118
+#: apt.conf.5.xml:129
msgid ""
"Note that you can use :: only for appending one item per line to a list and "
"that you should not use it in combination with the scope syntax. (The scope "
@@ -4397,24 +4535,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:130
+#: apt.conf.5.xml:141
msgid "The APT Group"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:131
+#: apt.conf.5.xml:142
msgid ""
"This group of options controls general APT behavior as well as holding the "
"options for all of the tools."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:135
+#: apt.conf.5.xml:146
msgid "Architecture"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:136
+#: apt.conf.5.xml:147
msgid ""
"System Architecture; sets the architecture to use when fetching files and "
"parsing package lists. The internal default is the architecture apt was "
@@ -4422,12 +4560,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:141
+#: apt.conf.5.xml:152
msgid "Default-Release"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:142
+#: apt.conf.5.xml:153
msgid ""
"Default release to install packages from if more than one version available. "
"Contains release name, codename or release version. Examples: 'stable', "
@@ -4436,24 +4574,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:146
+#: apt.conf.5.xml:157
msgid "Ignore-Hold"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:147
+#: apt.conf.5.xml:158
msgid ""
"Ignore Held packages; This global option causes the problem resolver to "
"ignore held packages in its decision making."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:151
+#: apt.conf.5.xml:162
msgid "Clean-Installed"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:152
+#: apt.conf.5.xml:163
msgid ""
"Defaults to on. When turned on the autoclean feature will remove any "
"packages which can no longer be downloaded from the cache. If turned off "
@@ -4462,12 +4600,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:158
+#: apt.conf.5.xml:169
msgid "Immediate-Configure"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:159
+#: apt.conf.5.xml:170
msgid ""
"Defaults to on which will cause APT to install essential and important "
"packages as fast as possible in the install/upgrade operation. This is done "
@@ -4483,13 +4621,13 @@ msgid ""
"dependencies which can generate a problem if the dependencies e.g. form a "
"circle as a dependency with the immediate flag is comparable with a Pre-"
"Dependency. So in theory it is possible that APT encounters a situation in "
-"which it is unable to perform immediate configuration, error out and refers "
+"which it is unable to perform immediate configuration, errors out and refers "
"to this option so the user can deactivate the immediate configuration "
-"temporary to be able to perform an install/upgrade again. Note the use of "
+"temporarily to be able to perform an install/upgrade again. Note the use of "
"the word \"theory\" here as this problem was only encountered by now in real "
-"world a few times in non-stable distribution versions and caused by wrong "
-"dependencies of the package in question or by a system in an already broken "
-"state, so you should not blindly disable this option as the mentioned "
+"world a few times in non-stable distribution versions and was caused by "
+"wrong dependencies of the package in question or by a system in an already "
+"broken state, so you should not blindly disable this option as the mentioned "
"scenario above is not the only problem immediate configuration can help to "
"prevent in the first place. Before a big operation like <literal>dist-"
"upgrade</literal> is run with this option disabled it should be tried to "
@@ -4500,12 +4638,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:181
+#: apt.conf.5.xml:192
msgid "Force-LoopBreak"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:182
+#: apt.conf.5.xml:193
msgid ""
"Never Enable this option unless you -really- know what you are doing. It "
"permits APT to temporarily remove an essential package to break a Conflicts/"
@@ -4516,87 +4654,98 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:190
+#: apt.conf.5.xml:201
msgid "Cache-Limit"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:191
+#: apt.conf.5.xml:202
msgid ""
"APT uses a fixed size memory mapped cache file to store the 'available' "
"information. This sets the size of that cache (in bytes)."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:195
+#: apt.conf.5.xml:206
msgid "Build-Essential"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:196
+#: apt.conf.5.xml:207
msgid "Defines which package(s) are considered essential build dependencies."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:210
msgid "Get"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:200
+#: apt.conf.5.xml:211
msgid ""
"The Get subsection controls the &apt-get; tool, please see its documentation "
"for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:204
+#: apt.conf.5.xml:215
msgid "Cache"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:205
+#: apt.conf.5.xml:216
msgid ""
"The Cache subsection controls the &apt-cache; tool, please see its "
"documentation for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:209
+#: apt.conf.5.xml:220
msgid "CDROM"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:210
+#: apt.conf.5.xml:221
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool, please see its "
"documentation for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:216
+#: apt.conf.5.xml:227
msgid "The Acquire Group"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:232
msgid "PDiffs"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:222
+#: apt.conf.5.xml:233
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for Packages or "
"Sources files instead of downloading whole ones. True by default."
msgstr ""
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:236
+msgid ""
+"Two sub-options to limit the use of PDiffs are also available: With "
+"<literal>FileLimit</literal> can be specified how many PDiff files are "
+"downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
+"other hand is the maximum precentage of the size of all patches compared to "
+"the size of the targeted file. If one of these limits is exceeded the "
+"complete file is downloaded instead of the patches."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:227
+#: apt.conf.5.xml:245
msgid "Queue-Mode"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:228
+#: apt.conf.5.xml:246
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
"literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -4606,36 +4755,36 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:235
+#: apt.conf.5.xml:253
msgid "Retries"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:254
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:240
+#: apt.conf.5.xml:258
msgid "Source-Symlinks"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:241
+#: apt.conf.5.xml:259
msgid ""
"Use symlinks for source archives. If set to true then source archives will "
"be symlinked when possible instead of copying. True is the default."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:245 sources.list.5.xml:139
+#: apt.conf.5.xml:263 sources.list.5.xml:139
msgid "http"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:246
+#: apt.conf.5.xml:264
msgid ""
"HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
"standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@ -4646,7 +4795,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:254
+#: apt.conf.5.xml:272
msgid ""
"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
"caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@ -4660,7 +4809,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:264 apt.conf.5.xml:328
+#: apt.conf.5.xml:282 apt.conf.5.xml:346
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method, this applies to all things including connection timeout and data "
@@ -4668,7 +4817,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:267
+#: apt.conf.5.xml:285
msgid ""
"One setting is provided to control the pipeline depth in cases where the "
"remote server is not RFC conforming or buggy (such as Squid 2.0.2). "
@@ -4680,7 +4829,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:275
+#: apt.conf.5.xml:293
msgid ""
"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
"literal> which accepts integer values in kilobyte. The default value is 0 "
@@ -4690,7 +4839,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:280
+#: apt.conf.5.xml:298
msgid ""
"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
"User-Agent for the http download method as some proxies allow access for "
@@ -4698,12 +4847,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:286
+#: apt.conf.5.xml:304
msgid "https"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:287
+#: apt.conf.5.xml:305
msgid ""
"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
"options are the same as for <literal>http</literal> method and will also "
@@ -4713,7 +4862,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:311
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -4734,12 +4883,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:311 sources.list.5.xml:150
+#: apt.conf.5.xml:329 sources.list.5.xml:150
msgid "ftp"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:312
+#: apt.conf.5.xml:330
msgid ""
"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@ -4758,7 +4907,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:331
+#: apt.conf.5.xml:349
msgid ""
"Several settings are provided to control passive mode. Generally it is safe "
"to leave passive mode on, it works in nearly every environment. However "
@@ -4768,7 +4917,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:338
+#: apt.conf.5.xml:356
msgid ""
"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
"envar> environment variable to a http url - see the discussion of the http "
@@ -4777,7 +4926,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:343
+#: apt.conf.5.xml:361
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4787,18 +4936,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:350 sources.list.5.xml:132
+#: apt.conf.5.xml:368 sources.list.5.xml:132
msgid "cdrom"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:356
+#: apt.conf.5.xml:374
#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#: apt.conf.5.xml:369
msgid ""
"CDROM URIs; the only setting for CDROM URIs is the mount point, "
"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@ -4811,12 +4960,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:361
+#: apt.conf.5.xml:379
msgid "gpgv"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:362
+#: apt.conf.5.xml:380
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
@@ -4824,18 +4973,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:385
msgid "CompressionTypes"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:373
+#: apt.conf.5.xml:391
#, no-wrap
msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:368
+#: apt.conf.5.xml:386
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -4847,19 +4996,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:378
+#: apt.conf.5.xml:396
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:381
+#: apt.conf.5.xml:399
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:374
+#: apt.conf.5.xml:392
msgid ""
"Also the <literal>Order</literal> subgroup can be used to define in which "
"order the acquire system will try to download the compressed files. The "
@@ -4876,13 +5025,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:385
+#: apt.conf.5.xml:403
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:383
+#: apt.conf.5.xml:401
msgid ""
"Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
"replaceable></literal> will be checked: If this setting exists the method "
@@ -4897,7 +5046,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:390
+#: apt.conf.5.xml:408
msgid ""
"While it is possible to add an empty compression type to the order list, but "
"APT in its current version doesn't understand it correctly and will display "
@@ -4907,36 +5056,36 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:396
+#: apt.conf.5.xml:414
msgid "Languages"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:397
+#: apt.conf.5.xml:415
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the Description-"
-"Translations. APT will try to display the first available Description for "
-"the Language which is listed at first. Languages can be defined with their "
-"short or long Languagecodes. Note that not all archives provide "
+"Translations. APT will try to display the first available Description in the "
+"Language which is listed at first. Languages can be defined with their short "
+"or long Languagecodes. Note that not all archives provide "
"<filename>Translation</filename> files for every Language - especially the "
"long Languagecodes are rare, so please inform you which ones are available "
"before you set here impossible values."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:413
+#: apt.conf.5.xml:431
#, no-wrap
msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:403
+#: apt.conf.5.xml:421
msgid ""
"The default list includes \"environment\" and \"en\". "
"\"<literal>environment</literal>\" has a special meaning here: It will be "
"replaced at runtime with the languagecodes extracted from the "
-"<literal>LC_MESSAGES</literal> enviroment variable. It will also ensure "
+"<literal>LC_MESSAGES</literal> environment variable. It will also ensure "
"that these codes are not included twice in the list. If "
"<literal>LC_MESSAGES</literal> is set to \"C\" only the "
"<filename>Translation-en</filename> file (if available) will be used. To "
@@ -4945,7 +5094,7 @@ msgid ""
"meaning code which will stop the search for a fitting <filename>Translation</"
"filename> file. This can be used by the system administrator to let APT "
"know that it should download also this files without actually use them if "
-"not the environment specifies this languages. So the following example "
+"the environment doesn't specify this languages. So the following example "
"configuration will result in the order \"en, de\" in an english and in \"de, "
"en\" in a german localization. Note that \"fr\" is downloaded, but not used "
"if APT is not used in a french localization, in such an environment the "
@@ -4954,19 +5103,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:217
+#: apt.conf.5.xml:228
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:438
msgid "Directories"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:422
+#: apt.conf.5.xml:440
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -4978,7 +5127,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:429
+#: apt.conf.5.xml:447
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4991,7 +5140,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:438
+#: apt.conf.5.xml:456
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -5001,7 +5150,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:444
+#: apt.conf.5.xml:462
msgid ""
"The <literal>Dir::Parts</literal> setting reads in all the config fragments "
"in lexical order from the directory specified. After this is done then the "
@@ -5009,7 +5158,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:448
+#: apt.conf.5.xml:466
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -5020,7 +5169,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:456
+#: apt.conf.5.xml:474
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -5033,12 +5182,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:469
+#: apt.conf.5.xml:487
msgid "APT in DSelect"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:471
+#: apt.conf.5.xml:489
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -5046,12 +5195,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:475
+#: apt.conf.5.xml:493
msgid "Clean"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:476
+#: apt.conf.5.xml:494
msgid ""
"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
"and never. always and prompt will remove all packages from the cache after "
@@ -5062,50 +5211,50 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:485
+#: apt.conf.5.xml:503
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the install phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:489
+#: apt.conf.5.xml:507
msgid "Updateoptions"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:508
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the update phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:494
+#: apt.conf.5.xml:512
msgid "PromptAfterUpdate"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:495
+#: apt.conf.5.xml:513
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:501
+#: apt.conf.5.xml:519
msgid "How APT calls dpkg"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:520
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:507
+#: apt.conf.5.xml:525
msgid ""
"This is a list of options to pass to dpkg. The options must be specified "
"using the list notation and each list item is passed as a single argument to "
@@ -5113,17 +5262,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:530
msgid "Pre-Invoke"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:530
msgid "Post-Invoke"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:513
+#: apt.conf.5.xml:531
msgid ""
"This is a list of shell commands to run before/after invoking &dpkg;. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -5132,12 +5281,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:519
+#: apt.conf.5.xml:537
msgid "Pre-Install-Pkgs"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:520
+#: apt.conf.5.xml:538
msgid ""
"This is a list of shell commands to run before invoking dpkg. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -5147,7 +5296,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:526
+#: apt.conf.5.xml:544
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -5157,36 +5306,36 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:533
+#: apt.conf.5.xml:551
msgid "Run-Directory"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:534
+#: apt.conf.5.xml:552
msgid ""
"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
"</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:556
msgid "Build-options"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:557
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages, the "
"default is to disable signing and produce all binaries."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:544
+#: apt.conf.5.xml:562
msgid "dpkg trigger usage (and related options)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:545
+#: apt.conf.5.xml:563
msgid ""
"APT can call dpkg in a way so it can make aggressive use of triggers over "
"multiply calls of dpkg. Without further options dpkg will use triggers only "
@@ -5201,7 +5350,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:578
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -5211,7 +5360,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:554
+#: apt.conf.5.xml:572
msgid ""
"Note that it is not guaranteed that APT will support these options or that "
"these options will not cause (big) trouble in the future. If you have "
@@ -5225,12 +5374,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:566
+#: apt.conf.5.xml:584
msgid "DPkg::NoTriggers"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:567
+#: apt.conf.5.xml:585
msgid ""
"Add the no triggers flag to all dpkg calls (except the ConfigurePending "
"call). See &dpkg; if you are interested in what this actually means. In "
@@ -5242,12 +5391,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:574
+#: apt.conf.5.xml:592
msgid "PackageManager::Configure"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:575
+#: apt.conf.5.xml:593
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
@@ -5263,12 +5412,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:603
msgid "DPkg::ConfigurePending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:586
+#: apt.conf.5.xml:604
msgid ""
"If this option is set apt will call <command>dpkg --configure --pending</"
"command> to let dpkg handle all required configurations and triggers. This "
@@ -5279,12 +5428,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:592
+#: apt.conf.5.xml:610
msgid "DPkg::TriggersPending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:593
+#: apt.conf.5.xml:611
msgid ""
"Useful for <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -5294,12 +5443,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:616
msgid "PackageManager::UnpackAll"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:599
+#: apt.conf.5.xml:617
msgid ""
"As the configuration can be deferred to be done at the end by dpkg it can be "
"tried to order the unpack series only by critical needs, e.g. by Pre-"
@@ -5311,12 +5460,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:606
+#: apt.conf.5.xml:624
msgid "OrderList::Score::Immediate"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:614
+#: apt.conf.5.xml:632
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -5328,7 +5477,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:607
+#: apt.conf.5.xml:625
msgid ""
"Essential packages (and there dependencies) should be configured immediately "
"after unpacking. It will be a good idea to do this quite early in the "
@@ -5342,12 +5491,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:627
+#: apt.conf.5.xml:645
msgid "Periodic and Archives options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:628
+#: apt.conf.5.xml:646
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -5356,12 +5505,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:636
+#: apt.conf.5.xml:654
msgid "Debug options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:638
+#: apt.conf.5.xml:656
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -5372,7 +5521,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:667
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -5380,7 +5529,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:657
+#: apt.conf.5.xml:675
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -5388,7 +5537,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:666
+#: apt.conf.5.xml:684
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -5398,120 +5547,120 @@ msgstr ""
#. motivating example, except I haven't a clue why you'd want
#. to do this.
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:674
+#: apt.conf.5.xml:692
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CDROM IDs."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:684
+#: apt.conf.5.xml:702
msgid "A full list of debugging options to apt follows."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:689
+#: apt.conf.5.xml:707
#, fuzzy
msgid "<literal>Debug::Acquire::cdrom</literal>"
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:693
+#: apt.conf.5.xml:711
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:700
+#: apt.conf.5.xml:718
#, fuzzy
msgid "<literal>Debug::Acquire::ftp</literal>"
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:704
+#: apt.conf.5.xml:722
msgid "Print information related to downloading packages using FTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:711
+#: apt.conf.5.xml:729
#, fuzzy
msgid "<literal>Debug::Acquire::http</literal>"
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:715
+#: apt.conf.5.xml:733
msgid "Print information related to downloading packages using HTTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:722
+#: apt.conf.5.xml:740
#, fuzzy
msgid "<literal>Debug::Acquire::https</literal>"
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:744
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:733
+#: apt.conf.5.xml:751
#, fuzzy
msgid "<literal>Debug::Acquire::gpgv</literal>"
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:755
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:744
+#: apt.conf.5.xml:762
#, fuzzy
msgid "<literal>Debug::aptcdrom</literal>"
msgstr "a linha <literal>Version:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:748
+#: apt.conf.5.xml:766
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:755
+#: apt.conf.5.xml:773
#, fuzzy
msgid "<literal>Debug::BuildDeps</literal>"
msgstr "a linha <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:776
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:765
+#: apt.conf.5.xml:783
#, fuzzy
msgid "<literal>Debug::Hashes</literal>"
msgstr "a linha <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:768
+#: apt.conf.5.xml:786
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:775
+#: apt.conf.5.xml:793
#, fuzzy
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr "a linha <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:778
+#: apt.conf.5.xml:796
msgid ""
"Do not include information from <literal>statfs</literal>, namely the number "
"of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -5519,99 +5668,99 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:786
+#: apt.conf.5.xml:804
#, fuzzy
msgid "<literal>Debug::NoLocking</literal>"
msgstr "a linha <literal>Origin:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:807
msgid ""
"Disable all file locking. For instance, this will allow two instances of "
"<quote><literal>apt-get update</literal></quote> to run at the same time."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:815
#, fuzzy
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:819
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:808
+#: apt.conf.5.xml:826
#, fuzzy
msgid "<literal>Debug::pkgAcquire::Auth</literal>"
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:811
+#: apt.conf.5.xml:829
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:818
+#: apt.conf.5.xml:836
#, fuzzy
msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:821
+#: apt.conf.5.xml:839
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:829
+#: apt.conf.5.xml:847
#, fuzzy
msgid "<literal>Debug::pkgAcquire::RRed</literal>"
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:833
+#: apt.conf.5.xml:851
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:840
+#: apt.conf.5.xml:858
#, fuzzy
msgid "<literal>Debug::pkgAcquire::Worker</literal>"
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:844
+#: apt.conf.5.xml:862
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:851
+#: apt.conf.5.xml:869
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:855
+#: apt.conf.5.xml:873
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:862
+#: apt.conf.5.xml:880
msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:883
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -5621,12 +5770,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:876
+#: apt.conf.5.xml:894
msgid "<literal>Debug::pkgDepCache::Marker</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:897
msgid ""
"Generate debug messages describing which package is marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -5643,96 +5792,96 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:898
+#: apt.conf.5.xml:916
#, fuzzy
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr "a linha <literal>Version:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:901
+#: apt.conf.5.xml:919
msgid "Dump the default configuration to standard error on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:908
+#: apt.conf.5.xml:926
#, fuzzy
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr "a linha <literal>Package:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:911
+#: apt.conf.5.xml:929
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:919
+#: apt.conf.5.xml:937
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:922
+#: apt.conf.5.xml:940
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:929
+#: apt.conf.5.xml:947
#, fuzzy
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr "a linha <literal>Origin:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:933
+#: apt.conf.5.xml:951
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:941
+#: apt.conf.5.xml:959
#, fuzzy
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr "a linha <literal>Package:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:945
+#: apt.conf.5.xml:963
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:952
+#: apt.conf.5.xml:970
#, fuzzy
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr "a linha <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:974
msgid "Output the priority of each package list on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:962
+#: apt.conf.5.xml:980
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:966
+#: apt.conf.5.xml:984
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:974
+#: apt.conf.5.xml:992
msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:977
+#: apt.conf.5.xml:995
msgid ""
"Display a list of all installed packages with their calculated score used by "
"the pkgProblemResolver. The description of the package is the same as "
@@ -5740,33 +5889,33 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:985
+#: apt.conf.5.xml:1003
#, fuzzy
msgid "<literal>Debug::sourceList</literal>"
msgstr "a linha <literal>Version:</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:989
+#: apt.conf.5.xml:1007
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1012
+#: apt.conf.5.xml:1030
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1019
+#: apt.conf.5.xml:1037
msgid "&file-aptconf;"
msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:1042
#, fuzzy
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -5841,14 +5990,25 @@ msgstr ""
"antes no arquivo &sources-list; . O arquivo de preferências do APT não afeta "
"a escolha da instância."
-#. type: Content of: <refentry><refsect1><refsect2><title>
+#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:56
+msgid ""
+"Note that the files in the <filename>/etc/apt/preferences.d</filename> "
+"directory are parsed in alphanumeric ascending order and need to obey the "
+"following naming convention: The files have no or \"<literal>pref</literal>"
+"\" as filename extension and which only contain alphanumeric, hyphen (-), "
+"underscore (_) and period (.) characters - otherwise they will be silently "
+"ignored."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt_preferences.5.xml:63
#, fuzzy
msgid "APT's Default Priority Assignments"
msgstr "Atribuições de Prioridade Padrão do APT"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:71
+#: apt_preferences.5.xml:78
#, fuzzy, no-wrap
msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
msgstr ""
@@ -5856,7 +6016,7 @@ msgstr ""
"<command>apt-get install -t testing <replaceable>algum-pacote</replaceable></command>\n"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:74
+#: apt_preferences.5.xml:81
#, fuzzy, no-wrap
msgid "APT::Default-Release \"stable\";\n"
msgstr ""
@@ -5864,7 +6024,7 @@ msgstr ""
"APT::Default-Release \"stable\";\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:58
+#: apt_preferences.5.xml:65
#, fuzzy
msgid ""
"If there is no preferences file or if there is no entry in the file that "
@@ -5889,25 +6049,25 @@ msgstr ""
"etc/apt/apt.conf</filename>. Por exemplo,"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:83
+#: apt_preferences.5.xml:90
#, fuzzy
msgid "priority 100"
msgstr "prioridade 100"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:84
+#: apt_preferences.5.xml:91
#, fuzzy
msgid "to the version that is already installed (if any)."
msgstr "para a instância que já esteja instalada (caso exista)."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:88
+#: apt_preferences.5.xml:95
#, fuzzy
msgid "priority 500"
msgstr "prioridade 500"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:89
+#: apt_preferences.5.xml:96
#, fuzzy
msgid ""
"to the versions that are not installed and do not belong to the target "
@@ -5916,13 +6076,13 @@ msgstr ""
"para as instâncias que não estã instaladas e que não pertencem a versão alvo."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:93
+#: apt_preferences.5.xml:100
#, fuzzy
msgid "priority 990"
msgstr "prioridade 990"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:94
+#: apt_preferences.5.xml:101
#, fuzzy
msgid ""
"to the versions that are not installed and belong to the target release."
@@ -5930,7 +6090,7 @@ msgstr ""
"para as instâncias que não estejam instaladas e pertençam a versão alvo."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:78
+#: apt_preferences.5.xml:85
#, fuzzy
msgid ""
"If the target release has been specified then APT uses the following "
@@ -5942,7 +6102,7 @@ msgstr ""
"Atribuirá :"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:99
+#: apt_preferences.5.xml:106
#, fuzzy
msgid ""
"If the target release has not been specified then APT simply assigns "
@@ -5954,7 +6114,7 @@ msgstr ""
"prioridade 500 para todas as instâncias de pacotes não instaladas."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml:110
#, fuzzy
msgid ""
"APT then applies the following rules, listed in order of precedence, to "
@@ -5964,7 +6124,7 @@ msgstr ""
"determinar qual instância de um pacote instalar."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:106
+#: apt_preferences.5.xml:113
#, fuzzy
msgid ""
"Never downgrade unless the priority of an available version exceeds 1000. "
@@ -5981,13 +6141,13 @@ msgstr ""
"\"downgrade\" pode ser arriscado.)"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:112
+#: apt_preferences.5.xml:119
#, fuzzy
msgid "Install the highest priority version."
msgstr "Instala a instância de prioridade mais alta."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:113
+#: apt_preferences.5.xml:120
#, fuzzy
msgid ""
"If two or more versions have the same priority, install the most recent one "
@@ -5997,7 +6157,7 @@ msgstr ""
"mais recente (ou seja, aquela com o maior número de versão)."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:116
+#: apt_preferences.5.xml:123
#, fuzzy
msgid ""
"If two or more versions have the same priority and version number but either "
@@ -6009,7 +6169,7 @@ msgstr ""
"<literal>--reinstall</literal> seja fornecida, instala aquela desinstalada."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:122
+#: apt_preferences.5.xml:129
#, fuzzy
msgid ""
"In a typical situation, the installed version of a package (priority 100) "
@@ -6026,7 +6186,7 @@ msgstr ""
"forem executados."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml:136
#, fuzzy
msgid ""
"More rarely, the installed version of a package is <emphasis>more</emphasis> "
@@ -6041,7 +6201,7 @@ msgstr ""
"upgrade</command> forem executados."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:141
#, fuzzy
msgid ""
"Sometimes the installed version of a package is more recent than the version "
@@ -6061,13 +6221,13 @@ msgstr ""
"disponíveis possuir uma prioridade maior do que a versão instalada."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:143
+#: apt_preferences.5.xml:150
#, fuzzy
msgid "The Effect of APT Preferences"
msgstr "O Efeito das Preferências do APT"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:145
+#: apt_preferences.5.xml:152
#, fuzzy
msgid ""
"The APT preferences file allows the system administrator to control the "
@@ -6081,7 +6241,7 @@ msgstr ""
"das duas formas, uma forma específica e uma forma geral."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:151
+#: apt_preferences.5.xml:158
#, fuzzy
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
@@ -6097,7 +6257,7 @@ msgstr ""
"com \"<literal>5.8</literal>\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:158
+#: apt_preferences.5.xml:165
#, fuzzy, no-wrap
msgid ""
"Package: perl\n"
@@ -6110,7 +6270,7 @@ msgstr ""
"Pin-Priority: 1001\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:164
+#: apt_preferences.5.xml:171
#, fuzzy
msgid ""
"The general form assigns a priority to all of the package versions in a "
@@ -6126,7 +6286,7 @@ msgstr ""
"identificado pelo nome de domínio totalmente qualificado do site Internet."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:170
+#: apt_preferences.5.xml:177
#, fuzzy
msgid ""
"This general-form entry in the APT preferences file applies only to groups "
@@ -6139,7 +6299,7 @@ msgstr ""
"no site local."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:175
+#: apt_preferences.5.xml:182
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -6152,7 +6312,7 @@ msgstr ""
"Pin-Priority: 999\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:180
+#: apt_preferences.5.xml:187
#, fuzzy
msgid ""
"A note of caution: the keyword used here is \"<literal>origin</literal>\". "
@@ -6169,7 +6329,7 @@ msgstr ""
"como \"Debian\" ou \"Ximian\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:186
+#: apt_preferences.5.xml:193
#, fuzzy
msgid ""
"The following record assigns a low priority to all package versions "
@@ -6181,7 +6341,7 @@ msgstr ""
"\"<literal>unstable</literal>\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:190
+#: apt_preferences.5.xml:197
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -6194,7 +6354,7 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:195
+#: apt_preferences.5.xml:202
#, fuzzy
msgid ""
"The following record assigns a high priority to all package versions "
@@ -6206,7 +6366,7 @@ msgstr ""
"\"<literal>unstable</literal>\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:199
+#: apt_preferences.5.xml:206
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -6219,7 +6379,7 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:204
+#: apt_preferences.5.xml:211
#, fuzzy
msgid ""
"The following record assigns a high priority to all package versions "
@@ -6232,7 +6392,7 @@ msgstr ""
"literal>\"."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:209
+#: apt_preferences.5.xml:216
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -6245,19 +6405,19 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:220
+#: apt_preferences.5.xml:227
#, fuzzy
msgid "How APT Interprets Priorities"
msgstr "Como o APT Interpreta Prioridades"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:228
+#: apt_preferences.5.xml:235
#, fuzzy
msgid "P &gt; 1000"
msgstr "P &gt; 1000"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:229
+#: apt_preferences.5.xml:236
#, fuzzy
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
@@ -6267,13 +6427,13 @@ msgstr ""
"dowgrade do pacote"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:233
+#: apt_preferences.5.xml:240
#, fuzzy
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:234
+#: apt_preferences.5.xml:241
#, fuzzy
msgid ""
"causes a version to be installed even if it does not come from the target "
@@ -6283,13 +6443,13 @@ msgstr ""
"versão alvo, a menos que a versão instalada seja mais recente"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:239
+#: apt_preferences.5.xml:246
#, fuzzy
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:240
+#: apt_preferences.5.xml:247
#, fuzzy
msgid ""
"causes a version to be installed unless there is a version available "
@@ -6299,13 +6459,13 @@ msgstr ""
"disponível pertencente a versão alvo ou a versão instalada seja mais recente"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:245
+#: apt_preferences.5.xml:252
#, fuzzy
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:246
+#: apt_preferences.5.xml:253
#, fuzzy
msgid ""
"causes a version to be installed unless there is a version available "
@@ -6316,13 +6476,13 @@ msgstr ""
"seja mais recente"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:251
+#: apt_preferences.5.xml:258
#, fuzzy
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:252
+#: apt_preferences.5.xml:259
#, fuzzy
msgid ""
"causes a version to be installed only if there is no installed version of "
@@ -6332,19 +6492,19 @@ msgstr ""
"instalada do pacote"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:256
+#: apt_preferences.5.xml:263
#, fuzzy
msgid "P &lt; 0"
msgstr "P &lt; 0"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:257
+#: apt_preferences.5.xml:264
#, fuzzy
msgid "prevents the version from being installed"
msgstr "impede a versão de ser instalada"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:223
+#: apt_preferences.5.xml:230
#, fuzzy
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
@@ -6356,7 +6516,7 @@ msgstr ""
"seguir (a grosso modo):"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:262
+#: apt_preferences.5.xml:269
#, fuzzy
msgid ""
"If any specific-form records match an available package version then the "
@@ -6372,7 +6532,7 @@ msgstr ""
"determinará a prioridade da versão do pacote."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:268
+#: apt_preferences.5.xml:275
#, fuzzy
msgid ""
"For example, suppose the APT preferences file contains the three records "
@@ -6382,7 +6542,7 @@ msgstr ""
"registros apresentados anteriormente :"
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:272
+#: apt_preferences.5.xml:279
#, fuzzy, no-wrap
msgid ""
"Package: perl\n"
@@ -6411,12 +6571,12 @@ msgstr ""
"Pin-Priority: 50\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:285
+#: apt_preferences.5.xml:292
msgid "Then:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:294
#, fuzzy
msgid ""
"The most recent available version of the <literal>perl</literal> package "
@@ -6432,7 +6592,7 @@ msgstr ""
"será feito um downgrade do <literal>perl</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:292
+#: apt_preferences.5.xml:299
#, fuzzy
msgid ""
"A version of any package other than <literal>perl</literal> that is "
@@ -6444,7 +6604,7 @@ msgstr ""
"mesmo versões pertencentes a versão alvo."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:296
+#: apt_preferences.5.xml:303
#, fuzzy
msgid ""
"A version of a package whose origin is not the local system but some other "
@@ -6459,13 +6619,13 @@ msgstr ""
"instalada."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:313
#, fuzzy
msgid "Determination of Package Version and Distribution Properties"
msgstr "Determinação da Versão do Pacote e Propriedades da Distribuição"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:308
+#: apt_preferences.5.xml:315
#, fuzzy
msgid ""
"The locations listed in the &sources-list; file should provide "
@@ -6477,31 +6637,31 @@ msgstr ""
"os pacotes disponíveis nessas localidades."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:320
+#: apt_preferences.5.xml:327
#, fuzzy
msgid "the <literal>Package:</literal> line"
msgstr "a linha <literal>Package:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:321
+#: apt_preferences.5.xml:328
#, fuzzy
msgid "gives the package name"
msgstr "informa o nome do pacote"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:324 apt_preferences.5.xml:374
+#: apt_preferences.5.xml:331 apt_preferences.5.xml:381
#, fuzzy
msgid "the <literal>Version:</literal> line"
msgstr "a linha <literal>Version:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:325
+#: apt_preferences.5.xml:332
#, fuzzy
msgid "gives the version number for the named package"
msgstr "informa o número de versão do pacote"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:319
#, fuzzy
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
@@ -6523,13 +6683,13 @@ msgstr ""
"do APT :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:341
+#: apt_preferences.5.xml:348
#, fuzzy
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr "a linha <literal>Archive:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:342
+#: apt_preferences.5.xml:349
#, fuzzy
msgid ""
"names the archive to which all the packages in the directory tree belong. "
@@ -6547,7 +6707,7 @@ msgstr ""
"requerer a linha :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:352
+#: apt_preferences.5.xml:359
#, fuzzy, no-wrap
msgid "Pin: release a=stable\n"
msgstr ""
@@ -6555,13 +6715,13 @@ msgstr ""
"Pin: release a=stable\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:358
+#: apt_preferences.5.xml:365
#, fuzzy
msgid "the <literal>Codename:</literal> line"
msgstr "a linha <literal>Component:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:359
+#: apt_preferences.5.xml:366
#, fuzzy
msgid ""
"names the codename to which all the packages in the directory tree belong. "
@@ -6578,13 +6738,13 @@ msgstr ""
"requerer a linha :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:368
+#: apt_preferences.5.xml:375
#, no-wrap
msgid "Pin: release n=squeeze\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:375
+#: apt_preferences.5.xml:382
#, fuzzy
msgid ""
"names the release version. For example, the packages in the tree might "
@@ -6601,7 +6761,7 @@ msgstr ""
"das linhas a seguir."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:384
+#: apt_preferences.5.xml:391
#, fuzzy, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -6614,13 +6774,13 @@ msgstr ""
"Pin: release 3.0\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:393
+#: apt_preferences.5.xml:400
#, fuzzy
msgid "the <literal>Component:</literal> line"
msgstr "a linha <literal>Component:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:394
+#: apt_preferences.5.xml:401
#, fuzzy
msgid ""
"names the licensing component associated with the packages in the directory "
@@ -6639,7 +6799,7 @@ msgstr ""
"requerer a linha :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:403
+#: apt_preferences.5.xml:410
#, fuzzy, no-wrap
msgid "Pin: release c=main\n"
msgstr ""
@@ -6647,13 +6807,13 @@ msgstr ""
"Pin: release c=main\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml:416
#, fuzzy
msgid "the <literal>Origin:</literal> line"
msgstr "a linha <literal>Origin:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:410
+#: apt_preferences.5.xml:417
#, fuzzy
msgid ""
"names the originator of the packages in the directory tree of the "
@@ -6667,7 +6827,7 @@ msgstr ""
"requerer a linha :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:416
+#: apt_preferences.5.xml:423
#, fuzzy, no-wrap
msgid "Pin: release o=Debian\n"
msgstr ""
@@ -6675,13 +6835,13 @@ msgstr ""
"Pin: release o=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:422
+#: apt_preferences.5.xml:429
#, fuzzy
msgid "the <literal>Label:</literal> line"
msgstr "a linha <literal>Label:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:423
+#: apt_preferences.5.xml:430
#, fuzzy
msgid ""
"names the label of the packages in the directory tree of the "
@@ -6694,7 +6854,7 @@ msgstr ""
"arquivo de preferências do APT iria requerer a linha :"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:429
+#: apt_preferences.5.xml:436
#, fuzzy, no-wrap
msgid "Pin: release l=Debian\n"
msgstr ""
@@ -6702,7 +6862,7 @@ msgstr ""
"Pin: release l=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:330
+#: apt_preferences.5.xml:337
#, fuzzy
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
@@ -6725,7 +6885,7 @@ msgstr ""
"do APT :"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:436
+#: apt_preferences.5.xml:443
#, fuzzy
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
@@ -6751,13 +6911,13 @@ msgstr ""
"<literal>unstable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:449
+#: apt_preferences.5.xml:456
#, fuzzy
msgid "Optional Lines in an APT Preferences Record"
msgstr "Linhas Opcionais em um Registro de Preferências do APT"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:451
+#: apt_preferences.5.xml:458
#, fuzzy
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
@@ -6769,7 +6929,7 @@ msgstr ""
"</literal>. Isto oferece um local para inserir comentários."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:455
+#: apt_preferences.5.xml:462
#, fuzzy
msgid ""
"The <literal>Pin-Priority:</literal> line in each APT preferences record is "
@@ -6783,13 +6943,13 @@ msgstr ""
"release ...</literal>."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:471
#, fuzzy
msgid "Tracking Stable"
msgstr "Acompanhando a Stable"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:472
+#: apt_preferences.5.xml:479
#, fuzzy, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6814,7 +6974,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:466
+#: apt_preferences.5.xml:473
#, fuzzy
msgid ""
"The following APT preferences file will cause APT to assign a priority "
@@ -6830,8 +6990,8 @@ msgstr ""
"outras distribuições <literal>Debian</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:489 apt_preferences.5.xml:535
-#: apt_preferences.5.xml:593
+#: apt_preferences.5.xml:496 apt_preferences.5.xml:542
+#: apt_preferences.5.xml:600
#, fuzzy, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -6844,7 +7004,7 @@ msgstr ""
"apt-get dist-upgrade\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:484
+#: apt_preferences.5.xml:491
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -6857,7 +7017,7 @@ msgstr ""
"ulítma(s) versão(ôes) <literal>stable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:501
+#: apt_preferences.5.xml:508
#, fuzzy, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr ""
@@ -6865,7 +7025,7 @@ msgstr ""
"apt-get install <replaceable>pacote</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:495
+#: apt_preferences.5.xml:502
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -6878,13 +7038,13 @@ msgstr ""
"atualizado novamente a menos que esse comando seja executado novamente."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:507
+#: apt_preferences.5.xml:514
#, fuzzy
msgid "Tracking Testing or Unstable"
msgstr "Acompanhando a Testing"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:516
+#: apt_preferences.5.xml:523
#, fuzzy, no-wrap
msgid ""
"Package: *\n"
@@ -6913,7 +7073,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:509
+#: apt_preferences.5.xml:516
#, fuzzy
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
@@ -6930,7 +7090,7 @@ msgstr ""
"versões de pacotes de outras distribuições <literal>Debian</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:530
+#: apt_preferences.5.xml:537
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -6943,7 +7103,7 @@ msgstr ""
"(s) última(s) versão(ões) <literal>testing</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:550
+#: apt_preferences.5.xml:557
#, fuzzy, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr ""
@@ -6951,7 +7111,7 @@ msgstr ""
"apt-get install <replaceable>pacote</replaceable>/unstable\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:541
+#: apt_preferences.5.xml:548
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -6971,12 +7131,12 @@ msgstr ""
"recente que a versão instalada."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:564
msgid "Tracking the evolution of a codename release"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:571
+#: apt_preferences.5.xml:578
#, fuzzy, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -7006,7 +7166,7 @@ msgstr ""
"Pin-Priority: -10\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:559
+#: apt_preferences.5.xml:566
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 "
@@ -7021,7 +7181,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:588
+#: apt_preferences.5.xml:595
#, fuzzy
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
@@ -7034,7 +7194,7 @@ msgstr ""
"ulítma(s) versão(ôes) <literal>stable</literal>."
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:608
+#: apt_preferences.5.xml:615
#, fuzzy, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr ""
@@ -7042,7 +7202,7 @@ msgstr ""
"apt-get install <replaceable>pacote</replaceable>/testing\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:599
+#: apt_preferences.5.xml:606
#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
@@ -7062,13 +7222,13 @@ msgstr ""
"recente que a versão instalada."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:617
+#: apt_preferences.5.xml:624
#, fuzzy
msgid "&file-preferences;"
msgstr "apt_preferences"
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:623
+#: apt_preferences.5.xml:630
#, fuzzy
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
@@ -7299,7 +7459,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
#: sources.list.5.xml:178
-msgid "more recongnizable URI types"
+msgid "more recognizable URI types"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
@@ -7307,9 +7467,9 @@ msgstr ""
msgid ""
"APT can be extended with more methods shipped in other optional packages "
"which should follow the nameing scheme <literal>apt-transport-"
-"<replaceable>method</replaceable></literal>. The APT team e.g. maintain "
+"<replaceable>method</replaceable></literal>. The APT team e.g. maintains "
"also the <literal>apt-transport-https</literal> package which provides "
-"access methods for https-URIs with features similiar to the http method, but "
+"access methods for https-URIs with features similar to the http method, but "
"other methods for using e.g. debtorrent are also available, see "
"<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></"
"refentrytitle> <manvolnum>1</manvolnum></citerefentry>."
@@ -7526,7 +7686,7 @@ msgstr ""
#: guide.sgml:63
msgid ""
"For instance, mailcrypt is an emacs extension that aids in encrypting email "
-"with GPG. Without GPGP installed mail-crypt is useless, so mailcrypt has a "
+"with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
"simple dependency on GPG. Also, because it is an emacs extension it has a "
"simple dependency on emacs, without emacs it is completely useless."
msgstr ""
@@ -7674,8 +7834,8 @@ msgstr ""
#. type: <p></p>
#: guide.sgml:184
msgid ""
-"To enable the APT method you need to to select [A]ccess in <prgn>dselect</"
-"prgn> and then choose the APT method. You will be prompted for a set of "
+"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
+"and then choose the APT method. You will be prompted for a set of "
"<em>Sources</em> which are places to fetch archives from. These can be "
"remote Internet sites, local Debian mirrors or CDROMs. Each source can "
"provide a fragment of the total Debian archive, APT will automatically "
@@ -7763,7 +7923,7 @@ msgstr ""
#: guide.sgml:247
msgid ""
"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-"available list by selecting [U]pdate from the menu. This is a super-set of "
+"available list by selecting [U]pdate from the menu. This is a superset of "
"<tt>apt-get update</tt> that makes the fetched information available to "
"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
"tt> has been run before."
@@ -8241,7 +8401,7 @@ msgstr ""
#: offline.sgml:57
msgid ""
"This is achieved by creatively manipulating the APT configuration file. The "
-"essential premis to tell APT to look on a disc for it's archive files. Note "
+"essential premise to tell APT to look on a disc for it's archive files. Note "
"that the disc should be formated with a filesystem that can handle long file "
"names such as ext2, fat32 or vfat."
msgstr ""
@@ -8339,8 +8499,8 @@ msgid ""
"On the target machine the first thing to do is mount the disc and copy <em>/"
"var/lib/dpkg/status</em> to it. You will also need to create the directories "
"outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
-"em> Then take the disc to the remote machine and configure the sources.list. "
-"On the remote machine execute the following:"
+"em>. Then take the disc to the remote machine and configure the sources."
+"list. On the remote machine execute the following:"
msgstr ""
#. type: <example></example>
@@ -8357,9 +8517,9 @@ msgstr ""
#. type: </example></p>
#: offline.sgml:149
msgid ""
-"The dist-upgrade command can be replaced with any-other standard APT "
+"The dist-upgrade command can be replaced with any other standard APT "
"commands, particularly dselect-upgrade. You can even use an APT front end "
-"such as <em>dselect</em> However this presents a problem in communicating "
+"such as <em>dselect</em>. However this presents a problem in communicating "
"your selections back to the local computer."
msgstr ""
@@ -8492,6 +8652,10 @@ msgid "Which will use the already fetched archives on the disc."
msgstr ""
#, fuzzy
+#~ msgid "<filename>/etc/apt/trusted.gpg</filename>"
+#~ msgstr "<filename>/etc/apt.conf</>"
+
+#, fuzzy
#~ msgid "/usr/share/doc/apt/"
#~ msgstr "/usr/share/doc/apt/"
diff --git a/doc/po4a.conf b/doc/po4a.conf
index fae80d690..25c314640 100644
--- a/doc/po4a.conf
+++ b/doc/po4a.conf
@@ -7,32 +7,19 @@
# define source file and translated file (one file per line)
[type: man] apt.8 $lang:$lang/apt.$lang.8
[type: entity] apt.ent $lang:$lang/apt.ent
-[type: docbook] apt-cache.8.xml $lang:$lang/apt-cache.$lang.8.xml \
- add_$lang:$lang/addendum/xml_$lang.add
-[type: docbook] apt-cdrom.8.xml $lang:$lang/apt-cdrom.$lang.8.xml \
- add_$lang:$lang/addendum/xml_$lang.add
-[type: docbook] apt-config.8.xml $lang:$lang/apt-config.$lang.8.xml \
- add_$lang:$lang/addendum/xml_$lang.add
-[type: docbook] apt-extracttemplates.1.xml $lang:$lang/apt-extracttemplates.$lang.1.xml \
- add_$lang:$lang/addendum/xml_$lang.add
-[type: docbook] apt-ftparchive.1.xml $lang:$lang/apt-ftparchive.$lang.1.xml \
- add_$lang:$lang/addendum/xml_$lang.add
-[type: docbook] apt-get.8.xml $lang:$lang/apt-get.$lang.8.xml \
- add_$lang:$lang/addendum/xml_$lang.add
-[type: docbook] apt-key.8.xml $lang:$lang/apt-key.$lang.8.xml \
- add_$lang:$lang/addendum/xml_$lang.add
-[type: docbook] apt-mark.8.xml $lang:$lang/apt-mark.$lang.8.xml \
- add_$lang:$lang/addendum/xml_$lang.add
-[type: docbook] apt-secure.8.xml $lang:$lang/apt-secure.$lang.8.xml \
- add_$lang:$lang/addendum/xml_$lang.add
-[type: docbook] apt-sortpkgs.1.xml $lang:$lang/apt-sortpkgs.$lang.1.xml \
- add_$lang:$lang/addendum/xml_$lang.add
-[type: docbook] apt.conf.5.xml $lang:$lang/apt.conf.$lang.5.xml \
- add_$lang:$lang/addendum/xml_$lang.add
-[type: docbook] apt_preferences.5.xml $lang:$lang/apt_preferences.$lang.5.xml \
- add_$lang:$lang/addendum/xml_$lang.add
-[type: docbook] sources.list.5.xml $lang:$lang/sources.list.$lang.5.xml \
- add_$lang:$lang/addendum/xml_$lang.add
+[type: docbook] apt-cache.8.xml $lang:$lang/apt-cache.$lang.8.xml add_$lang:xml.add
+[type: docbook] apt-cdrom.8.xml $lang:$lang/apt-cdrom.$lang.8.xml add_$lang:xml.add
+[type: docbook] apt-config.8.xml $lang:$lang/apt-config.$lang.8.xml add_$lang:xml.add
+[type: docbook] apt-extracttemplates.1.xml $lang:$lang/apt-extracttemplates.$lang.1.xml add_$lang:xml.add
+[type: docbook] apt-ftparchive.1.xml $lang:$lang/apt-ftparchive.$lang.1.xml add_$lang:xml.add
+[type: docbook] apt-get.8.xml $lang:$lang/apt-get.$lang.8.xml add_$lang:xml.add
+[type: docbook] apt-key.8.xml $lang:$lang/apt-key.$lang.8.xml add_$lang:xml.add
+[type: docbook] apt-mark.8.xml $lang:$lang/apt-mark.$lang.8.xml add_$lang:xml.add
+[type: docbook] apt-secure.8.xml $lang:$lang/apt-secure.$lang.8.xml add_$lang:xml.add
+[type: docbook] apt-sortpkgs.1.xml $lang:$lang/apt-sortpkgs.$lang.1.xml add_$lang:xml.add
+[type: docbook] apt.conf.5.xml $lang:$lang/apt.conf.$lang.5.xml add_$lang:xml.add
+[type: docbook] apt_preferences.5.xml $lang:$lang/apt_preferences.$lang.5.xml add_$lang:xml.add
+[type: docbook] sources.list.5.xml $lang:$lang/sources.list.$lang.5.xml add_$lang:xml.add
[type: sgml] guide.sgml $lang:$lang/guide.$lang.sgml
# add_$lang::$lang/addendum/debiandoc_$lang.add
diff --git a/doc/pt_BR/addendum/xml_pt_BR.add b/doc/pt_BR/addendum/xml_pt_BR.add
deleted file mode 100644
index 08f94ce20..000000000
--- a/doc/pt_BR/addendum/xml_pt_BR.add
+++ /dev/null
@@ -1,5 +0,0 @@
-PO4A-HEADER:mode=after;position=manbugs;beginboundary=^</refentry>
- <refsect1><title>Tradução</title>
- Esta página de manual foi traduzida para o Português do Brasil por
- André Luís Lopes <email>andrelop@ig.com.br</email>.
- </refsect1>
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index 0f788aca1..c71ae6bdd 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -175,12 +175,12 @@ deb http://http.us.debian.org/debian dists/stable-updates/
commands to perform the file transfers from the remote.</para></listitem>
</varlistentry>
- <varlistentry><term>more recongnizable URI types</term>
+ <varlistentry><term>more recognizable URI types</term>
<listitem><para>
APT can be extended with more methods shipped in other optional packages which should
follow the nameing scheme <literal>apt-transport-<replaceable>method</replaceable></literal>.
- The APT team e.g. maintain also the <literal>apt-transport-https</literal> package which
- provides access methods for https-URIs with features similiar to the http method, but other
+ The APT team e.g. maintains also the <literal>apt-transport-https</literal> package which
+ provides access methods for https-URIs with features similar to the http method, but other
methods for using e.g. debtorrent are also available, see <citerefentry>
<refentrytitle><filename>apt-transport-debtorrent</filename></refentrytitle>
<manvolnum>1</manvolnum></citerefentry>.
diff --git a/doc/xml.add b/doc/xml.add
new file mode 100644
index 000000000..9311c052f
--- /dev/null
+++ b/doc/xml.add
@@ -0,0 +1,5 @@
+PO4A-HEADER:mode=after;position=manbugs;beginboundary=^</refentry>
+ <refsect1><title>&translation-title;</title>
+ <para>&translation-holder;</para>
+ <para>&translation-english;</para>
+ </refsect1>