merged from lp:~donkult/apt/debian-experimental

1 files changed, 2737 insertions, 4121 deletions

diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index ab6cae376..b4b0c4f06 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -9,7 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
-"POT-Creation-Date: 2012-04-11 17:54+0300\n"
+"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
+"POT-Creation-Date: 2012-06-09 22:05+0300\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"
@@ -18,164 +19,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. type: TH
-#: apt.8:17
-#, no-wrap
-msgid "apt"
-msgstr ""
-
-#. type: TH
-#: apt.8:17
-#, no-wrap
-msgid "16 June 1998"
-msgstr ""
-
-#. type: TH
-#: apt.8:17
-#, no-wrap
-msgid "Debian GNU/Linux"
-msgstr ""
-
-#. type: SH
-#: apt.8:18
-#, no-wrap
-msgid "NAME"
-msgstr ""
-
-#. type: Plain text
-#: apt.8:20
-msgid "apt - Advanced Package Tool"
-msgstr ""
-
-#. type: SH
-#: apt.8:20
-#, no-wrap
-msgid "SYNOPSIS"
-msgstr ""
-
-#. type: Plain text
-#: apt.8:22
-msgid "B<apt>"
-msgstr ""
-
-#. type: SH
-#: apt.8:22
-#, no-wrap
-msgid "DESCRIPTION"
-msgstr ""
-
-#. type: Plain text
-#: apt.8:31
-msgid ""
-"APT is a management system for software packages. For normal day to day "
-"package management there are several frontends available, such as B<aptitude>"
-"(8)  for the command line or B<synaptic>(8)  for the X Window System. Some "
-"options are only implemented in B<apt-get>(8)  though."
-msgstr ""
-
-#. type: SH
-#: apt.8:31
-#, no-wrap
-msgid "SEE ALSO"
-msgstr ""
-
-#. type: Plain text
-#: apt.8:38
-msgid ""
-"B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
-"B<apt_preferences>(5), B<apt-secure>(8)"
-msgstr ""
-
-#. type: SH
-#: apt.8:38
-#, no-wrap
-msgid "DIAGNOSTICS"
-msgstr ""
-
-#. type: Plain text
-#: apt.8:40
-msgid "apt returns zero on normal operation, decimal 100 on error."
-msgstr ""
-
-#. type: SH
-#: apt.8:40
-#, no-wrap
-msgid "BUGS"
-msgstr ""
-
-#. type: Plain text
-#: apt.8:42
-msgid "This manpage isn't even started."
-msgstr ""
-
-#. type: Plain text
-#: apt.8:51
-#, fuzzy
-msgid ""
-"See E<lt>http://bugs.debian.org/aptE<gt>.  If you wish to report a bug in "
-"B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the "
-"B<reportbug>(1)  command."
-msgstr ""
-"\n"
-" <RefSect1><Title>Bugs</>\n"
-"   <para>\n"
-"   Consulte a <ulink url='http://bugs.debian.org/apt'>página de bugs do APT</"
-">.\n"
-"   Caso você queira relatar um bug no APT, por favor consulte o arquivo\n"
-"   <filename>/usr/share/doc/debian/bug-reporting.txt</> ou o comando "
-"&reportbug;.\n"
-" </RefSect1>\n"
-
-#. type: SH
-#: apt.8:51
-#, no-wrap
-msgid "AUTHOR"
-msgstr ""
-
-#. type: Plain text
-#: apt.8:52
-#, fuzzy
-msgid "apt was written by the APT team E<lt>apt@packages.debian.orgE<gt>."
-msgstr ""
-"\n"
-" <RefSect1><Title>Author</>\n"
-"   <para>\n"
-"   O APT foi escrito pela equipe APT <email>apt@packages.debian.org</>.\n"
-" </RefSect1>\n"
-
-#. type: Plain text
-#: apt.ent:2
-msgid "<!-- -*- mode: sgml; mode: fold -*- -->"
-msgstr ""
-
-#. type: Plain text
-#: apt.ent:16
-#, fuzzy, no-wrap
-msgid ""
-"<!-- Boiler plate docinfo section -->\n"
-"<!ENTITY apt-docinfo \"\n"
-" <refentryinfo>\n"
-"   <address><email>apt@packages.debian.org</email></address>\n"
-"   <author>\n"
-"     <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
-"     <contrib></contrib>\n"
-"   </author>\n"
-"   <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>\n"
-"   <date>28 October 2008</date>\n"
-"   <productname>Linux</productname>\n"
-" </refentryinfo>\n"
-"\">\n"
-msgstr ""
-"\n"
-" <docinfo>\n"
-"   <address><email>apt@packages.debian.org</></address>\n"
-"   <author><firstname>Jason</> <surname>Gunthorpe</></>\n"
-"   <copyright><year>1998-2001</> <holder>Jason Gunthorpe</></>\n"
-"   <date>12 Março 2001</>\n"
-" </docinfo>\n"
-
 #. type: Plain text
-#: apt.ent:23
+#: apt.ent:7
 #, no-wrap
 msgid ""
 "<!ENTITY apt-author.team \"\n"
@@ -187,7 +32,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:29
+#: apt.ent:13
 #, no-wrap
 msgid ""
 "<!ENTITY apt-qapage \"\n"
@@ -198,7 +43,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:40
+#: apt.ent:24
 #, fuzzy, no-wrap
 msgid ""
 "<!-- Boiler plate Bug reporting section -->\n"
@@ -221,7 +66,7 @@ msgstr ""
 " </RefSect1>\n"
 
 #. type: Plain text
-#: apt.ent:48
+#: apt.ent:32
 #, fuzzy, no-wrap
 msgid ""
 "<!-- Boiler plate Author section -->\n"
@@ -239,7 +84,7 @@ msgstr ""
 " </RefSect1>\n"
 
 #. type: Plain text
-#: apt.ent:58
+#: apt.ent:42
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -254,7 +99,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:66
+#: apt.ent:50
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -267,7 +112,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:78
+#: apt.ent:62
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -284,7 +129,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:90
+#: apt.ent:74
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -301,7 +146,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:101
+#: apt.ent:85
 #, fuzzy, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -325,7 +170,7 @@ msgstr ""
 "   </para>\n"
 
 #. type: Plain text
-#: apt.ent:107
+#: apt.ent:91
 #, no-wrap
 msgid ""
 "<!ENTITY file-aptconf \"\n"
@@ -336,7 +181,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:113
+#: apt.ent:97
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
@@ -347,7 +192,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:119
+#: apt.ent:103
 #, no-wrap
 msgid ""
 "<!ENTITY file-cachearchives \"\n"
@@ -358,18 +203,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:125
+#: apt.ent:109
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
 "     <listitem><para>Storage area for package files in transit.\n"
-"     Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>\n"
+"     Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended)</para></listitem>\n"
 "     </varlistentry>\n"
 "\">\n"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:135
+#: apt.ent:119
 #, no-wrap
 msgid ""
 "<!ENTITY file-preferences \"\n"
@@ -384,7 +229,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:141
+#: apt.ent:125
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
@@ -395,7 +240,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:147
+#: apt.ent:131
 #, no-wrap
 msgid ""
 "<!ENTITY file-sourceslist \"\n"
@@ -406,7 +251,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:153
+#: apt.ent:137
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
@@ -417,7 +262,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:160
+#: apt.ent:144
 #, no-wrap
 msgid ""
 "<!ENTITY file-statelists \"\n"
@@ -429,18 +274,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:166
+#: apt.ent:150
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
 "     <listitem><para>Storage area for state information in transit.\n"
-"     Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>\n"
+"     Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended)</para></listitem>\n"
 "     </varlistentry>\n"
 "\">\n"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:172
+#: apt.ent:156
 #, no-wrap
 msgid ""
 "<!ENTITY file-trustedgpg \"\n"
@@ -451,7 +296,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:179
+#: apt.ent:163
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
@@ -463,7 +308,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:187
+#: apt.ent:171
 #, no-wrap
 msgid ""
 "<!ENTITY file-extended_states \"\n"
@@ -476,7 +321,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:191
+#: apt.ent:175
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
@@ -485,7 +330,7 @@ msgid ""
 msgstr "<!ENTITY translation-title \"TRADUÇÃO\">\n"
 
 #. type: Plain text
-#: apt.ent:200
+#: apt.ent:184
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
@@ -503,7 +348,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
-#: apt.ent:211
+#: apt.ent:195
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
@@ -519,21 +364,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:214
+#: apt.ent:198
 msgid ""
 "<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
 "pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:217
+#: apt.ent:201
 msgid ""
 "<!-- TRANSLATOR: used as in -c=config_file e.g. -c=./apt.conf --> <!ENTITY "
 "synopsis-config-file \"config_file\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:220
+#: apt.ent:204
 msgid ""
 "<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
 "t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
@@ -541,49 +386,49 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:223
+#: apt.ent:207
 msgid ""
 "<!-- TRANSLATOR: used as in -a=architecture e.g. -a=armel --> <!ENTITY "
 "synopsis-architecture \"architecture\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:226
+#: apt.ent:210
 msgid ""
 "<!-- TRANSLATOR: used as in apt-get install pkg e.g. apt-get install awesome "
 "--> <!ENTITY synopsis-pkg \"pkg\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:229
+#: apt.ent:213
 msgid ""
 "<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> <!"
 "ENTITY synopsis-pkg-ver-number \"pkg_version_number\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:232
+#: apt.ent:216
 msgid ""
 "<!-- TRANSLATOR: used as in apt-cache pkgnames prefix e.g. apt-cache "
 "pkgnames apt --> <!ENTITY synopsis-prefix \"prefix\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:235
+#: apt.ent:219
 msgid ""
 "<!-- TRANSLATOR: used as in apt-cache search regex e.g. apt-cache search "
 "awesome --> <!ENTITY synopsis-regex \"regex\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:238
+#: apt.ent:222
 msgid ""
 "<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
 "d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:241
+#: apt.ent:225
 msgid ""
 "<!-- TRANSLATOR: used as in apt-extracttemplates -t=temporary_directory e.g. "
 "apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "
@@ -591,2091 +436,77 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:244
+#: apt.ent:228
 msgid ""
 "<!-- TRANSLATOR: used as in apt-extracttemplates filename --> <!ENTITY "
 "synopsis-filename \"filename\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:250
+#: apt.ent:231
 msgid ""
-"<!-- TRANSLATOR: used as parameters for apt-ftparchive e.g. apt-ftparchive "
-"packages path override pathprefix --> <!ENTITY synopsis-path \"path\"> <!"
-"ENTITY synopsis-pathprefix \"pathprefix\"> <!ENTITY synopsis-section "
-"\"section\"> <!ENTITY synopsis-override \"override\">"
+"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+"packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:253
-msgid ""
-"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
-"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
-msgstr ""
-
-#.  The last update date 
-#. type: Content of: <refentry><refentryinfo>
-#: apt-cache.8.xml:16
-msgid ""
-"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>04 "
-"February 2011</date>"
-msgstr ""
-
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-cache.8.xml:25 apt-cache.8.xml:32
-msgid "apt-cache"
-msgstr ""
-
-#. type: Content of: <refentry><refmeta><manvolnum>
-#: apt-cache.8.xml:26 apt-cdrom.8.xml:25 apt-config.8.xml:26 apt-get.8.xml:26
-#: apt-key.8.xml:18 apt-mark.8.xml:26 apt-secure.8.xml:18
-msgid "8"
-msgstr ""
-
-#. type: Content of: <refentry><refmeta><refmiscinfo>
-#: apt-cache.8.xml:27 apt-cdrom.8.xml:26 apt-config.8.xml:27
-#: apt-extracttemplates.1.xml:27 apt-ftparchive.1.xml:27 apt-get.8.xml:27
-#: apt-key.8.xml:19 apt-mark.8.xml:27 apt-secure.8.xml:19
-#: apt-sortpkgs.1.xml:27 apt.conf.5.xml:33 apt_preferences.5.xml:26
-#: sources.list.5.xml:27
-msgid "APT"
-msgstr ""
-
-#. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cache.8.xml:33
-msgid "query the APT cache"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:38 apt-cdrom.8.xml:37 apt-config.8.xml:38
-#: apt-extracttemplates.1.xml:38 apt-ftparchive.1.xml:38 apt-get.8.xml:38
-#: apt-key.8.xml:30 apt-mark.8.xml:38 apt-secure.8.xml:43
-#: apt-sortpkgs.1.xml:38 apt.conf.5.xml:42 apt_preferences.5.xml:36
-#: sources.list.5.xml:36
-#, fuzzy
-msgid "Description"
-msgstr "Descrição"
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:39
-msgid ""
-"<command>apt-cache</command> performs a variety of operations on APT's "
-"package cache. <command>apt-cache</command> does not manipulate the state of "
-"the system but does provide operations to search and generate interesting "
-"output from the package metadata."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:44 apt-get.8.xml:44
-msgid ""
-"Unless the <option>-h</option>, or <option>--help</option> option is given, "
-"one of the commands below must be present."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:48
-msgid "gencaches"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:49
-msgid ""
-"<literal>gencaches</literal> performs the same operation as <command>apt-get "
-"check</command>. It builds the source and package caches from the sources in "
-"&sources-list; and from <filename>/var/lib/dpkg/status</filename>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:55
-msgid "showpkg <replaceable>pkg(s)</replaceable>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:56
-msgid ""
-"<literal>showpkg</literal> displays information about the packages listed on "
-"the command line. Remaining arguments are package names. The available "
-"versions and reverse dependencies of each package listed are listed, as well "
-"as forward dependencies for each version. Forward (normal)  dependencies are "
-"those packages upon which the package in question depends; reverse "
-"dependencies are those packages that depend upon the package in question. "
-"Thus, forward dependencies must be satisfied for a package, but reverse "
-"dependencies need not be.  For instance, <command>apt-cache showpkg "
-"libreadline2</command> would produce output similar to the following:"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-cache.8.xml:68
-#, no-wrap
-msgid ""
-"Package: libreadline2\n"
-"Versions: 2.1-12(/var/state/apt/lists/foo_Packages),\n"
-"Reverse Depends: \n"
-"  libreadlineg2,libreadline2\n"
-"  libreadline2-altdev,libreadline2\n"
-"Dependencies:\n"
-"2.1-12 - libc5 (2 5.4.0-0) ncurses3.0 (0 (null))\n"
-"Provides:\n"
-"2.1-12 - \n"
-"Reverse Provides: \n"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:80
-msgid ""
-"Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and "
-"ncurses3.0 which must be installed for libreadline2 to work.  In turn, "
-"libreadlineg2 and libreadline2-altdev depend on libreadline2. If "
-"libreadline2 is installed, libc5 and ncurses3.0 (and ldso) must also be "
-"installed; libreadlineg2 and libreadline2-altdev do not have to be "
-"installed. For the specific meaning of the remainder of the output it is "
-"best to consult the apt source code."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:89
-msgid "stats"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:89
-msgid ""
-"<literal>stats</literal> displays some statistics about the cache.  No "
-"further arguments are expected. Statistics reported are:"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:92
-msgid ""
-"<literal>Total package names</literal> is the number of package names found "
-"in the cache."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:96
-msgid ""
-"<literal>Normal packages</literal> is the number of regular, ordinary "
-"package names; these are packages that bear a one-to-one correspondence "
-"between their names and the names used by other packages for them in "
-"dependencies. The majority of packages fall into this category."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:102
-msgid ""
-"<literal>Pure virtual packages</literal> is the number of packages that "
-"exist only as a virtual package name; that is, packages only \"provide\" the "
-"virtual package name, and no package actually uses the name. For instance, "
-"\"mail-transport-agent\" in the Debian GNU/Linux system is a pure virtual "
-"package; several packages provide \"mail-transport-agent\", but there is no "
-"package named \"mail-transport-agent\"."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:110
-msgid ""
-"<literal>Single virtual packages</literal> is the number of packages with "
-"only one package providing a particular virtual package. For example, in the "
-"Debian GNU/Linux system, \"X11-text-viewer\" is a virtual package, but only "
-"one package, xless, provides \"X11-text-viewer\"."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:116
-msgid ""
-"<literal>Mixed virtual packages</literal> is the number of packages that "
-"either provide a particular virtual package or have the virtual package name "
-"as the package name. For instance, in the Debian GNU/Linux system, \"debconf"
-"\" is both an actual package, and provided by the debconf-tiny package."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:123
-msgid ""
-"<literal>Missing</literal> is the number of package names that were "
-"referenced in a dependency but were not provided by any package. Missing "
-"packages may be an evidence if a full distribution is not accessed, or if a "
-"package (real or virtual) has been dropped from the distribution. Usually "
-"they are referenced from Conflicts or Breaks statements."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:130
-msgid ""
-"<literal>Total distinct</literal> versions is the number of package versions "
-"found in the cache; this value is therefore at least equal to the number of "
-"total package names. If more than one distribution (both \"stable\" and "
-"\"unstable\", for instance), is being accessed, this value can be "
-"considerably larger than the number of total package names."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:137
-msgid ""
-"<literal>Total dependencies</literal> is the number of dependency "
-"relationships claimed by all of the packages in the cache."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:144
-msgid "showsrc <replaceable>pkg(s)</replaceable>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:145
-msgid ""
-"<literal>showsrc</literal> displays all the source package records that "
-"match the given package names. All versions are shown, as well as all "
-"records that declare the name to be a Binary."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:150 apt-config.8.xml:75
-msgid "dump"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:151
-msgid ""
-"<literal>dump</literal> shows a short listing of every package in the cache. "
-"It is primarily for debugging."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:155
-msgid "dumpavail"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:156
-msgid ""
-"<literal>dumpavail</literal> prints out an available list to stdout. This is "
-"suitable for use with &dpkg; and is used by the &dselect; method."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:160
-msgid "unmet"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:161
-msgid ""
-"<literal>unmet</literal> displays a summary of all unmet dependencies in the "
-"package cache."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:165
-msgid "show <replaceable>pkg(s)</replaceable>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:166
-msgid ""
-"<literal>show</literal> performs a function similar to <command>dpkg --print-"
-"avail</command>; it displays the package records for the named packages."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:171
-msgid "search <replaceable>regex [ regex ... ]</replaceable>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:172
-msgid ""
-"<literal>search</literal> performs a full text search on all available "
-"package lists for the POSIX regex pattern given, see "
-"<citerefentry><refentrytitle><command>regex</command></refentrytitle> "
-"<manvolnum>7</manvolnum></citerefentry>.  It searches the package names and "
-"the descriptions for an occurrence of the regular expression and prints out "
-"the package name and the short description, including virtual package "
-"names.  If <option>--full</option> is given then output identical to "
-"<literal>show</literal> is produced for each matched package, and if "
-"<option>--names-only</option> is given then the long description is not "
-"searched, only the package name is."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:185
-msgid ""
-"Separate arguments can be used to specify multiple search patterns that are "
-"and'ed together."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:189
-msgid "depends <replaceable>pkg(s)</replaceable>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:190
-msgid ""
-"<literal>depends</literal> shows a listing of each dependency a package has "
-"and all the possible other packages that can fulfill that dependency."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:194
-#, fuzzy
-msgid "rdepends <replaceable>pkg(s)</replaceable>"
-msgstr ""
-"<programlisting>\n"
-"apt-get install <replaceable>pacote</replaceable>/testing\n"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:195
-msgid ""
-"<literal>rdepends</literal> shows a listing of each reverse dependency a "
-"package has."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:199
-msgid "pkgnames <replaceable>[ prefix ]</replaceable>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:200
-msgid ""
-"This command prints the name of each package APT knows. The optional "
-"argument is a prefix match to filter the name list. The output is suitable "
-"for use in a shell tab complete function and the output is generated "
-"extremely quickly. This command is best used with the <option>--generate</"
-"option> option."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:205
-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 "
-"the generated list."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:210
-msgid "dotty <replaceable>pkg(s)</replaceable>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:211
-msgid ""
-"<literal>dotty</literal> takes a list of packages on the command line and "
-"generates output suitable for use by dotty from the <ulink url=\"http://www."
-"research.att.com/sw/tools/graphviz/\">GraphViz</ulink> package. The result "
-"will be a set of nodes and edges representing the relationships between the "
-"packages. By default the given packages will trace out all dependent "
-"packages; this can produce a very large graph.  To limit the output to only "
-"the packages listed on the command line, set the <literal>APT::Cache::"
-"GivenOnly</literal> option."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:220
-msgid ""
-"The resulting nodes will have several shapes; normal packages are boxes, "
-"pure provides are triangles, mixed provides are diamonds, missing packages "
-"are hexagons. Orange boxes mean recursion was stopped [leaf packages], blue "
-"lines are pre-depends, green lines are conflicts."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:225
-msgid "Caution, dotty cannot graph larger sets of packages."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:228
-msgid "xvcg <replaceable>pkg(s)</replaceable>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:229
-msgid ""
-"The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
-"\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:233
-msgid "policy <replaceable>[ pkg(s) ]</replaceable>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:234
-msgid ""
-"<literal>policy</literal> is meant to help debug issues relating to the "
-"preferences file. With no arguments it will print out the priorities of each "
-"source. Otherwise it prints out detailed information about the priority "
-"selection of the named package."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:240
-#, fuzzy
-msgid "madison <replaceable>[ pkg(s) ]</replaceable>"
-msgstr ""
-"<programlisting>\n"
-"apt-get install <replaceable>pacote</replaceable>/testing\n"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:241
-msgid ""
-"<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
-"to mimic the output format and a subset of the functionality of the Debian "
-"archive management tool, <literal>madison</literal>.  It displays available "
-"versions of a package in a tabular format.  Unlike the original "
-"<literal>madison</literal>, it can only display information for the "
-"architecture for which APT has retrieved package lists (<literal>APT::"
-"Architecture</literal>)."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:252 apt-config.8.xml:84 apt-extracttemplates.1.xml:51
-#: apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108
-#: apt-sortpkgs.1.xml:48 apt.conf.5.xml:577 apt.conf.5.xml:599
-msgid "options"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:256
-msgid "<option>-p</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:256
-msgid "<option>--pkg-cache</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:257
-msgid ""
-"Select the file to store the package cache. The package cache is the primary "
-"cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
-"pkgcache</literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:262 apt-ftparchive.1.xml:551 apt-get.8.xml:321
-#: apt-sortpkgs.1.xml:52
-msgid "<option>-s</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:262
-msgid "<option>--src-cache</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:263
-msgid ""
-"Select the file to store the source cache. The source is used only by "
-"<literal>gencaches</literal> and it stores a parsed version of the package "
-"information from remote sources. When building the package cache the source "
-"cache is used to avoid reparsing all of the package files.  Configuration "
-"Item: <literal>Dir::Cache::srcpkgcache</literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:270 apt-ftparchive.1.xml:525 apt-get.8.xml:311
-msgid "<option>-q</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:270 apt-ftparchive.1.xml:525 apt-get.8.xml:311
-msgid "<option>--quiet</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:271
-msgid ""
-"Quiet; produces output suitable for logging, omitting progress indicators.  "
-"More q's will produce more quietness up to a maximum of 2. You can also use "
-"<option>-q=#</option> to set the quietness level, overriding the "
-"configuration file.  Configuration Item: <literal>quiet</literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:277
-msgid "<option>-i</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:277
-msgid "<option>--important</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:278
-msgid ""
-"Print only important dependencies; for use with unmet and depends. Causes "
-"only Depends and Pre-Depends relations to be printed.  Configuration Item: "
-"<literal>APT::Cache::Important</literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:283
-msgid "<option>--no-pre-depends</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:284
-msgid "<option>--no-depends</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:285
-msgid "<option>--no-recommends</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:286
-msgid "<option>--no-suggests</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:287
-msgid "<option>--no-conflicts</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288
-msgid "<option>--no-breaks</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:289
-msgid "<option>--no-replaces</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:290
-msgid "<option>--no-enhances</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:291
-msgid ""
-"Per default the <literal>depends</literal> and <literal>rdepends</literal> "
-"print all dependencies. This can be tweaked with these flags which will omit "
-"the specified dependency type.  Configuration Item: <literal>APT::Cache::"
-"Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
-"Cache::ShowRecommends</literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:297 apt-cdrom.8.xml:111 apt-get.8.xml:278
-msgid "<option>-f</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:297
-msgid "<option>--full</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:298
-msgid ""
-"Print full package records when searching.  Configuration Item: "
-"<literal>APT::Cache::ShowFull</literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:302 apt-cdrom.8.xml:121 apt-ftparchive.1.xml:563
-#: apt-get.8.xml:369
-msgid "<option>-a</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:302
-msgid "<option>--all-versions</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:303
-msgid ""
-"Print full records for all available versions. This is the default; to turn "
-"it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
-"versions</option> is specified, only the candidate version will displayed "
-"(the one which would be selected for installation).  This option is only "
-"applicable to the <literal>show</literal> command.  Configuration Item: "
-"<literal>APT::Cache::AllVersions</literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:311
-msgid "<option>-g</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:311
-msgid "<option>--generate</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:312
-msgid ""
-"Perform automatic package cache regeneration, rather than use the cache as "
-"it is. This is the default; to turn it off, use <option>--no-generate</"
-"option>.  Configuration Item: <literal>APT::Cache::Generate</literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:317
-msgid "<option>--names-only</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:317 apt-cdrom.8.xml:129
-msgid "<option>-n</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:318
-msgid ""
-"Only search on the package names, not the long descriptions.  Configuration "
-"Item: <literal>APT::Cache::NamesOnly</literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:322
-msgid "<option>--all-names</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:323
-msgid ""
-"Make <literal>pkgnames</literal> print all names, including virtual packages "
-"and missing dependencies.  Configuration Item: <literal>APT::Cache::"
-"AllNames</literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328
-msgid "<option>--recurse</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:329
-msgid ""
-"Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
-"that all packages mentioned are printed once.  Configuration Item: "
-"<literal>APT::Cache::RecurseDepends</literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:334
-msgid "<option>--installed</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:336
-msgid ""
-"Limit the output of <literal>depends</literal> and <literal>rdepends</"
-"literal> to packages which are currently installed.  Configuration Item: "
-"<literal>APT::Cache::Installed</literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:341 apt-cdrom.8.xml:140 apt-config.8.xml:89
-#: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:513
-#: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
-msgid "&apt-commonoptions;"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:346 apt-get.8.xml:518 apt-key.8.xml:167 apt-mark.8.xml:126
-#: apt.conf.5.xml:1110 apt_preferences.5.xml:697
-msgid "Files"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:348
-msgid "&file-sourceslist; &file-statelists;"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:353 apt-cdrom.8.xml:145 apt-config.8.xml:94
-#: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:528
-#: apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185
-#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1116 apt_preferences.5.xml:704
-#: sources.list.5.xml:255
-#, fuzzy
-msgid "See Also"
-msgstr "Consulte também"
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:354
-msgid "&apt-conf;, &sources-list;, &apt-get;"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:358 apt-cdrom.8.xml:150 apt-config.8.xml:99
-#: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:534
-#: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
-msgid "Diagnostics"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:359
+#: apt.ent:234
 msgid ""
-"<command>apt-cache</command> returns zero on normal operation, decimal 100 "
-"on error."
+"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+"packages path override-file pathprefix --> <!ENTITY synopsis-override "
+"\"override-file\">"
 msgstr ""
 
-#. type: Content of: <refentry><refentryinfo>
-#: apt-cdrom.8.xml:16
-msgid ""
-"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>14 "
-"February 2004</date>"
-msgstr ""
-
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-cdrom.8.xml:24 apt-cdrom.8.xml:31
-msgid "apt-cdrom"
-msgstr ""
-
-#. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cdrom.8.xml:32
-msgid "APT CDROM management utility"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:38
-msgid ""
-"<command>apt-cdrom</command> is used to add a new CDROM to APTs list of "
-"available sources. <command>apt-cdrom</command> takes care of determining "
-"the structure of the disc as well as correcting for several possible mis-"
-"burns and verifying the index files."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:45
-msgid ""
-"It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
-"system, it cannot be done by hand. Furthermore each disk in a multi-cd set "
-"must be inserted and scanned separately to account for possible mis-burns."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:55
-msgid "add"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:56
-msgid ""
-"<literal>add</literal> is used to add a new disc to the source list. It will "
-"unmount the CDROM device, prompt for a disk to be inserted and then proceed "
-"to scan it and copy the index files. If the disc does not have a proper "
-"<filename>disk</filename> directory you will be prompted for a descriptive "
-"title."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:64
-msgid ""
-"APT uses a CDROM ID to track which disc is currently in the drive and "
-"maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
-"filename>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:71
-msgid "ident"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:72
-msgid ""
-"A debugging tool to report the identity of the current disc as well as the "
-"stored file name"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:51
-msgid ""
-"Unless the <option>-h</option>, or <option>--help</option> option is given "
-"one of the commands below must be present.  <placeholder type=\"variablelist"
-"\" id=\"0\"/>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:81 apt-key.8.xml:153
-msgid "Options"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:85 apt-ftparchive.1.xml:519 apt-get.8.xml:273
-msgid "<option>-d</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:85
-msgid "<option>--cdrom</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:86
-msgid ""
-"Mount point; specify the location to mount the cdrom. This mount point must "
-"be listed in <filename>/etc/fstab</filename> and properly configured.  "
-"Configuration Item: <literal>Acquire::cdrom::mount</literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:94
-msgid "<option>-r</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:94
-msgid "<option>--rename</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:95
-msgid ""
-"Rename a disc; change the label of a disk or override the disks given label. "
-"This option will cause <command>apt-cdrom</command> to prompt for a new "
-"label.  Configuration Item: <literal>APT::CDROM::Rename</literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:103 apt-get.8.xml:292
-msgid "<option>-m</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:103
-msgid "<option>--no-mount</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:104
-msgid ""
-"No mounting; prevent <command>apt-cdrom</command> from mounting and "
-"unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
-"NoMount</literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:111
-msgid "<option>--fast</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:112
-msgid ""
-"Fast Copy; Assume the package files are valid and do not check every "
-"package. This option should be used only if <command>apt-cdrom</command> has "
-"been run on this disc before and did not detect any errors.  Configuration "
-"Item: <literal>APT::CDROM::Fast</literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:121
-msgid "<option>--thorough</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:122
-msgid ""
-"Thorough Package Scan; This option may be needed with some old Debian "
-"1.1/1.2 discs that have Package files in strange places. It takes much "
-"longer to scan the CD but will pick them all up."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:130 apt-get.8.xml:323
-msgid "<option>--just-print</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:131 apt-get.8.xml:325
-msgid "<option>--recon</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:132 apt-get.8.xml:326
-msgid "<option>--no-act</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:133
-msgid ""
-"No Changes; Do not change the &sources-list; file and do not write index "
-"files. Everything is still checked however.  Configuration Item: "
-"<literal>APT::CDROM::NoAct</literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:146
-#, fuzzy
-msgid "&apt-conf;, &apt-get;, &sources-list;"
-msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:151
-msgid ""
-"<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
-"on error."
-msgstr ""
-
-#.  The last update date 
-#. type: Content of: <refentry><refentryinfo>
-#: apt-config.8.xml:16 apt-extracttemplates.1.xml:16 apt-sortpkgs.1.xml:16
-#: sources.list.5.xml:16
-msgid ""
-"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>29 "
-"February 2004</date>"
-msgstr ""
-
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-config.8.xml:25 apt-config.8.xml:32
-msgid "apt-config"
-msgstr ""
-
-#. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-config.8.xml:33
-msgid "APT Configuration Query program"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:39
-msgid ""
-"<command>apt-config</command> is an internal program used by various "
-"portions of the APT suite to provide consistent configurability. It accesses "
-"the main configuration file <filename>/etc/apt/apt.conf</filename> in a "
-"manner that is easy to use by scripted applications."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:44 apt-ftparchive.1.xml:54
-msgid ""
-"Unless the <option>-h</option>, or <option>--help</option> option is given "
-"one of the commands below must be present."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-config.8.xml:49
-msgid "shell"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:51
-msgid ""
-"shell is used to access the configuration information from a shell script. "
-"It is given pairs of arguments, the first being a shell variable and the "
-"second the configuration value to query. As output it lists a series of "
-"shell assignments commands for each present value.  In a shell script it "
-"should be used like:"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-config.8.xml:59
-#, no-wrap
-msgid ""
-"OPTS=\"-f\"\n"
-"RES=`apt-config shell OPTS MyApp::options`\n"
-"eval $RES\n"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:64
+#. type: Plain text
+#: apt.ent:237
 msgid ""
-"This will set the shell environment variable $OPTS to the value of MyApp::"
-"options with a default of <option>-f</option>."
+"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+"packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix "
+"\"pathprefix\">"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:68
+#. type: Plain text
+#: apt.ent:240
 msgid ""
-"The configuration item may be postfixed with a /[fdbi]. f returns file "
-"names, d returns directories, b returns true or false and i returns an "
-"integer. Each of the returns is normalized and verified internally."
+"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+"generate section --> <!ENTITY synopsis-section \"section\">"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:77
-msgid "Just show the contents of the configuration space."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:95 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608
-#: apt-sortpkgs.1.xml:64
-#, fuzzy
-msgid "&apt-conf;"
-msgstr ""
-"&apt-docinfo;\n"
-"\n"
-" "
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:100
+#. type: Plain text
+#: apt.ent:243
 msgid ""
-"<command>apt-config</command> returns zero on normal operation, decimal 100 "
-"on error."
-msgstr ""
-
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-extracttemplates.1.xml:25 apt-extracttemplates.1.xml:32
-msgid "apt-extracttemplates"
+"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
 msgstr ""
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt-extracttemplates.1.xml:26 apt-ftparchive.1.xml:26 apt-sortpkgs.1.xml:26
-msgid "1"
-msgstr ""
-
-#. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-extracttemplates.1.xml:33
-msgid "Utility to extract DebConf config and templates from Debian packages"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:39
-msgid ""
-"<command>apt-extracttemplates</command> will take one or more Debian package "
-"files as input and write out (to a temporary directory) all associated "
-"config scripts and template files. For each passed in package that contains "
-"config scripts and templates, one line of output will be generated in the "
-"format:"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:44
-msgid "package version template-file config-script"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:45
-msgid ""
-"template-file and config-script are written to the temporary directory "
-"specified by the -t or --tempdir (<literal>APT::ExtractTemplates::TempDir</"
-"literal>)  directory, with filenames of the form <filename>package.template."
-"XXXX</filename> and <filename>package.config.XXXX</filename>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:55 apt-get.8.xml:447
-msgid "<option>-t</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:55
-msgid "<option>--tempdir</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-extracttemplates.1.xml:57
-msgid ""
-"Temporary directory in which to write extracted debconf template files and "
-"config scripts.  Configuration Item: <literal>APT::ExtractTemplates::"
-"TempDir</literal>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:74
-msgid ""
-"<command>apt-extracttemplates</command> returns zero on normal operation, "
-"decimal 100 on error."
-msgstr ""
-
-#.  The last update date 
-#. type: Content of: <refentry><refentryinfo>
-#: apt-ftparchive.1.xml:16
-msgid ""
-"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 "
-"August 2009</date>"
+#: apt-get.8.xml:26 apt-cache.8.xml:26 apt-key.8.xml:25 apt-mark.8.xml:26
+#: apt-secure.8.xml:25 apt-cdrom.8.xml:25 apt-config.8.xml:26
+msgid "8"
 msgstr ""
 
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-ftparchive.1.xml:25 apt-ftparchive.1.xml:32
-msgid "apt-ftparchive"
+#. type: Content of: <refentry><refmeta><refmiscinfo>
+#: apt-get.8.xml:27 apt-cache.8.xml:27 apt-key.8.xml:26 apt-mark.8.xml:27
+#: apt-secure.8.xml:26 apt-cdrom.8.xml:26 apt-config.8.xml:27
+#: apt.conf.5.xml:32 apt_preferences.5.xml:26 sources.list.5.xml:27
+#: apt-extracttemplates.1.xml:27 apt-sortpkgs.1.xml:27 apt-ftparchive.1.xml:27
+msgid "APT"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-ftparchive.1.xml:33
-msgid "Utility to generate index files"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:39
-msgid ""
-"<command>apt-ftparchive</command> is the command line tool that generates "
-"the index files that APT uses to access a distribution source. The index "
-"files should be generated on the origin site based on the content of that "
-"site."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:43
-msgid ""
-"<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
-"program, incorporating its entire functionality via the <literal>packages</"
-"literal> command.  It also contains a contents file generator, "
-"<literal>contents</literal>, and an elaborate means to 'script' the "
-"generation process for a complete archive."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:49
-msgid ""
-"Internally <command>apt-ftparchive</command> can make use of binary "
-"databases to cache the contents of a .deb file and it does not rely on any "
-"external programs aside from &gzip;. When doing a full generate it "
-"automatically performs file-change checks and builds the desired compressed "
-"output files."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:58
-msgid "packages"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:60
-msgid ""
-"The packages command generates a package file from a directory tree. It "
-"takes the given directory and recursively searches it for .deb files, "
-"emitting a package record to stdout for each. This command is approximately "
-"equivalent to &dpkg-scanpackages;."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:65 apt-ftparchive.1.xml:89
-msgid ""
-"The option <option>--db</option> can be used to specify a binary caching DB."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:68
-msgid "sources"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:70
-msgid ""
-"The <literal>sources</literal> command generates a source index file from a "
-"directory tree.  It takes the given directory and recursively searches it "
-"for .dsc files, emitting a source record to stdout for each. This command is "
-"approximately equivalent to &dpkg-scansources;."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:75
-msgid ""
-"If an override file is specified then a source override file will be looked "
-"for with an extension of .src. The --source-override option can be used to "
-"change the source override file that will be used."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:80
-msgid "contents"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:82
-msgid ""
-"The <literal>contents</literal> command generates a contents file from a "
-"directory tree. It takes the given directory and recursively searches it "
-"for .deb files, and reads the file list from each file. It then sorts and "
-"writes to stdout the list of files matched to packages. Directories are not "
-"written to the output. If multiple packages own the same file then each "
-"package is separated by a comma in the output."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:92
-msgid "release"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:94
-msgid ""
-"The <literal>release</literal> command generates a Release file from a "
-"directory tree. It recursively searches the given directory for uncompressed "
-"<filename>Packages</filename> and <filename>Sources</filename> files and the "
-"ones compressed with <command>gzip</command>, <command>bzip2</command> or "
-"<command>lzma</command> as well as <filename>Release</filename> and "
-"<filename>md5sum.txt</filename> files by default (<literal>APT::FTPArchive::"
-"Release::Default-Patterns</literal>). Additional filename patterns can be "
-"added by listing them in <literal>APT::FTPArchive::Release::Patterns</"
-"literal>.  It then writes to stdout a Release file containing a MD5, SHA1 "
-"and SHA256 digest for each file."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:104
-msgid ""
-"Values for the additional metadata fields in the Release file are taken from "
-"the corresponding variables under <literal>APT::FTPArchive::Release</"
-"literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>.  The "
-"supported fields are: <literal>Origin</literal>, <literal>Label</literal>, "
-"<literal>Suite</literal>, <literal>Version</literal>, <literal>Codename</"
-"literal>, <literal>Date</literal>, <literal>Valid-Until</literal>, "
-"<literal>Architectures</literal>, <literal>Components</literal>, "
-"<literal>Description</literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:115
-msgid "generate"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:117
-msgid ""
-"The <literal>generate</literal> command is designed to be runnable from a "
-"cron script and builds indexes according to the given config file. The "
-"config language provides a flexible means of specifying which index files "
-"are built from which directories, as well as providing a simple means of "
-"maintaining the required settings."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:124 apt-get.8.xml:215
-msgid "clean"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:126
-msgid ""
-"The <literal>clean</literal> command tidies the databases used by the given "
-"configuration file by removing any records that are no longer necessary."
+#: apt-get.8.xml:33
+msgid "APT package handling utility -- command-line interface"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:132
-msgid "The Generate Configuration"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:134
-msgid ""
-"The <literal>generate</literal> command uses a configuration file to "
-"describe the archives that are going to be generated. It follows the typical "
-"ISC configuration format as seen in ISC tools like bind 8 and dhcpd.  &apt-"
-"conf; contains a description of the syntax. Note that the generate "
-"configuration is parsed in sectional manner, but &apt-conf; is parsed in a "
-"tree manner. This only effects how the scope tag is handled."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:142
-msgid ""
-"The generate configuration has 4 separate sections, each described below."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:144
-#, fuzzy
-msgid "Dir Section"
-msgstr "Descrição"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:146
-msgid ""
-"The <literal>Dir</literal> section defines the standard directories needed "
-"to locate the files required during the generation process. These "
-"directories are prepended certain relative paths defined in later sections "
-"to produce a complete an absolute path."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:151
-msgid "ArchiveDir"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:153
-msgid ""
-"Specifies the root of the FTP archive, in a standard Debian configuration "
-"this is the directory that contains the <filename>ls-LR</filename> and dist "
-"nodes."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:158
-msgid "OverrideDir"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:160
-msgid "Specifies the location of the override files."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:163
-msgid "CacheDir"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:165
-msgid "Specifies the location of the cache files"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:168
-msgid "FileListDir"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:170
-msgid ""
-"Specifies the location of the file list files, if the <literal>FileList</"
-"literal> setting is used below."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:176
-msgid "Default Section"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:178
-msgid ""
-"The <literal>Default</literal> section specifies default values, and "
-"settings that control the operation of the generator. Other sections may "
-"override these defaults with a per-section setting."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:182
-msgid "Packages::Compress"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:184
-msgid ""
-"Sets the default compression schemes to use for the Package index files. It "
-"is a string that contains a space separated list of at least one of: '.' (no "
-"compression), 'gzip' and 'bzip2'. The default for all compression schemes is "
-"'. gzip'."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:190
-msgid "Packages::Extensions"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:192
-msgid ""
-"Sets the default list of file extensions that are package files.  This "
-"defaults to '.deb'."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:196
-msgid "Sources::Compress"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:198
-msgid ""
-"This is similar to <literal>Packages::Compress</literal> except that it "
-"controls the compression for the Sources files."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:202
-msgid "Sources::Extensions"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:204
-msgid ""
-"Sets the default list of file extensions that are source files.  This "
-"defaults to '.dsc'."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:208
-msgid "Contents::Compress"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:210
-msgid ""
-"This is similar to <literal>Packages::Compress</literal> except that it "
-"controls the compression for the Contents files."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:214
-msgid "Translation::Compress"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:216
-msgid ""
-"This is similar to <literal>Packages::Compress</literal> except that it "
-"controls the compression for the Translation-en master file."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:220
-msgid "DeLinkLimit"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:222
-msgid ""
-"Specifies the number of kilobytes to delink (and replace with hard links) "
-"per run. This is used in conjunction with the per-section <literal>External-"
-"Links</literal> setting."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:227
-msgid "FileMode"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:229
-msgid ""
-"Specifies the mode of all created index files. It defaults to 0644. All "
-"index files are set to this mode with no regard to the umask."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:234 apt-ftparchive.1.xml:380
+#: apt-get.8.xml:38 apt-cache.8.xml:38 apt-key.8.xml:37 apt-mark.8.xml:38
+#: apt-secure.8.xml:50 apt-cdrom.8.xml:37 apt-config.8.xml:38
+#: apt.conf.5.xml:41 apt_preferences.5.xml:36 sources.list.5.xml:36
+#: apt-extracttemplates.1.xml:38 apt-sortpkgs.1.xml:38 apt-ftparchive.1.xml:38
 #, fuzzy
-msgid "LongDescription"
-msgstr "Descrição"
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:236 apt-ftparchive.1.xml:382
-msgid ""
-"Sets if long descriptions should be included in the Packages file or split "
-"out into a master Translation-en file."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:242
-msgid "TreeDefault Section"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:244
-msgid ""
-"Sets defaults specific to <literal>Tree</literal> sections. All of these "
-"variables are substitution variables and have the strings $(DIST), "
-"$(SECTION) and $(ARCH) replaced with their respective values."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:249
-msgid "MaxContentsChange"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:251
-msgid ""
-"Sets the number of kilobytes of contents files that are generated each day. "
-"The contents files are round-robined so that over several days they will all "
-"be rebuilt."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:256
-msgid "ContentsAge"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:258
-msgid ""
-"Controls the number of days a contents file is allowed to be checked without "
-"changing. If this limit is passed the mtime of the contents file is updated. "
-"This case can occur if the package file is changed in such a way that does "
-"not result in a new contents file [override edit for instance]. A hold off "
-"is allowed in hopes that new .debs will be installed, requiring a new file "
-"anyhow. The default is 10, the units are in days."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:267
-msgid "Directory"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:269
-msgid ""
-"Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
-"$(SECTION)/binary-$(ARCH)/</filename>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:273
-msgid "SrcDirectory"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:275
-msgid ""
-"Sets the top of the source package directory tree. Defaults to <filename>"
-"$(DIST)/$(SECTION)/source/</filename>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:279 apt-ftparchive.1.xml:418
-msgid "Packages"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:281
-msgid ""
-"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
-"binary-$(ARCH)/Packages</filename>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:285 apt-ftparchive.1.xml:423
-msgid "Sources"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:287
-msgid ""
-"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
-"source/Sources</filename>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:291
-#, fuzzy
-msgid "Translation"
-msgstr "Descrição"
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:293
-msgid ""
-"Set the output Translation-en master file with the long descriptions if they "
-"should be not included in the Packages file. Defaults to <filename>$(DIST)/"
-"$(SECTION)/i18n/Translation-en</filename>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:298
-msgid "InternalPrefix"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:300
-msgid ""
-"Sets the path prefix that causes a symlink to be considered an internal link "
-"instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
-"filename>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:305 apt-ftparchive.1.xml:429
-msgid "Contents"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:307
-msgid ""
-"Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
-"</filename>. If this setting causes multiple Packages files to map onto a "
-"single Contents file (such as the default)  then <command>apt-ftparchive</"
-"command> will integrate those package files together automatically."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:314
-msgid "Contents::Header"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:316
-msgid "Sets header file to prepend to the contents output."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:319 apt-ftparchive.1.xml:454
-msgid "BinCacheDB"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:321
-msgid ""
-"Sets the binary cache database to use for this section. Multiple sections "
-"can share the same database."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:325
-msgid "FileList"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:327
-msgid ""
-"Specifies that instead of walking the directory tree, <command>apt-"
-"ftparchive</command> should read the list of files from the given file. "
-"Relative files names are prefixed with the archive directory."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:332
-msgid "SourceFileList"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:334
-msgid ""
-"Specifies that instead of walking the directory tree, <command>apt-"
-"ftparchive</command> should read the list of files from the given file. "
-"Relative files names are prefixed with the archive directory.  This is used "
-"when processing source indexes."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:342
-msgid "Tree Section"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:344
-msgid ""
-"The <literal>Tree</literal> section defines a standard Debian file tree "
-"which consists of a base directory, then multiple sections in that base "
-"directory and finally multiple Architectures in each section. The exact "
-"pathing used is defined by the <literal>Directory</literal> substitution "
-"variable."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:349
-msgid ""
-"The <literal>Tree</literal> section takes a scope tag which sets the "
-"<literal>$(DIST)</literal> variable and defines the root of the tree (the "
-"path is prefixed by <literal>ArchiveDir</literal>).  Typically this is a "
-"setting such as <filename>dists/&stable-codename;</filename>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:354
-msgid ""
-"All of the settings defined in the <literal>TreeDefault</literal> section "
-"can be use in a <literal>Tree</literal> section as well as three new "
-"variables."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:360
-#, 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:357
-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>
-#: apt-ftparchive.1.xml:366
-#, fuzzy
-msgid "Sections"
+msgid "Description"
 msgstr "Descrição"
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:368
-msgid ""
-"This is a space separated list of sections which appear under the "
-"distribution, typically this is something like <literal>main contrib non-"
-"free</literal>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:373 apt.conf.5.xml:157
-msgid "Architectures"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:375
-msgid ""
-"This is a space separated list of all the architectures that appear under "
-"search section. The special architecture 'source' is used to indicate that "
-"this tree has a source archive."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:434
-msgid "BinOverride"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:388
-msgid ""
-"Sets the binary override file. The override file contains section, priority "
-"and maintainer address information."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:439
-msgid "SrcOverride"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:394
-msgid ""
-"Sets the source override file. The override file contains section "
-"information."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:398 apt-ftparchive.1.xml:444
-msgid "ExtraOverride"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:446
-msgid "Sets the binary extra override file."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:403 apt-ftparchive.1.xml:449
-msgid "SrcExtraOverride"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:405 apt-ftparchive.1.xml:451
-msgid "Sets the source extra override file."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:410
-msgid "BinDirectory Section"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:412
-msgid ""
-"The <literal>bindirectory</literal> section defines a binary directory tree "
-"with no special structure. The scope tag specifies the location of the "
-"binary directory and the settings are similar to the <literal>Tree</literal> "
-"section with no substitution variables or <literal>Section</"
-"literal><literal>Architecture</literal> settings."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:420
-msgid "Sets the Packages file output."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:425
-msgid ""
-"Sets the Sources file output. At least one of <literal>Packages</literal> or "
-"<literal>Sources</literal> is required."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:431
-msgid "Sets the Contents file output. (optional)"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:436
-msgid "Sets the binary override file."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:441
-msgid "Sets the source override file."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:456
-msgid "Sets the cache DB."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:459
-msgid "PathPrefix"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:461
-msgid "Appends a path to all the output paths."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:464
-msgid "FileList, SourceFileList"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:466
-msgid "Specifies the file list file."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:473
-msgid "The Binary Override File"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:474
-msgid ""
-"The binary override file is fully compatible with &dpkg-scanpackages;. It "
-"contains 4 fields separated by spaces. The first field is the package name, "
-"the second is the priority to force that package to, the third is the the "
-"section to force that package to and the final field is the maintainer "
-"permutation field."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:480
-#, no-wrap
-msgid "old [// oldn]* => new"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:482
-#, no-wrap
-msgid "new"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:479
-msgid ""
-"The general form of the maintainer field is: <placeholder type="
-"\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
-"id=\"1\"/> The first form allows a double-slash separated list of old email "
-"addresses to be specified. If any of those are found then new is substituted "
-"for the maintainer field. The second form unconditionally substitutes the "
-"maintainer field."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:490
-msgid "The Source Override File"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:492
-msgid ""
-"The source override file is fully compatible with &dpkg-scansources;. It "
-"contains 2 fields separated by spaces. The first fields is the source "
-"package name, the second is the section to assign it."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:497
-msgid "The Extra Override File"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:499
-msgid ""
-"The extra override file allows any arbitrary tag to be added or replaced in "
-"the output. It has 3 columns, the first is the package, the second is the "
-"tag and the remainder of the line is the new value."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:508
-msgid ""
-"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:510
-msgid ""
-"Generate the given checksum. These options default to on, when turned off "
-"the generated index files will not have the checksum fields where possible.  "
-"Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</"
-"replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</"
-"replaceable>::<replaceable>Checksum</replaceable></literal> where "
-"<literal><replaceable>Index</replaceable></literal> can be "
-"<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</"
-"literal> and <literal><replaceable>Checksum</replaceable></literal> can be "
-"<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:519
-msgid "<option>--db</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:521
-msgid ""
-"Use a binary caching DB. This has no effect on the generate command.  "
-"Configuration Item: <literal>APT::FTPArchive::DB</literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:527
-msgid ""
-"Quiet; produces output suitable for logging, omitting progress indicators.  "
-"More q's will produce more quiet up to a maximum of 2. You can also use "
-"<option>-q=#</option> to set the quiet level, overriding the configuration "
-"file.  Configuration Item: <literal>quiet</literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:533
-msgid "<option>--delink</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:535
-msgid ""
-"Perform Delinking. If the <literal>External-Links</literal> setting is used "
-"then this option actually enables delinking of the files. It defaults to on "
-"and can be turned off with <option>--no-delink</option>.  Configuration "
-"Item: <literal>APT::FTPArchive::DeLinkAct</literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:541
-msgid "<option>--contents</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:543
-msgid ""
-"Perform contents generation. When this option is set and package indexes are "
-"being generated with a cache DB then the file listing will also be extracted "
-"and stored in the DB for later use. When using the generate command this "
-"option also allows the creation of any Contents files. The default is on.  "
-"Configuration Item: <literal>APT::FTPArchive::Contents</literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:551
-msgid "<option>--source-override</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:553
-msgid ""
-"Select the source override file to use with the <literal>sources</literal> "
-"command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
-"literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:557
-msgid "<option>--readonly</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:559
-msgid ""
-"Make the caching databases read only.  Configuration Item: <literal>APT::"
-"FTPArchive::ReadOnlyDB</literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:563
-msgid "<option>--arch</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:564
-msgid ""
-"Accept in the <literal>packages</literal> and <literal>contents</literal> "
-"commands only package files matching <literal>*_arch.deb</literal> or "
-"<literal>*_all.deb</literal> instead of all package files in the given "
-"path.  Configuration Item: <literal>APT::FTPArchive::Architecture</literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:570
-msgid "<option>APT::FTPArchive::AlwaysStat</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:572
-msgid ""
-"&apt-ftparchive; caches as much as possible of metadata in a 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:582
-msgid "<option>APT::FTPArchive::LongDescription</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:584
-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 the <filename>Translation-en</filename> master file can only be created "
-"in the generate command."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1104 apt_preferences.5.xml:544
-#: sources.list.5.xml:214
-#, fuzzy
-msgid "Examples"
-msgstr "Exemplos"
-
-#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:602
-#, 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:598
-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:612
-msgid ""
-"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
-"100 on error."
-msgstr ""
-
-#.  The last update date 
-#. type: Content of: <refentry><refentryinfo>
-#: apt-get.8.xml:16
-msgid ""
-"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>08 "
-"November 2008</date>"
-msgstr ""
-
-#. type: <heading></heading>
-#: apt-get.8.xml:25 apt-get.8.xml:32 guide.sgml:96
-msgid "apt-get"
-msgstr ""
-
-#. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-get.8.xml:33
-msgid "APT package handling utility -- command-line interface"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para>
 #: apt-get.8.xml:39
 msgid ""
@@ -2685,9 +516,12 @@ msgid ""
 "&aptitude;, &synaptic; and &wajig;."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:48 apt-key.8.xml:119
-msgid "update"
+#. type: Content of: <refentry><refsect1><para>
+#: apt-get.8.xml:44 apt-cache.8.xml:44 apt-cdrom.8.xml:51 apt-config.8.xml:44
+#: apt-ftparchive.1.xml:54
+msgid ""
+"Unless the <option>-h</option>, or <option>--help</option> option is given, "
+"one of the commands below must be present."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2704,11 +538,6 @@ msgid ""
 "as the size of the package files cannot be known in advance."
 msgstr ""
 
-#. type: <tag></tag>
-#: apt-get.8.xml:60 guide.sgml:121
-msgid "upgrade"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:61
 msgid ""
@@ -2724,13 +553,23 @@ msgid ""
 "command> knows that new versions of packages are available."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:73
-msgid "dselect-upgrade"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:74
+msgid ""
+"<literal>dist-upgrade</literal> in addition to performing the function of "
+"<literal>upgrade</literal>, also intelligently handles changing dependencies "
+"with new versions of packages; <command>apt-get</command> has a \"smart\" "
+"conflict resolution system, and it will attempt to upgrade the most "
+"important packages at the expense of less important ones if necessary.  The "
+"<literal>dist-upgrade</literal> command may therefore remove some packages.  "
+"The <filename>/etc/apt/sources.list</filename> file contains a list of "
+"locations from which to retrieve desired package files.  See also &apt-"
+"preferences; for a mechanism for overriding the general settings for "
+"individual packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:74
+#: apt-get.8.xml:87
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
@@ -2740,44 +579,21 @@ msgid ""
 "new packages)."
 msgstr ""
 
-#. type: <tag></tag>
-#: apt-get.8.xml:83 guide.sgml:140
-msgid "dist-upgrade"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:84
-msgid ""
-"<literal>dist-upgrade</literal> in addition to performing the function of "
-"<literal>upgrade</literal>, also intelligently handles changing dependencies "
-"with new versions of packages; <command>apt-get</command> has a \"smart\" "
-"conflict resolution system, and it will attempt to upgrade the most "
-"important packages at the expense of less important ones if necessary.  So, "
-"<literal>dist-upgrade</literal> command may remove some packages.  The "
-"<filename>/etc/apt/sources.list</filename> file contains a list of locations "
-"from which to retrieve desired package files.  See also &apt-preferences; "
-"for a mechanism for overriding the general settings for individual packages."
-msgstr ""
-
-#. type: <tag></tag>
-#: apt-get.8.xml:96 guide.sgml:131
-msgid "install"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:98
 msgid ""
 "<literal>install</literal> is followed by one or more packages desired for "
 "installation or upgrading.  Each package is a package name, not a fully "
-"qualified filename (for instance, in a Debian GNU/Linux system, libc6 would "
-"be the argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All "
-"packages required by the package(s) specified for installation will also be "
-"retrieved and installed.  The <filename>/etc/apt/sources.list</filename> "
-"file is used to locate the desired packages. If a hyphen is appended to the "
-"package name (with no intervening space), the identified package will be "
-"removed if it is installed.  Similarly a plus sign can be used to designate "
-"a package to install. These latter features may be used to override "
-"decisions made by apt-get's conflict resolution system."
+"qualified filename (for instance, in a Debian system, <package>apt-utils</"
+"package> would be the argument provided, not <filename>apt-utils_&apt-"
+"product-version;_amd64.deb</filename>). All packages required by the package"
+"(s) specified for installation will also be retrieved and installed.  The "
+"<filename>/etc/apt/sources.list</filename> file is used to locate the "
+"desired packages. If a hyphen is appended to the package name (with no "
+"intervening space), the identified package will be removed if it is "
+"installed.  Similarly a plus sign can be used to designate a package to "
+"install. These latter features may be used to override decisions made by apt-"
+"get's conflict resolution system."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2829,26 +645,16 @@ msgid ""
 "expression."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:150
-msgid "remove"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:151
 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
-"that packages are removed instead of installed. Note the removing a package "
-"leaves its configuration files in system. If a plus sign is appended to the "
-"package name (with no intervening space), the identified package will be "
+"that packages are removed instead of installed. Note that removing a package "
+"leaves its configuration files on the system. If a plus sign is appended to "
+"the package name (with no intervening space), the identified package will be "
 "installed instead of removed."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:158
-msgid "purge"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:159
 msgid ""
@@ -2857,11 +663,6 @@ msgid ""
 "too)."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:163
-msgid "source"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:164
 msgid ""
@@ -2878,14 +679,14 @@ msgstr ""
 #: apt-get.8.xml:172
 msgid ""
 "Source packages are tracked separately from binary packages via <literal>deb-"
-"src</literal> type lines in the &sources-list; file. This means that you "
-"will need to add such a line for each repository you want to get sources "
-"from. If you don't do this you will properly get another (newer, older or "
-"none) source version than the one you have installed or could install."
+"src</literal> lines in the &sources-list; file. This means that you will "
+"need to add such a line for each repository you want to get sources from; "
+"otherwise you will probably get either the wrong (too old/too new) source "
+"versions or none at all."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:179
+#: apt-get.8.xml:178
 msgid ""
 "If the <option>--compile</option> option is specified then the package will "
 "be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
@@ -2895,7 +696,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:186
+#: apt-get.8.xml:185
 msgid ""
 "A specific source version can be retrieved by postfixing the source name "
 "with an equals and then the version to fetch, similar to the mechanism used "
@@ -2905,20 +706,15 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:192
+#: apt-get.8.xml:191
 msgid ""
-"Note that source packages are not tracked like binary packages, they exist "
-"only in the current directory and are similar to downloading source tar "
-"balls."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:197
-msgid "build-dep"
+"Note that source packages are not installed and tracked in the "
+"<command>dpkg</command> database like binary packages; they are simply "
+"downloaded to the current directory, like source tarballs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:198
+#: apt-get.8.xml:197
 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
 "attempt to satisfy the build dependencies for a source package. By default "
@@ -2927,32 +723,22 @@ msgid ""
 "option> option instead."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:204
-msgid "check"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:205
+#: apt-get.8.xml:204
 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:209
-msgid "download"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:210
+#: apt-get.8.xml:209
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
 "current directory."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:216
+#: apt-get.8.xml:215
 msgid ""
 "<literal>clean</literal> clears out the local repository of retrieved "
 "package files. It removes everything but the lock file from "
@@ -2963,13 +749,8 @@ msgid ""
 "disk space."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:225
-msgid "autoclean"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:226
+#: apt-get.8.xml:225
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "
@@ -2980,80 +761,58 @@ msgid ""
 "is set to off."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:235
-msgid "autoremove"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:236
+#: apt-get.8.xml:235
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for other packages and are "
 "now no longer needed."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:240
-msgid "changelog"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:241
+#: apt-get.8.xml:240
 msgid ""
 "<literal>changelog</literal> downloads a package changelog and displays it "
 "through <command>sensible-pager</command>. The server name and base "
 "directory is defined in the <literal>APT::Changelogs::Server</literal> "
-"variable (e. g. <ulink>http://packages.debian.org/changelogs</ulink> for "
-"Debian or <ulink>http://changelogs.ubuntu.com/changelogs</ulink> for "
+"variable (e.g. <ulink url=\"http://packages.debian.org/changelogs\">packages."
+"debian.org/changelogs</ulink> for Debian or <ulink url=\"http://changelogs."
+"ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> for "
 "Ubuntu).  By default it displays the changelog for the version that is "
 "installed.  However, you can specify the same options as for the "
 "<option>install</option> command."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:263
-msgid "<option>--no-install-recommends</option>"
+#. type: Content of: <refentry><refsect1><title>
+#: apt-get.8.xml:258 apt-cache.8.xml:248 apt-mark.8.xml:108
+#: apt-config.8.xml:84 apt-extracttemplates.1.xml:52 apt-sortpkgs.1.xml:48
+#: apt-ftparchive.1.xml:504
+msgid "options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:264
+#: apt-get.8.xml:263
 msgid ""
 "Do not consider recommended packages as a dependency for installing.  "
 "Configuration Item: <literal>APT::Install-Recommends</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:268
-msgid "<option>--install-suggests</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:269
+#: apt-get.8.xml:268
 msgid ""
 "Consider suggested packages as a dependency for installing.  Configuration "
 "Item: <literal>APT::Install-Suggests</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:273
-msgid "<option>--download-only</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:274
+#: apt-get.8.xml:273
 msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:278
-msgid "<option>--fix-broken</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:279
+#: apt-get.8.xml:278
 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 "
@@ -3068,20 +827,10 @@ msgid ""
 "<literal>APT::Get::Fix-Broken</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:292
-msgid "<option>--ignore-missing</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:293
-msgid "<option>--fix-missing</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:294
+#: apt-get.8.xml:293
 msgid ""
-"Ignore missing packages; If packages cannot be retrieved or fail the "
+"Ignore missing packages; if packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
 "packages and handle the result. Use of this option together with <option>-f</"
 "option> may produce an error in some situations. If a package is selected "
@@ -3090,13 +839,8 @@ msgid ""
 "Configuration Item: <literal>APT::Get::Fix-Missing</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:304
-msgid "<option>--no-download</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:305
+#: apt-get.8.xml:304
 msgid ""
 "Disables downloading of packages. This is best used with <option>--ignore-"
 "missing</option> to force APT to use only the .debs it has already "
@@ -3104,29 +848,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:312
+#: apt-get.8.xml:311
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
 "<option>-q=#</option> to set the quiet level, overriding the configuration "
-"file.  Note that quiet level 2 implies <option>-y</option>, you should never "
+"file.  Note that quiet level 2 implies <option>-y</option>; you should never "
 "use -qq without a no-action modifier such as -d, --print-uris or -s as APT "
-"may decided to do something you did not expect.  Configuration Item: "
+"may decide to do something you did not expect.  Configuration Item: "
 "<literal>quiet</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:322
-msgid "<option>--simulate</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:324
-msgid "<option>--dry-run</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:327
+#: apt-get.8.xml:326
 msgid ""
 "No action; perform a simulation of events that would occur but do not "
 "actually change the system.  Configuration Item: <literal>APT::Get::"
@@ -3134,38 +868,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:331
+#: apt-get.8.xml:330
 msgid ""
-"Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
-"literal>)  automatic. Also a notice will be displayed indicating that this "
-"is only a simulation, if the option <literal>APT::Get::Show-User-Simulation-"
-"Note</literal> is set (Default: true).  Neither NoLocking nor the notice "
-"will be triggered if run as root (root should know what he is doing without "
-"further warnings by <literal>apt-get</literal>)."
+"Simulated runs performed as a user will automatically deactivate locking "
+"(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::Get::"
+"Show-User-Simulation-Note</literal> is set (as it is by default) a notice "
+"will also be displayed indicating that this is only a simulation. Runs "
+"performed as root do not trigger either NoLocking or the notice - superusers "
+"should know what they are doing without further warnings from <literal>apt-"
+"get</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:337
+#: apt-get.8.xml:338
 msgid ""
-"Simulate prints out a series of lines each one representing a dpkg "
-"operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
-"indicate broken packages and empty set of square brackets meaning breaks "
-"that are of no consequence (rare)."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:344
-msgid "<option>-y</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:344
-msgid "<option>--yes</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:345
-msgid "<option>--assume-yes</option>"
+"Simulated runs print out a series of lines, each representing a "
+"<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
+"remove (<literal>Remv</literal>)  or unpack (<literal>Inst</literal>). "
+"Square brackets indicate broken packages, and empty square brackets indicate "
+"breaks that are of no consequence (rare)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -3178,11 +899,6 @@ msgid ""
 "Configuration Item: <literal>APT::Get::Assume-Yes</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:353
-msgid "<option>--assume-no</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:354
 msgid ""
@@ -3190,33 +906,13 @@ msgid ""
 "Assume-No</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:358
-msgid "<option>-u</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:358
-msgid "<option>--show-upgraded</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:359
 msgid ""
-"Show upgraded packages; Print out a list of all packages that are to be "
+"Show upgraded packages; print out a list of all packages that are to be "
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:364
-msgid "<option>-V</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:364
-msgid "<option>--verbose-versions</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:365
 msgid ""
@@ -3224,11 +920,6 @@ msgid ""
 "<literal>APT::Get::Show-Versions</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:370
-msgid "<option>--host-architecture</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:371
 msgid ""
@@ -3240,21 +931,6 @@ msgid ""
 "Architecture</literal>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:379
-msgid "<option>-b</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:379
-msgid "<option>--compile</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:380
-msgid "<option>--build</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:381
 msgid ""
@@ -3262,73 +938,48 @@ msgid ""
 "<literal>APT::Get::Compile</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:385
-msgid "<option>--ignore-hold</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:386
 msgid ""
-"Ignore package Holds; This causes <command>apt-get</command> to ignore a "
+"Ignore package holds; this causes <command>apt-get</command> to ignore a "
 "hold placed on a package. This may be useful in conjunction with "
 "<literal>dist-upgrade</literal> to override a large number of undesired "
 "holds.  Configuration Item: <literal>APT::Ignore-Hold</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:392
-msgid "<option>--no-upgrade</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:393
 msgid ""
-"Do not upgrade packages; When used in conjunction with <literal>install</"
+"Do not upgrade packages; when used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
 "line from being upgraded if they are already installed.  Configuration Item: "
 "<literal>APT::Get::Upgrade</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:399
-msgid "<option>--only-upgrade</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:400
 msgid ""
-"Do not install new packages; When used in conjunction with <literal>install</"
-"literal>, <literal>only-upgrade</literal> will prevent packages on the "
-"command line from being upgraded if they are not already installed.  "
+"Do not install new packages; when used in conjunction with <literal>install</"
+"literal>, <literal>only-upgrade</literal> will install upgrades for already "
+"installed packages only and ignore requests to install new packages.  "
 "Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:406
-msgid "<option>--force-yes</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:407
+#: apt-get.8.xml:408
 msgid ""
-"Force yes; This is a dangerous option that will cause apt to continue "
+"Force yes; this is a dangerous option that will cause apt to continue "
 "without prompting if it is doing something potentially harmful. It should "
 "not be used except in very special situations. Using <literal>force-yes</"
 "literal> can potentially destroy your system! Configuration Item: "
 "<literal>APT::Get::force-yes</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:414
-msgid "<option>--print-uris</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:415
+#: apt-get.8.xml:416
 msgid ""
 "Instead of fetching the files to install their URIs are printed. Each URI "
-"will have the path, the destination file name, the size and the expected md5 "
+"will have the path, the destination file name, the size and the expected MD5 "
 "hash. Note that the file name to write to will not always match the file "
 "name on the remote site! This also works with the <literal>source</literal> "
 "and <literal>update</literal> commands. When used with the <literal>update</"
@@ -3337,13 +988,8 @@ msgid ""
 "Print-URIs</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:425
-msgid "<option>--purge</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:426
+#: apt-get.8.xml:427
 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. "
@@ -3351,48 +997,28 @@ msgid ""
 "command.  Configuration Item: <literal>APT::Get::Purge</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:433
-msgid "<option>--reinstall</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:434
+#: apt-get.8.xml:435
 msgid ""
-"Re-Install packages that are already installed and at the newest version.  "
+"Re-install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:438
-msgid "<option>--list-cleanup</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:439
+#: apt-get.8.xml:440
 msgid ""
-"This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
-"it off. When on <command>apt-get</command> will automatically manage the "
-"contents of <filename>&statedir;/lists</filename> to ensure that obsolete "
-"files are erased.  The only reason to turn it off is if you frequently "
-"change your source list.  Configuration Item: <literal>APT::Get::List-"
-"Cleanup</literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:448
-msgid "<option>--target-release</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:449
-msgid "<option>--default-release</option>"
+"This option is on by default; use <literal>--no-list-cleanup</literal> to "
+"turn it off. When it is on, <command>apt-get</command> will automatically "
+"manage the contents of <filename>&statedir;/lists</filename> to ensure that "
+"obsolete files are erased.  The only reason to turn it off is if you "
+"frequently change your sources list.  Configuration Item: <literal>APT::Get::"
+"List-Cleanup</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:450
 msgid ""
-"This option controls the default input to the policy engine, it creates a "
+"This option controls the default input to the policy engine; it creates a "
 "default pin at priority 990 using the specified release string.  This "
 "overrides the general settings in <filename>/etc/apt/preferences</"
 "filename>.  Specifically pinned packages are not affected by the value of "
@@ -3403,25 +1029,15 @@ msgid ""
 "also the &apt-preferences; manual page."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:463
-msgid "<option>--trivial-only</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:465
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
-"related to <option>--assume-yes</option>, where <option>--assume-yes</"
+"related to <option>--assume-yes</option>; where <option>--assume-yes</"
 "option> will answer yes to any prompt, <option>--trivial-only</option> will "
 "answer no.  Configuration Item: <literal>APT::Get::Trivial-Only</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:471
-msgid "<option>--no-remove</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:472
 msgid ""
@@ -3429,25 +1045,15 @@ msgid ""
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:477
-msgid "<option>--auto-remove</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:478
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
-"literal>, then this option acts like running <literal>autoremove</literal> "
-"command, removing the unused dependency packages. Configuration Item: "
+"literal>, then this option acts like running the <literal>autoremove</"
+"literal> command, removing unused dependency packages. Configuration Item: "
 "<literal>APT::Get::AutomaticRemove</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:484
-msgid "<option>--only-source</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:485
 msgid ""
@@ -3460,21 +1066,6 @@ msgid ""
 "Source</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:495
-msgid "<option>--diff-only</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:495
-msgid "<option>--dsc-only</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:495
-msgid "<option>--tar-only</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:496
 msgid ""
@@ -3483,11 +1074,6 @@ msgid ""
 "literal>, and <literal>APT::Get::Tar-Only</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:501
-msgid "<option>--arch-only</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:502
 msgid ""
@@ -3495,11 +1081,6 @@ msgid ""
 "<literal>APT::Get::Arch-Only</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:506
-msgid "<option>--allow-unauthenticated</option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:507
 msgid ""
@@ -3508,13 +1089,22 @@ msgid ""
 "AllowUnauthenticated</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:520
-msgid ""
-"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
-"&file-statelists;"
+#. type: Content of: <refentry><refsect1><title>
+#: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125
+#: apt.conf.5.xml:1156 apt_preferences.5.xml:698
+msgid "Files"
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><title>
+#: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
+#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
+#: apt.conf.5.xml:1162 apt_preferences.5.xml:705 sources.list.5.xml:252
+#: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
+#: apt-ftparchive.1.xml:607
+#, fuzzy
+msgid "See Also"
+msgstr "Consulte também"
+
 #. type: Content of: <refentry><refsect1><para>
 #: apt-get.8.xml:529
 msgid ""
@@ -3523,6 +1113,13 @@ msgid ""
 "preferences;, the APT Howto."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><title>
+#: apt-get.8.xml:534 apt-cache.8.xml:355 apt-mark.8.xml:135
+#: apt-cdrom.8.xml:149 apt-config.8.xml:114 apt-extracttemplates.1.xml:74
+#: apt-sortpkgs.1.xml:67 apt-ftparchive.1.xml:611
+msgid "Diagnostics"
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><para>
 #: apt-get.8.xml:535
 msgid ""
@@ -3530,126 +1127,493 @@ msgid ""
 "error."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:538
-msgid "ORIGINAL AUTHORS"
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-cache.8.xml:33
+msgid "query the APT cache"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:539
-msgid "&apt-author.jgunthorpe;"
+#: apt-cache.8.xml:39
+msgid ""
+"<command>apt-cache</command> performs a variety of operations on APT's "
+"package cache. <command>apt-cache</command> does not manipulate the state of "
+"the system but does provide operations to search and generate interesting "
+"output from the package metadata."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:542
-msgid "CURRENT AUTHORS"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:49
+msgid ""
+"<literal>gencaches</literal> creates APT's package cache. This is done "
+"implicitly by all commands needing this cache if it is missing or outdated."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:544
-msgid "&apt-author.team;"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+#: apt-cache.8.xml:53 apt-cache.8.xml:142 apt-cache.8.xml:163
+#: apt-cache.8.xml:185 apt-cache.8.xml:190 apt-cache.8.xml:206
+#: apt-cache.8.xml:224 apt-cache.8.xml:236
+msgid "&synopsis-pkg;"
 msgstr ""
 
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-key.8.xml:17 apt-key.8.xml:24
-msgid "apt-key"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:54
+msgid ""
+"<literal>showpkg</literal> displays information about the packages listed on "
+"the command line. Remaining arguments are package names. The available "
+"versions and reverse dependencies of each package listed are listed, as well "
+"as forward dependencies for each version. Forward (normal)  dependencies are "
+"those packages upon which the package in question depends; reverse "
+"dependencies are those packages that depend upon the package in question. "
+"Thus, forward dependencies must be satisfied for a package, but reverse "
+"dependencies need not be.  For instance, <command>apt-cache showpkg "
+"libreadline2</command> would produce output similar to the following:"
 msgstr ""
 
-#. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-key.8.xml:25
-msgid "APT key management utility"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
+#: apt-cache.8.xml:66
+#, no-wrap
+msgid ""
+"Package: libreadline2\n"
+"Versions: 2.1-12(/var/state/apt/lists/foo_Packages),\n"
+"Reverse Depends: \n"
+"  libreadlineg2,libreadline2\n"
+"  libreadline2-altdev,libreadline2\n"
+"Dependencies:\n"
+"2.1-12 - libc5 (2 5.4.0-0) ncurses3.0 (0 (null))\n"
+"Provides:\n"
+"2.1-12 - \n"
+"Reverse Provides: \n"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:32
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:78
 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 "
-"keys will be considered trusted."
+"Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and "
+"ncurses3.0 which must be installed for libreadline2 to work.  In turn, "
+"libreadlineg2 and libreadline2-altdev depend on libreadline2. If "
+"libreadline2 is installed, libc5 and ncurses3.0 (and ldso) must also be "
+"installed; libreadlineg2 and libreadline2-altdev do not have to be "
+"installed. For the specific meaning of the remainder of the output it is "
+"best to consult the apt source code."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:38
-msgid "Commands"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:87
+msgid ""
+"<literal>stats</literal> displays some statistics about the cache.  No "
+"further arguments are expected. Statistics reported are:"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:40
-msgid "add &synopsis-param-filename;"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
+#: apt-cache.8.xml:90
+msgid ""
+"<literal>Total package names</literal> is the number of package names found "
+"in the cache."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
+#: apt-cache.8.xml:94
+msgid ""
+"<literal>Normal packages</literal> is the number of regular, ordinary "
+"package names; these are packages that bear a one-to-one correspondence "
+"between their names and the names used by other packages for them in "
+"dependencies. The majority of packages fall into this category."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
+#: apt-cache.8.xml:100
+msgid ""
+"<literal>Pure virtual packages</literal> is the number of packages that "
+"exist only as a virtual package name; that is, packages only \"provide\" the "
+"virtual package name, and no package actually uses the name. For instance, "
+"\"mail-transport-agent\" in the Debian system is a pure virtual package; "
+"several packages provide \"mail-transport-agent\", but there is no package "
+"named \"mail-transport-agent\"."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
+#: apt-cache.8.xml:108
+msgid ""
+"<literal>Single virtual packages</literal> is the number of packages with "
+"only one package providing a particular virtual package. For example, in the "
+"Debian system, \"X11-text-viewer\" is a virtual package, but only one "
+"package, xless, provides \"X11-text-viewer\"."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
+#: apt-cache.8.xml:114
+msgid ""
+"<literal>Mixed virtual packages</literal> is the number of packages that "
+"either provide a particular virtual package or have the virtual package name "
+"as the package name. For instance, in the Debian system, \"debconf\" is both "
+"an actual package, and provided by the debconf-tiny package."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
+#: apt-cache.8.xml:121
+msgid ""
+"<literal>Missing</literal> is the number of package names that were "
+"referenced in a dependency but were not provided by any package. Missing "
+"packages may be an evidence if a full distribution is not accessed, or if a "
+"package (real or virtual) has been dropped from the distribution. Usually "
+"they are referenced from Conflicts or Breaks statements."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
+#: apt-cache.8.xml:128
+msgid ""
+"<literal>Total distinct</literal> versions is the number of package versions "
+"found in the cache; this value is therefore at least equal to the number of "
+"total package names. If more than one distribution is being accessed (for "
+"instance, \"stable\" and \"unstable\"), this value can be considerably "
+"larger than the number of total package names."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
+#: apt-cache.8.xml:135
+msgid ""
+"<literal>Total dependencies</literal> is the number of dependency "
+"relationships claimed by all of the packages in the cache."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:44
+#: apt-cache.8.xml:143
 msgid ""
-"Add a new key to the list of trusted keys.  The key is read from &synopsis-"
-"param-filename;, or standard input if &synopsis-param-filename; is <literal>-"
-"</literal>."
+"<literal>showsrc</literal> displays all the source package records that "
+"match the given package names. All versions are shown, as well as all "
+"records that declare the name to be a binary package."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:52
-msgid "del &synopsis-param-keyid;"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:149
+msgid ""
+"<literal>dump</literal> shows a short listing of every package in the cache. "
+"It is primarily for debugging."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:56
-msgid "Remove a key from the list of trusted keys."
+#: apt-cache.8.xml:154
+msgid ""
+"<literal>dumpavail</literal> prints out an available list to stdout. This is "
+"suitable for use with &dpkg; and is used by the &dselect; method."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:63
-msgid "export &synopsis-param-keyid;"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:159
+msgid ""
+"<literal>unmet</literal> displays a summary of all unmet dependencies in the "
+"package cache."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:67
-msgid "Output the key &synopsis-param-keyid; to standard output."
+#: apt-cache.8.xml:164
+msgid ""
+"<literal>show</literal> performs a function similar to <command>dpkg --print-"
+"avail</command>; it displays the package records for the named packages."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:74
-msgid "exportall"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+#: apt-cache.8.xml:169
+msgid "&synopsis-regex;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:78
-msgid "Output all trusted keys to standard output."
+#: apt-cache.8.xml:170
+msgid ""
+"<literal>search</literal> performs a full text search on all available "
+"package lists for the POSIX regex pattern given, see &regex;.  It searches "
+"the package names and the descriptions for an occurrence of the regular "
+"expression and prints out the package name and the short description, "
+"including virtual package names.  If <option>--full</option> is given then "
+"output identical to <literal>show</literal> is produced for each matched "
+"package, and if <option>--names-only</option> is given then the long "
+"description is not searched, only the package name is."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:85
-msgid "list"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:181
+msgid ""
+"Separate arguments can be used to specify multiple search patterns that are "
+"and'ed together."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:89
-msgid "List trusted keys."
+#: apt-cache.8.xml:186
+msgid ""
+"<literal>depends</literal> shows a listing of each dependency a package has "
+"and all the possible other packages that can fulfill that dependency."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:191
+msgid ""
+"<literal>rdepends</literal> shows a listing of each reverse dependency a "
+"package has."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:96
-msgid "finger"
+#: apt-cache.8.xml:195
+#, fuzzy
+msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 msgstr ""
+"<programlisting>\n"
+"apt-get install <replaceable>pacote</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:100
-msgid "List fingerprints of trusted keys."
+#: apt-cache.8.xml:196
+msgid ""
+"This command prints the name of each package APT knows. The optional "
+"argument is a prefix match to filter the name list. The output is suitable "
+"for use in a shell tab complete function and the output is generated "
+"extremely quickly. This command is best used with the <option>--generate</"
+"option> option."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:201
+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 "
+"the generated list."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:207
+msgid ""
+"<literal>dotty</literal> takes a list of packages on the command line and "
+"generates output suitable for use by dotty from the <ulink url=\"http://www."
+"research.att.com/sw/tools/graphviz/\">GraphViz</ulink> package. The result "
+"will be a set of nodes and edges representing the relationships between the "
+"packages. By default the given packages will trace out all dependent "
+"packages; this can produce a very large graph.  To limit the output to only "
+"the packages listed on the command line, set the <literal>APT::Cache::"
+"GivenOnly</literal> option."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:216
+msgid ""
+"The resulting nodes will have several shapes; normal packages are boxes, "
+"pure virtual packages are triangles, mixed virtual packages are diamonds, "
+"missing packages are hexagons. Orange boxes mean recursion was stopped (leaf "
+"packages), blue lines are pre-depends, green lines are conflicts."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:221
+msgid "Caution, dotty cannot graph larger sets of packages."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:225
+msgid ""
+"The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
+"\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:229
+#, fuzzy
+msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
+msgstr ""
+"<programlisting>\n"
+"apt-get install <replaceable>pacote</replaceable>/testing\n"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:230
+msgid ""
+"<literal>policy</literal> is meant to help debug issues relating to the "
+"preferences file. With no arguments it will print out the priorities of each "
+"source. Otherwise it prints out detailed information about the priority "
+"selection of the named package."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:237
+msgid ""
+"<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
+"to mimic the output format and a subset of the functionality of the Debian "
+"archive management tool, <literal>madison</literal>.  It displays available "
+"versions of a package in a tabular format.  Unlike the original "
+"<literal>madison</literal>, it can only display information for the "
+"architecture for which APT has retrieved package lists (<literal>APT::"
+"Architecture</literal>)."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:253
+msgid ""
+"Select the file to store the package cache. The package cache is the primary "
+"cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
+"pkgcache</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:259
+msgid ""
+"Select the file to store the source cache. The source is used only by "
+"<literal>gencaches</literal> and it stores a parsed version of the package "
+"information from remote sources. When building the package cache the source "
+"cache is used to avoid reparsing all of the package files.  Configuration "
+"Item: <literal>Dir::Cache::srcpkgcache</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:267
+msgid ""
+"Quiet; produces output suitable for logging, omitting progress indicators.  "
+"More q's will produce more quietness up to a maximum of 2. You can also use "
+"<option>-q=#</option> to set the quietness level, overriding the "
+"configuration file.  Configuration Item: <literal>quiet</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:274
+msgid ""
+"Print only important dependencies; for use with <literal>unmet</literal> and "
+"<literal>depends</literal>. Causes only Depends and Pre-Depends relations to "
+"be printed.  Configuration Item: <literal>APT::Cache::Important</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:288
+msgid ""
+"Per default the <literal>depends</literal> and <literal>rdepends</literal> "
+"print all dependencies. This can be tweaked with these flags which will omit "
+"the specified dependency type.  Configuration Item: <literal>APT::Cache::"
+"Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
+"Cache::ShowRecommends</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:295
+msgid ""
+"Print full package records when searching.  Configuration Item: "
+"<literal>APT::Cache::ShowFull</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:300
+msgid ""
+"Print full records for all available versions. This is the default; to turn "
+"it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
+"versions</option> is specified, only the candidate version will be displayed "
+"(the one which would be selected for installation).  This option is only "
+"applicable to the <literal>show</literal> command.  Configuration Item: "
+"<literal>APT::Cache::AllVersions</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:309
+msgid ""
+"Perform automatic package cache regeneration, rather than use the cache as "
+"it is. This is the default; to turn it off, use <option>--no-generate</"
+"option>.  Configuration Item: <literal>APT::Cache::Generate</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:315
+msgid ""
+"Only search on the package names, not the long descriptions.  Configuration "
+"Item: <literal>APT::Cache::NamesOnly</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:320
+msgid ""
+"Make <literal>pkgnames</literal> print all names, including virtual packages "
+"and missing dependencies.  Configuration Item: <literal>APT::Cache::"
+"AllNames</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:326
+msgid ""
+"Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
+"that all packages mentioned are printed once.  Configuration Item: "
+"<literal>APT::Cache::RecurseDepends</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:333
+msgid ""
+"Limit the output of <literal>depends</literal> and <literal>rdepends</"
+"literal> to packages which are currently installed.  Configuration Item: "
+"<literal>APT::Cache::Installed</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-cache.8.xml:351
+msgid "&apt-conf;, &sources-list;, &apt-get;"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-cache.8.xml:356
+msgid ""
+"<command>apt-cache</command> returns zero on normal operation, decimal 100 "
+"on error."
+msgstr ""
+
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-key.8.xml:32
+msgid "APT key management utility"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-key.8.xml:39
+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 "
+"keys will be considered trusted."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-key.8.xml:45
+msgid "Commands"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml:50
+msgid ""
+"Add a new key to the list of trusted keys.  The key is read from the "
+"filename given with the parameter &synopsis-param-filename; or if the "
+"filename is <literal>-</literal> from standard input."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml:63
+msgid "Remove a key from the list of trusted keys."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml:74
+msgid "Output the key &synopsis-param-keyid; to standard output."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml:85
+msgid "Output all trusted keys to standard output."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml:96
+msgid "List trusted keys."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:107
-msgid "adv"
+msgid "List fingerprints of trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:111
+#: apt-key.8.xml:118
 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:123
+#: apt-key.8.xml:130
 msgid ""
 "Update the local keyring with the archive keyring and remove from the local "
 "keyring the archive keys which are no longer valid.  The archive keyring is "
@@ -3658,38 +1622,33 @@ msgid ""
 "Debian."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:133
-msgid "net-update"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:137
+#: apt-key.8.xml:144
 msgid ""
-"Work similar to the <command>update</command> command above, but get the "
-"archive keyring from an URI instead and validate it against a master key.  "
-"This requires an installed &wget; and an APT build configured to have a "
-"server to fetch from and a master keyring to validate.  APT in Debian does "
-"not support this command and relies on <command>update</command> instead, "
-"but Ubuntu's APT does."
+"Perform an update working similarly to the <command>update</command> command "
+"above, but get the archive keyring from a URI instead and validate it "
+"against a master key.  This requires an installed &wget; and an APT build "
+"configured to have a server to fetch from and a master keyring to validate.  "
+"APT in Debian does not support this command, relying on <command>update</"
+"command> instead, but Ubuntu's APT does."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-key.8.xml:160 apt-cdrom.8.xml:80
+msgid "Options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:154
+#: apt-key.8.xml:161
 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:156
-msgid "--keyring &synopsis-param-filename;"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:157
+#: apt-key.8.xml:164
 msgid ""
-"With this option it is possible to specify a specific keyring file the "
+"With this option it is possible to specify a particular 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, though <filename>trusted.gpg</"
@@ -3697,62 +1656,44 @@ msgid ""
 "this one."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:170
-msgid "&file-trustedgpg;"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:172
+#: apt-key.8.xml:179
 #, 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:173
+#: apt-key.8.xml:180
 msgid "Local trust database of archive keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:176
+#: apt-key.8.xml:183
 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:177
+#: apt-key.8.xml:184
 msgid "Keyring of Debian archive trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:180
+#: apt-key.8.xml:187
 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:181
+#: apt-key.8.xml:188
 msgid "Keyring of Debian archive removed trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:190
+#: apt-key.8.xml:197
 #, fuzzy
 msgid "&apt-get;, &apt-secure;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
-#.  The last update date 
-#. type: Content of: <refentry><refentryinfo>
-#: apt-mark.8.xml:16
-msgid ""
-"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 "
-"April 2011</date>"
-msgstr ""
-
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-mark.8.xml:25 apt-mark.8.xml:32
-msgid "apt-mark"
-msgstr ""
-
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-mark.8.xml:33
 msgid "mark/unmark a package as being automatically-installed"
@@ -3775,11 +1716,6 @@ msgid ""
 "removed by e.g.  <command>apt-get</command> or <command>aptitude</command>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:51
-msgid "auto"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:52
 msgid ""
@@ -3788,11 +1724,6 @@ msgid ""
 "installed packages depend on this package."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:59
-msgid "manual"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:60
 msgid ""
@@ -3801,24 +1732,14 @@ msgid ""
 "if no other packages depend on it."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:67
-msgid "hold"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:68
 msgid ""
-"<literal>hold</literal> is used to mark a package as hold back, which will "
+"<literal>hold</literal> is used to mark a package as held back, which will "
 "prevent the package from being automatically installed, upgraded or "
 "removed.  The command is only a wrapper around <command>dpkg --set-"
 "selections</command> and the state is therefore maintained by &dpkg; and not "
-"effected by the <option>--filename</option> option."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:77
-msgid "unhold"
+"affected by the <option>--file</option> option."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -3828,11 +1749,6 @@ msgid ""
 "package to allow all actions again."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:83
-msgid "showauto"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:84
 msgid ""
@@ -3842,11 +1758,6 @@ msgid ""
 "given only those which are automatically installed will be shown."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:91
-msgid "showmanual"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:92
 msgid ""
@@ -3855,11 +1766,6 @@ msgid ""
 "installed packages instead."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:98
-msgid "showhold"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:99
 msgid ""
@@ -3867,58 +1773,29 @@ msgid ""
 "the same way as for the other show commands."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:112
-msgid ""
-"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:113
-msgid ""
-"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
-"option>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:116
+#: apt-mark.8.xml:115
 msgid ""
-"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
-"filename> instead of the default location, which is "
+"Read/Write package stats from the filename given with the parameter "
+"&synopsis-param-filename; instead of from the default location, which is "
 "<filename>extended_status</filename> in the directory defined by the "
 "Configuration Item: <literal>Dir::State</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:128
-msgid "  &file-extended_states;"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:133
-#, fuzzy
-msgid "&apt-get;,&aptitude;,&apt-conf;"
-msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:137
+#: apt-mark.8.xml:136
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
 msgstr ""
 
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-secure.8.xml:17 apt-secure.8.xml:39
-msgid "apt-secure"
-msgstr ""
-
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-secure.8.xml:40
+#: apt-secure.8.xml:47
 msgid "Archive authentication support for APT"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:45
+#: apt-secure.8.xml:52
 msgid ""
 "Starting with version 0.6, <command>apt</command> contains code that does "
 "signature checking of the Release file for all archives. This ensures that "
@@ -3927,40 +1804,40 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:53
+#: apt-secure.8.xml:60
 msgid ""
-"If a package comes from a archive without a signature or with a signature "
-"that apt does not have a key for that package is considered untrusted and "
+"If a package comes from a archive without a signature, or with a signature "
+"that apt does not have a key for, that package is considered untrusted, and "
 "installing it will result in a big warning. <command>apt-get</command> will "
-"currently only warn for unsigned archives, future releases might force all "
+"currently only warn for unsigned archives; future releases might force all "
 "sources to be verified before downloading packages from them."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:62
+#: apt-secure.8.xml:69
 msgid ""
 "The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
 "authentication feature."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:67
+#: apt-secure.8.xml:74
 msgid "Trusted archives"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:70
+#: apt-secure.8.xml:77
 msgid ""
-"The chain of trust from an apt archive to the end user is made up of "
-"different steps. <command>apt-secure</command> is the last step in this "
-"chain, trusting an archive does not mean that the packages that you trust it "
-"do not contain malicious code but means that you trust the archive "
-"maintainer. It's the archive maintainer responsibility to ensure that the "
-"archive integrity is correct."
+"The chain of trust from an apt archive to the end user is made up of several "
+"steps. <command>apt-secure</command> is the last step in this chain; "
+"trusting an archive does not mean that you trust its packages not to contain "
+"malicious code, but means that you trust the archive maintainer. It's the "
+"archive maintainer's responsibility to ensure that the archive's integrity "
+"is preserved."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:78
+#: apt-secure.8.xml:85
 msgid ""
 "apt-secure does not review signatures at a package level. If you require "
 "tools to do this you should look at <command>debsig-verify</command> and "
@@ -3969,56 +1846,56 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:85
+#: apt-secure.8.xml:92
 msgid ""
 "The chain of trust in Debian starts when a maintainer uploads a new package "
-"or a new version of a package to the Debian archive. This upload in order to "
-"become effective needs to be signed by a key of a maintainer within the "
-"Debian maintainer's keyring (available in the debian-keyring package). "
-"Maintainer's keys are signed by other maintainers following pre-established "
-"procedures to ensure the identity of the key holder."
+"or a new version of a package to the Debian archive. In order to become "
+"effective, this upload needs to be signed by a key contained in the Debian "
+"Maintainers keyring (available in the debian-keyring package). Maintainers' "
+"keys are signed by other maintainers following pre-established procedures to "
+"ensure the identity of the key holder."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:95
+#: apt-secure.8.xml:102
 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."
+"maintainer signature is stripped off, and checksums of the package are "
+"computed and put in the Packages file. The checksums 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 for this Debian release, and distributed "
+"alongside the packages and the Packages files on Debian mirrors. The keys "
+"are in the Debian archive keyring available in the <package>debian-archive-"
+"keyring</package> package."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:105
+#: apt-secure.8.xml:113
 msgid ""
-"Any end user can check the signature of the Release file, extract the MD5 "
-"sum of a package from it and compare it with the MD5 sum of the package he "
-"downloaded. Prior to version 0.6 only the MD5 sum of the downloaded Debian "
-"package was checked. Now both the MD5 sum and the signature of the Release "
-"file are checked."
+"End users can check the signature of the Release file, extract a checksum of "
+"a package from it and compare it with the checksum of the package they "
+"downloaded by hand - or rely on APT doing this automatically."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:112
+#: apt-secure.8.xml:118
 msgid ""
 "Notice that this is distinct from checking signatures on a per package "
 "basis. It is designed to prevent two possible attacks:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:117
+#: apt-secure.8.xml:123
 msgid ""
 "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
-"checking, a malicious agent can introduce himself in the package download "
-"process and provide malicious software either by controlling a network "
-"element (router, switch, etc.) or by redirecting traffic to a rogue server "
-"(through arp or DNS spoofing attacks)."
+"checking, malicious agents can introduce themselves into the package "
+"download process and provide malicious software either by controlling a "
+"network element (router, switch, etc.) or by redirecting traffic to a rogue "
+"server (through ARP or DNS spoofing attacks)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:125
+#: apt-secure.8.xml:131
 msgid ""
 "<literal>Mirror network compromise</literal>.  Without signature checking, a "
 "malicious agent can compromise a mirror host and modify the files in it to "
@@ -4027,7 +1904,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:132
+#: apt-secure.8.xml:138
 msgid ""
 "However, it does not defend against a compromise of the Debian master server "
 "itself (which signs the packages) or against a compromise of the key used to "
@@ -4036,21 +1913,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:138
+#: apt-secure.8.xml:144
 msgid "User configuration"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:140
+#: apt-secure.8.xml:146
 msgid ""
 "<command>apt-key</command> is the program that manages the list of keys used "
-"by apt. It can be used to add or remove keys although an installation of "
-"this release will automatically provide the default Debian archive signing "
+"by apt. It can be used to add or remove keys, although an installation of "
+"this release will automatically contain the default Debian archive signing "
 "keys used in the Debian package repositories."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:147
+#: apt-secure.8.xml:153
 msgid ""
 "In order to add a new key you need to first download it (you should make "
 "sure you are using a trusted communication channel when retrieving it), add "
@@ -4061,19 +1938,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:156
+#: apt-secure.8.xml:162
 msgid "Archive configuration"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:158
+#: apt-secure.8.xml:164
 msgid ""
 "If you want to provide archive signatures in an archive under your "
 "maintenance you have to:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:163
+#: apt-secure.8.xml:169
 msgid ""
 "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
 "already. You can do this by running <command>apt-ftparchive release</"
@@ -4081,7 +1958,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:168
+#: apt-secure.8.xml:174
 msgid ""
 "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
 "clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
@@ -4089,7 +1966,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:172
+#: apt-secure.8.xml:178
 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 "
@@ -4097,118 +1974,272 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:179
+#: apt-secure.8.xml:185
 msgid ""
-"Whenever the contents of the archive changes (new packages are added or "
-"removed) the archive maintainer has to follow the first two steps previously "
-"outlined."
+"Whenever the contents of the archive change (new packages are added or "
+"removed) the archive maintainer has to follow the first two steps outlined "
+"above."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:187
+#: apt-secure.8.xml:193
 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
 "&debsign; &debsig-verify;, &gpg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:191
+#: apt-secure.8.xml:197
 msgid ""
 "For more background information you might want to review the <ulink url="
-"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html"
-"\">Debian Security Infrastructure</ulink> chapter of the Securing Debian "
-"Manual (available also in the harden-doc package) and the <ulink url="
-"\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong "
-"Distribution HOWTO</ulink> by V. Alex Brennen."
+"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+"Security Infrastructure</ulink> chapter of the Securing Debian Manual "
+"(available also in the harden-doc package) and the <ulink url=\"http://www."
+"cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
+"ulink> by V. Alex Brennen."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:204
+#: apt-secure.8.xml:210
 msgid "Manpage Authors"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:206
+#: apt-secure.8.xml:212
 msgid ""
 "This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac "
 "Jones, Colin Walters, Florian Weimer and Michael Vogt."
 msgstr ""
 
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-sortpkgs.1.xml:25 apt-sortpkgs.1.xml:32
-msgid "apt-sortpkgs"
-msgstr ""
-
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-sortpkgs.1.xml:33
-msgid "Utility to sort package index files"
+#: apt-cdrom.8.xml:32
+msgid "APT CD-ROM management utility"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:39
+#: apt-cdrom.8.xml:38
 msgid ""
-"<command>apt-sortpkgs</command> will take an index file (Source index or "
-"Package index) and sort the records so that they are ordered by the package "
-"name.  It will also sort the internal fields of each record according to the "
-"internal sorting rules."
+"<command>apt-cdrom</command> is used to add a new CD-ROM to APT's list of "
+"available sources. <command>apt-cdrom</command> takes care of determining "
+"the structure of the disc as well as correcting for several possible mis-"
+"burns and verifying the index files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:45
-msgid "All output is sent to stdout, the input must be a seekable file."
+#: apt-cdrom.8.xml:45
+msgid ""
+"It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
+"system; it cannot be done by hand. Furthermore each disc in a multi-CD set "
+"must be inserted and scanned separately to account for possible mis-burns."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-sortpkgs.1.xml:52
-msgid "<option>--source</option>"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cdrom.8.xml:56
+msgid ""
+"<literal>add</literal> is used to add a new disc to the source list. It will "
+"unmount the CD-ROM device, prompt for a disc to be inserted and then proceed "
+"to scan it and copy the index files. If the disc does not have a proper "
+"<filename>.disk</filename> directory you will be prompted for a descriptive "
+"title."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-sortpkgs.1.xml:54
+#: apt-cdrom.8.xml:64
 msgid ""
-"Use Source index field ordering.  Configuration Item: <literal>APT::"
-"SortPkgs::Source</literal>."
+"APT uses a CD-ROM ID to track which disc is currently in the drive and "
+"maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
+"filename>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cdrom.8.xml:72
+msgid ""
+"A debugging tool to report the identity of the current disc as well as the "
+"stored file name"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cdrom.8.xml:85
+msgid ""
+"Mount point; specify the location to mount the CD-ROM. This mount point must "
+"be listed in <filename>/etc/fstab</filename> and properly configured.  "
+"Configuration Item: <literal>Acquire::cdrom::mount</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cdrom.8.xml:94
+msgid ""
+"Rename a disc; change the label of a disc or override the disc's given "
+"label. This option will cause <command>apt-cdrom</command> to prompt for a "
+"new label.  Configuration Item: <literal>APT::CDROM::Rename</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cdrom.8.xml:103
+msgid ""
+"No mounting; prevent <command>apt-cdrom</command> from mounting and "
+"unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
+"NoMount</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cdrom.8.xml:111
+msgid ""
+"Fast Copy; Assume the package files are valid and do not check every "
+"package. This option should be used only if <command>apt-cdrom</command> has "
+"been run on this disc before and did not detect any errors.  Configuration "
+"Item: <literal>APT::CDROM::Fast</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cdrom.8.xml:121
+msgid ""
+"Thorough Package Scan; This option may be needed with some old Debian "
+"1.1/1.2 discs that have Package files in strange places. It takes much "
+"longer to scan the CD but will pick them all up."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cdrom.8.xml:132
+msgid ""
+"No Changes; Do not change the &sources-list; file and do not write index "
+"files. Everything is still checked however.  Configuration Item: "
+"<literal>APT::CDROM::NoAct</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:68
+#: apt-cdrom.8.xml:145
+#, fuzzy
+msgid "&apt-conf;, &apt-get;, &sources-list;"
+msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-cdrom.8.xml:150
 msgid ""
-"<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
-"100 on error."
+"<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
+"on error."
 msgstr ""
 
-#.  The last update date 
-#. type: Content of: <refentry><refentryinfo>
-#: apt.conf.5.xml:16
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-config.8.xml:33
+msgid "APT Configuration Query program"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-config.8.xml:39
 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>16 January 2010</date>"
+"<command>apt-config</command> is an internal program used by various "
+"portions of the APT suite to provide consistent configurability. It accesses "
+"the main configuration file <filename>/etc/apt/apt.conf</filename> in a "
+"manner that is easy to use for scripted applications."
 msgstr ""
 
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt.conf.5.xml:31 apt.conf.5.xml:38
-msgid "apt.conf"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-config.8.xml:51
+msgid ""
+"shell is used to access the configuration information from a shell script. "
+"It is given pairs of arguments, the first being a shell variable and the "
+"second the configuration value to query. As output it lists shell assignment "
+"commands for each value present.  In a shell script it should be used as "
+"follows:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
+#: apt-config.8.xml:59
+#, no-wrap
+msgid ""
+"OPTS=\"-f\"\n"
+"RES=`apt-config shell OPTS MyApp::options`\n"
+"eval $RES\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-config.8.xml:64
+msgid ""
+"This will set the shell environment variable $OPTS to the value of MyApp::"
+"options with a default of <option>-f</option>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-config.8.xml:68
+msgid ""
+"The configuration item may be postfixed with a /[fdbi]. f returns file "
+"names, d returns directories, b returns true or false and i returns an "
+"integer. Each of the returns is normalized and verified internally."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-config.8.xml:77
+msgid "Just show the contents of the configuration space."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-config.8.xml:90
+msgid ""
+"Include options which have an empty value. This is the default, so use --no-"
+"empty to remove them from the output."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+#: apt-config.8.xml:95
+msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-config.8.xml:96
+msgid ""
+"Defines the output of each config option. &percnt;t will be replaced with "
+"its individual name, &percnt;f with its full hierarchical name and &percnt;v "
+"with its value.  Use uppercase letters and special characters in the value "
+"will be encoded to ensure that it can e.g. be safely used in a quoted-string "
+"as defined by RFC822. Additionally &percnt;n will be replaced by a newline, "
+"and &percnt;N by a tab. A &percnt; can be printed by using &percnt;&percnt;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-config.8.xml:110 apt-extracttemplates.1.xml:71 apt-sortpkgs.1.xml:64
+#: apt-ftparchive.1.xml:608
+#, fuzzy
+msgid "&apt-conf;"
+msgstr ""
+"&apt-docinfo;\n"
+"\n"
+" "
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-config.8.xml:115
+msgid ""
+"<command>apt-config</command> returns zero on normal operation, decimal 100 "
+"on error."
+msgstr ""
+
+#. type: Content of: <refentry><refentryinfo><author><contrib>
+#: apt.conf.5.xml:20
+msgid "Initial documentation of Debug::*."
+msgstr ""
+
+#. type: Content of: <refentry><refentryinfo><author><email>
+#: apt.conf.5.xml:21
+msgid "dburrows@debian.org"
 msgstr ""
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt.conf.5.xml:32 apt_preferences.5.xml:25 sources.list.5.xml:26
+#: apt.conf.5.xml:31 apt_preferences.5.xml:25 sources.list.5.xml:26
 msgid "5"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.conf.5.xml:39
+#: apt.conf.5.xml:38
 msgid "Configuration file for APT"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:43
+#: apt.conf.5.xml:42
 msgid ""
-"<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."
+"<filename>/etc/apt/apt.conf</filename> is the main configuration file shared "
+"by all the tools in the APT suite of tools, though it is by no means the "
+"only place options can be set. The suite also shares a common command line "
+"parser to provide a uniform environment."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><para>
@@ -4232,9 +2263,9 @@ msgid ""
 "order which have either no or \"<literal>conf</literal>\" as filename "
 "extension and which only contain alphanumeric, hyphen (-), underscore (_) "
 "and period (.) characters.  Otherwise APT will print a notice that it has "
-"ignored a file if the file doesn't match a pattern in the <literal>Dir::"
-"Ignore-Files-Silently</literal> configuration list - in this case it will be "
-"silently ignored."
+"ignored a file, unless that file matches a pattern in the <literal>Dir::"
+"Ignore-Files-Silently</literal> configuration list - in which case it will "
+"be silently ignored."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
@@ -4260,7 +2291,7 @@ msgstr ""
 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 "
+"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."
 msgstr ""
@@ -4272,17 +2303,16 @@ msgid ""
 "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
 "treated as comments (ignored), as well as all text between <literal>/*</"
 "literal> and <literal>*/</literal>, just like C/C++ comments.  Each line is "
-"of the form <literal>APT::Get::Assume-Yes \"true\";</literal>. The trailing "
-"semicolon and the quotes are required. The value must be on one line, and "
-"there is no kind of string concatenation. It must not include inside "
-"quotes.  The behavior of the backslash \"\\\" and escaped characters inside "
-"a value is undefined and it should not be used. An option name may include "
-"alphanumerical characters and the \"/-:._+\" characters. A new scope can be "
-"opened with curly braces, like:"
+"of the form <literal>APT::Get::Assume-Yes \"true\";</literal>.  The "
+"quotation marks and trailing semicolon are required.  The value must be on "
+"one line, and there is no kind of string concatenation.  Values must not "
+"include backslashes or extra quotation marks.  Option names are made up of "
+"alphanumeric characters and the characters \"/-:._+\".  A new scope can be "
+"opened with curly braces, like this:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:86
+#: apt.conf.5.xml:85
 #, no-wrap
 msgid ""
 "APT {\n"
@@ -4294,112 +2324,108 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:94
+#: apt.conf.5.xml:93
 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 "
-"a semicolon. Multiple entries can be included, each separated by a semicolon."
+"a semicolon. Multiple entries can be included, separated by a semicolon."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:99
+#: apt.conf.5.xml:98
 #, no-wrap
 msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:102
+#: apt.conf.5.xml:101
 msgid ""
 "In general the sample configuration file in <filename>&docdir;examples/apt."
 "conf</filename> &configureindex; is a good guide for how it should look."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:106
+#: apt.conf.5.xml:105
 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>."
+"Case is not significant in names of configuration items, so in the previous "
+"example you could use <literal>dpkg::pre-install-pkgs</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:109
+#: apt.conf.5.xml:108
 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. "
-"If you don't specify a name a new entry will simply add a new option to the "
-"list. If you specify a name you can override the option as every other "
-"option by reassigning a new value to the option."
+"Names for the configuration items are optional if a list is defined as can "
+"be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
+"you don't specify a name a new entry will simply add a new option to the "
+"list. If you specify a name you can override the option in the same way as "
+"any other option by reassigning a new value to the option."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:114
+#: apt.conf.5.xml:113
 msgid ""
-"Two specials are allowed, <literal>#include</literal> (which is deprecated "
-"and not supported by alternative implementations) 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.)"
+"Two special commands are defined: <literal>#include</literal> (which is "
+"deprecated and not supported by alternative implementations) and "
+"<literal>#clear</literal>. <literal>#include</literal> will include the "
+"given file, unless the filename ends in a slash, in which case 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.)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:122
+#: apt.conf.5.xml:123
 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</"
-"emphasis> override previously written entries. Only options can be "
-"overridden by addressing a new value to it - lists and scopes can't be "
-"overridden, only cleared."
+"The <literal>#clear</literal> command is the only way to delete a list or a "
+"complete scope. Reopening a scope (or using the syntax described below with "
+"an appended <literal>::</literal>) will <emphasis>not</emphasis> override "
+"previously written entries. Options can only be overridden by addressing a "
+"new value to them - lists and scopes can't be overridden, only cleared."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:127
+#: apt.conf.5.xml:131
 msgid ""
-"All of the APT tools take a -o option which allows an arbitrary "
+"All of the APT tools take an -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "
 "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. (As you might "
-"suspect: The scope syntax can't be used on the command line.)"
+"followed by an equals sign then the new value of the option. To append a new "
+"element to a list, add a trailing <literal>::</literal> to the name of the "
+"list.  (As you might suspect, the scope syntax can't be used on the command "
+"line.)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:134
-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 "
-"syntax implicit insert ::) Using both syntaxes together will trigger a bug "
-"which some users unfortunately relay on: An option with the unusual name "
-"\"<literal>::</literal>\" which acts like every other option with a name. "
-"These introduces many problems including that a user who writes multiple "
-"lines in this <emphasis>wrong</emphasis> syntax in the hope to append to a "
-"list will gain the opposite as only the last assignment for this option "
-"\"<literal>::</literal>\" will be used. Upcoming APT versions will raise "
-"errors and will stop working if they encounter this misuse, so please "
-"correct such statements now as long as APT doesn't complain explicit about "
-"them."
+#: apt.conf.5.xml:139
+msgid ""
+"Note that appending items to a list using <literal>::</literal> only works "
+"for one item per line, and that you should not use it in combination with "
+"the scope syntax (which adds <literal>::</literal> implicitly). Using both "
+"syntaxes together will trigger a bug which some users unfortunately depend "
+"on: an option with the unusual name \"<literal>::</literal>\" which acts "
+"like every other option with a name. This introduces many problems; for one "
+"thing, users who write multiple lines in this <emphasis>wrong</emphasis> "
+"syntax in the hope of appending to a list will achieve the opposite, as only "
+"the last assignment for this option \"<literal>::</literal>\" will be used. "
+"Future versions of APT will raise errors and stop working if they encounter "
+"this misuse, so please correct such statements now while APT doesn't "
+"explicitly complain about them."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:146
+#: apt.conf.5.xml:154
 msgid "The APT Group"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:147
+#: apt.conf.5.xml:155
 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:151
-msgid "Architecture"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:152
+#: apt.conf.5.xml:160
 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "
@@ -4407,49 +2433,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:158
+#: apt.conf.5.xml:167
 msgid ""
-"All Architectures the system supports. Processors implementing the "
-"<literal>amd64</literal> are e.g. also able to execute binaries compiled for "
-"<literal>i386</literal>; This list is use when fetching files and parsing "
-"package lists. The internal default is always the native architecture "
-"(<literal>APT::Architecture</literal>)  and all foreign architectures it can "
-"retrieve by calling <command>dpkg --print-foreign-architectures</command>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:165
-msgid "Default-Release"
+"All Architectures the system supports. For instance, CPUs implementing the "
+"<literal>amd64</literal> (also called <literal>x86-64</literal>)  "
+"instruction set are also able to execute binaries compiled for the "
+"<literal>i386</literal> (<literal>x86</literal>) instruction set. This list "
+"is used when fetching files and parsing package lists. The initial default "
+"is always the system's native architecture (<literal>APT::Architecture</"
+"literal>), and foreign architectures are added to the default list when they "
+"are registered via <command>dpkg --add-architecture</command>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:166
+#: apt.conf.5.xml:180
 msgid ""
-"Default release to install packages from if more than one version available. "
-"Contains release name, codename or release version. Examples: 'stable', "
-"'testing', 'unstable', '&stable-codename;', '&testing-codename;', '4.0', "
-"'5.0*'. See also &apt-preferences;."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:171
-msgid "Ignore-Hold"
+"Default release to install packages from if more than one version is "
+"available. Contains release name, codename or release version. Examples: "
+"'stable', 'testing', 'unstable', '&stable-codename;', '&testing-codename;', "
+"'4.0', '5.0*'. See also &apt-preferences;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:172
+#: apt.conf.5.xml:186
 msgid ""
-"Ignore Held packages; This global option causes the problem resolver to "
+"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:176
-msgid "Clean-Installed"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:177
+#: apt.conf.5.xml:191
 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 "
@@ -4457,215 +2470,179 @@ msgid ""
 "but note that APT provides no direct means to reinstall them."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:183
-msgid "Immediate-Configure"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:184
-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, 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 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 "
-"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."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:199
+msgid ""
+"Defaults to on, which will cause APT to install essential and important "
+"packages as soon as possible in an install/upgrade operation, in order to "
+"limit the effect of a failing &dpkg; call. If this option is disabled, APT "
+"treats an important package in the same way as an extra package: between the "
+"unpacking of the package A and its configuration there can be many other "
+"unpack or configuration calls for other unrelated packages B, C etc. If "
+"these cause the &dpkg; call to fail (e.g. because package B's maintainer "
+"scripts generate an error), this results in a system state in which package "
+"A is unpacked but unconfigured - so any package depending on A is now no "
+"longer guaranteed to work, as its dependency on A is no longer satisfied."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:206
-msgid "Force-LoopBreak"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:211
+msgid ""
+"The immediate configuration marker is also applied in the potentially "
+"problematic case of circular dependencies, since a dependency with the "
+"immediate flag is equivalent to a Pre-Dependency. In theory this allows APT "
+"to recognise a situation in which it is unable to perform immediate "
+"configuration, abort, and suggest to the user that the option should be "
+"temporarily deactivated in order to allow the operation to proceed.  Note "
+"the use of the word \"theory\" here; in the real world this problem has "
+"rarely been encountered, 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 "
+"scenario mentioned above is not the only problem it can help to prevent in "
+"the first place."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:207
+#: apt.conf.5.xml:224
 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/"
-"Conflicts or Conflicts/Pre-Depend loop between two essential packages. SUCH "
-"A LOOP SHOULD NEVER EXIST AND IS A GRAVE BUG. This option will work if the "
-"essential packages are not tar, gzip, libc, dpkg, bash or anything that "
-"those packages depend on."
+"Before a big operation like <literal>dist-upgrade</literal> is run with this "
+"option disabled you should try to explicitly <literal>install</literal> the "
+"package APT is unable to configure immediately; but please make sure you "
+"also report your problem to your 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:215
-msgid "Cache-Start, Cache-Grow and Cache-Limit"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:235
+msgid ""
+"Never enable this option unless you <emphasis>really</emphasis> know what "
+"you are doing. It permits APT to temporarily remove an essential package to "
+"break a Conflicts/Conflicts or Conflicts/Pre-Depends loop between two "
+"essential packages. <emphasis>Such a loop should never exist and is a grave "
+"bug</emphasis>. This option will work if the essential packages are not "
+"<command>tar</command>, <command>gzip</command>, <command>libc</command>, "
+"<command>dpkg</command>, <command>dash</command> or anything that those "
+"packages depend on."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:216
+#: apt.conf.5.xml:247
 msgid ""
 "APT uses since version 0.7.26 a resizable memory mapped cache file to store "
-"the 'available' information. <literal>Cache-Start</literal> acts as a hint "
-"to which size the Cache will grow and is therefore the amount of memory APT "
+"the available information. <literal>Cache-Start</literal> acts as a hint of "
+"the size the cache will grow to, and is therefore the amount of memory APT "
 "will request at startup. The default value is 20971520 bytes (~20 MB). Note "
-"that these amount of space need to be available for APT otherwise it will "
-"likely fail ungracefully, so for memory restricted devices these value "
-"should be lowered while on systems with a lot of configured sources this "
-"might be increased.  <literal>Cache-Grow</literal> defines in byte with the "
-"default of 1048576 (~1 MB) how much the Cache size will be increased in the "
-"event the space defined by <literal>Cache-Start</literal> is not enough. "
-"These value will be applied again and again until either the cache is big "
-"enough to store all information or the size of the cache reaches the "
-"<literal>Cache-Limit</literal>.  The default of <literal>Cache-Limit</"
-"literal> is 0 which stands for no limit.  If <literal>Cache-Grow</literal> "
-"is set to 0 the automatic grow of the cache is disabled."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:231
-msgid "Build-Essential"
+"that this amount of space needs to be available for APT; otherwise it will "
+"likely fail ungracefully, so for memory restricted devices this value should "
+"be lowered while on systems with a lot of configured sources it should be "
+"increased.  <literal>Cache-Grow</literal> defines in bytes with the default "
+"of 1048576 (~1 MB) how much the cache size will be increased in the event "
+"the space defined by <literal>Cache-Start</literal> is not enough. This "
+"value will be applied again and again until either the cache is big enough "
+"to store all information or the size of the cache reaches the <literal>Cache-"
+"Limit</literal>.  The default of <literal>Cache-Limit</literal> is 0 which "
+"stands for no limit.  If <literal>Cache-Grow</literal> is set to 0 the "
+"automatic growth of the cache is disabled."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:232
-msgid "Defines which package(s) are considered essential build dependencies."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:235
-msgid "Get"
+#: apt.conf.5.xml:263
+msgid "Defines which packages are considered essential build dependencies."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:267
 msgid ""
-"The Get subsection controls the &apt-get; tool, please see its documentation "
+"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:240
-msgid "Cache"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:241
+#: apt.conf.5.xml:272
 msgid ""
-"The Cache subsection controls the &apt-cache; tool, please see its "
+"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:245
-msgid "CDROM"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:246
+#: apt.conf.5.xml:277
 msgid ""
-"The CDROM subsection controls the &apt-cdrom; tool, please see its "
+"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:252
+#: apt.conf.5.xml:283
 msgid "The Acquire Group"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:257
-msgid "Check-Valid-Until"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:258
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:284
 msgid ""
-"Security related option defaulting to true as an expiring validation for a "
-"Release file prevents longtime replay attacks and can e.g. also help users "
-"to identify no longer updated mirrors - but the feature depends on the "
-"correctness of the time on the user system.  Archive maintainers are "
-"encouraged to create Release files with the <literal>Valid-Until</literal> "
-"header, but if they don't or a stricter value is volitional the following "
-"<literal>Max-ValidTime</literal> option can be used."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:268
-msgid "Max-ValidTime"
+"The <literal>Acquire</literal> group of options controls the download of "
+"packages as well as the various \"acquire methods\" responsible for the "
+"download itself (see also &sources-list;)."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:269
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:291
 msgid ""
-"Seconds the Release file should be considered valid after it was created "
-"(indicated by the <literal>Date</literal> header).  If the Release file "
-"itself includes a <literal>Valid-Until</literal> header the earlier date of "
-"the two is used as the expiration date.  The default value is <literal>0</"
-"literal> which stands for \"for ever\".  Archive specific settings can be "
-"made by appending the label of the archive to the option name."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:279
-msgid "Min-ValidTime"
+"Security related option defaulting to true, as giving a Release file's "
+"validation an expiration date prevents replay attacks over a long timescale, "
+"and can also for example help users to identify mirrors that are no longer "
+"updated - but the feature depends on the correctness of the clock on the "
+"user system. Archive maintainers are encouraged to create Release files with "
+"the <literal>Valid-Until</literal> header, but if they don't or a stricter "
+"value is desired the <literal>Max-ValidTime</literal> option below can be "
+"used."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:280
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:304
 msgid ""
-"Minimum of seconds the Release file should be considered valid after it was "
-"created (indicated by the <literal>Date</literal> header).  Use this if you "
-"need to use a seldomly updated (local) mirror of a more regular updated "
-"archive with a <literal>Valid-Until</literal> header instead of completely "
-"disabling the expiration date checking.  Archive specific settings can and "
-"should be used by appending the label of the archive to the option name."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:290
-msgid "PDiffs"
+"Maximum time (in seconds) after its creation (as indicated by the "
+"<literal>Date</literal> header) that the <filename>Release</filename> file "
+"should be considered valid.  If the Release file itself includes a "
+"<literal>Valid-Until</literal> header the earlier date of the two is used as "
+"the expiration date.  The default value is <literal>0</literal> which stands "
+"for \"valid forever\".  Archive specific settings can be made by appending "
+"the label of the archive to the option name."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:291
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:316
 msgid ""
-"Try to download deltas called <literal>PDiffs</literal> for Packages or "
-"Sources files instead of downloading whole ones. True by default."
+"Minimum time (in seconds) after its creation (as indicated by the "
+"<literal>Date</literal> header) that the <filename>Release</filename> file "
+"should be considered valid.  Use this if you need to use a seldom updated "
+"(local) mirror of a more frequently updated archive with a <literal>Valid-"
+"Until</literal> header instead of completely disabling the expiration date "
+"checking.  Archive specific settings can and should be used by appending the "
+"label of the archive to the option name."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:294
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:328
 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 percentage 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."
+"Try to download deltas called <literal>PDiffs</literal> for indexes (like "
+"<filename>Packages</filename> files) instead of downloading whole ones. True "
+"by default."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:303
-msgid "Queue-Mode"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:331
+msgid ""
+"Two sub-options to limit the use of PDiffs are also available: "
+"<literal>FileLimit</literal> can be used to specify a maximum number of "
+"PDiff files should be downloaded to update a file. <literal>SizeLimit</"
+"literal> on the other hand is the maximum percentage 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><listitem><para>
-#: apt.conf.5.xml:304
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:341
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -4674,179 +2651,161 @@ msgid ""
 "connection per URI type will be opened."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:311
-msgid "Retries"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:312
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:349
 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:316
-msgid "Source-Symlinks"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:317
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:354
 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:321 sources.list.5.xml:160
-msgid "http"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:322
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:359
 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. If no one of the above settings is specified, "
-"<envar>http_proxy</envar> environment variable will be used."
+"<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
+"It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
+"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. If no one of the above "
+"settings is specified, <envar>http_proxy</envar> environment variable will "
+"be used."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:330
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:367
 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 "
-"response under any circumstances, <literal>Max-Age</literal> is sent only "
-"for index files and tells the cache to refresh its object if it is older "
-"than the given number of seconds. Debian updates its index files daily so "
-"the default is 1 day. <literal>No-Store</literal> specifies that the cache "
-"should never store this request, it is only set for archive files. This may "
-"be useful to prevent polluting a proxy cache with very large .deb files. "
-"Note: Squid 2.0.2 does not support any of these options."
+"caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
+"response under any circumstances.  <literal>Max-Age</literal> sets the "
+"allowed maximum age (in seconds) of an index file in the cache of the "
+"proxy.  <literal>No-Store</literal> specifies that the proxy should not "
+"store the requested archive files in its cache, which can be used to prevent "
+"the proxy from polluting its cache with (big) .deb files."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:340 apt.conf.5.xml:404
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:377 apt.conf.5.xml:449
 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."
+"method; this value applies to the connection as well as the data timeout."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:343
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:380
 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."
+"The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
+"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
+"g. on high-latency connections. It specifies how many requests are sent in a "
+"pipeline.  Previous APT versions had a default of 10 for this setting, but "
+"the default value is now 0 (= disabled) to avoid problems with the ever-"
+"growing amount of webservers and proxies which choose to not conform to the "
+"HTTP/1.1 specification."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:351
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:387
+msgid ""
+"<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
+"follow redirects, which is enabled by default."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:390
 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 "
-"which deactivates the limit and tries uses as much as possible of the "
-"bandwidth (Note that this option implicit deactivates the download from "
-"multiple servers at the same time.)"
+"literal> which accepts integer values in kilobytes. The default value is 0 "
+"which deactivates the limit and tries to use all available bandwidth (note "
+"that this option implicitly disables downloading from multiple servers at "
+"the same time.)"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:356
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:395
 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 ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:362
-msgid "https"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:363
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:403
 msgid ""
-"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
-"options are the same as for <literal>http</literal> method and will also "
-"default to the options from the <literal>http</literal> method if they are "
-"not explicitly set for https. <literal>Pipeline-Depth</literal> option is "
-"not supported yet."
+"The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
+"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
+"<literal>proxy</literal> options work for HTTPS URIs in the same way as for "
+"the <literal>http</literal> method, and default to the same values if they "
+"are not explicitly set. The <literal>Pipeline-Depth</literal> option is not "
+"yet supported."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:369
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:411
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
-"about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is "
+"about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
 "corresponding per-host option.  <literal>Verify-Peer</literal> boolean "
-"suboption determines whether verify server's host certificate against "
-"trusted certificates or not.  <literal>&lt;host&gt;::Verify-Peer</literal> "
-"is corresponding per-host option.  <literal>Verify-Host</literal> boolean "
-"suboption determines whether verify server's hostname or not.  <literal>&lt;"
-"host&gt;::Verify-Host</literal> is corresponding per-host option.  "
-"<literal>SslCert</literal> determines what certificate to use for client "
-"authentication. <literal>&lt;host&gt;::SslCert</literal> is corresponding "
-"per-host option.  <literal>SslKey</literal> determines what private key to "
-"use for client authentication. <literal>&lt;host&gt;::SslKey</literal> is "
-"corresponding per-host option.  <literal>SslForceVersion</literal> overrides "
-"default SSL version to use.  Can contain 'TLSv1' or 'SSLv3' string.  "
-"<literal>&lt;host&gt;::SslForceVersion</literal> is corresponding per-host "
-"option."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:387 sources.list.5.xml:171
-msgid "ftp"
+"suboption determines whether or not the server's host certificate should be "
+"verified against trusted certificates.  <literal>&lt;host&gt;::Verify-Peer</"
+"literal> is the corresponding per-host option.  <literal>Verify-Host</"
+"literal> boolean suboption determines whether or not the server's hostname "
+"should be verified.  <literal>&lt;host&gt;::Verify-Host</literal> is the "
+"corresponding per-host option.  <literal>SslCert</literal> determines what "
+"certificate to use for client authentication. <literal>&lt;host&gt;::"
+"SslCert</literal> is the corresponding per-host option.  <literal>SslKey</"
+"literal> determines what private key to use for client authentication. "
+"<literal>&lt;host&gt;::SslKey</literal> is the corresponding per-host "
+"option.  <literal>SslForceVersion</literal> overrides default SSL version to "
+"use.  It can contain either of the strings '<literal>TLSv1</literal>' or "
+"'<literal>SSLv3</literal>'.  <literal>&lt;host&gt;::SslForceVersion</"
+"literal> is the corresponding per-host option."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:388
-msgid ""
-"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
-"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
-"proxies can also be specified by using the form <literal>ftp::Proxy::&lt;"
-"host&gt;</literal> with the special keyword <literal>DIRECT</literal> "
-"meaning to use no proxies. If no one of the above settings is specified, "
-"<envar>ftp_proxy</envar> environment variable will be used. To use a ftp "
-"proxy you will have to set the <literal>ftp::ProxyLogin</literal> script in "
-"the configuration file. This entry specifies the commands to send to tell "
-"the proxy server what to connect to. Please see &configureindex; for an "
-"example of how to do this. The substitution variables available are <literal>"
-"$(PROXY_USER)</literal> <literal>$(PROXY_PASS)</literal> <literal>"
-"$(SITE_USER)</literal> <literal>$(SITE_PASS)</literal> <literal>$(SITE)</"
-"literal> and <literal>$(SITE_PORT)</literal> Each is taken from it's "
-"respective URI component."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:432
+msgid ""
+"<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
+"It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
+"literal>.  Per host proxies can also be specified by using the form "
+"<literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
+"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
+"settings is specified, <envar>ftp_proxy</envar> environment variable will be "
+"used. To use an 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 representing the corresponding URI component 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>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:407
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:452
 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 "
-"some situations require that passive mode be disabled and port mode ftp used "
-"instead. This can be done globally, for connections that go through a proxy "
-"or for a specific host (See the sample config file for examples)."
+"to leave passive mode on; it works in nearly every environment.  However, "
+"some situations require that passive mode be disabled and port mode FTP used "
+"instead. This can be done globally or for connections that go through a "
+"proxy or for a specific host (see the sample config file for examples)."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:414
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:459
 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 "
+"envar> environment variable to an HTTP URL - see the discussion of the http "
 "method above for syntax. You cannot set this in the configuration file and "
 "it is not recommended to use FTP over HTTP due to its low efficiency."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:419
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:464
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4855,131 +2814,111 @@ msgid ""
 "that most FTP servers do not support RFC2428."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:426 sources.list.5.xml:153
-msgid "cdrom"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:432
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
+#: apt.conf.5.xml:478
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:427
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:473
 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 "
-"drive as specified in <filename>/etc/fstab</filename>. It is possible to "
-"provide alternate mount and unmount commands if your mount point cannot be "
-"listed in the fstab (such as an SMB mount and old mount packages). The "
+"For URIs using the <literal>cdrom</literal> method, the only configurable "
+"option is the mount point, <literal>cdrom::Mount</literal>, which must be "
+"the mount point for the CD-ROM (or DVD, or whatever) drive as specified in "
+"<filename>/etc/fstab</filename>. It is possible to provide alternate mount "
+"and unmount commands if your mount point cannot be listed in the fstab.  The "
 "syntax is to put <placeholder type=\"literallayout\" id=\"0\"/> within the "
-"cdrom block. It is important to have the trailing slash. Unmount commands "
-"can be specified using UMount."
+"<literal>cdrom</literal> block. It is important to have the trailing slash.  "
+"Unmount commands can be specified using UMount."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:437
-msgid "gpgv"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:438
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:486
 msgid ""
-"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
-"parameters to gpgv.  <literal>gpgv::Options</literal> Additional options "
-"passed to gpgv."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:443
-msgid "CompressionTypes"
+"For GPGV URIs the only configurable option is <literal>gpgv::Options</"
+"literal>, which passes additional parameters to gpgv."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:449
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
+#: apt.conf.5.xml:497
 #, 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:444
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:492
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
-"compression formats.  Per default the acquire methods can decompress "
+"compression formats.  By default the acquire methods can decompress "
 "<command>bzip2</command>, <command>lzma</command> and <command>gzip</"
-"command> compressed files, with this setting more formats can be added on "
+"command> compressed files; with this setting more formats can be added on "
 "the fly or the used method can be changed. The syntax for this is: "
 "<placeholder type=\"synopsis\" id=\"0\"/>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:454
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
+#: apt.conf.5.xml:502
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:457
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
+#: apt.conf.5.xml:505
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:450
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:498
 msgid ""
-"Also the <literal>Order</literal> subgroup can be used to define in which "
+"Also, the <literal>Order</literal> subgroup can be used to define in which "
 "order the acquire system will try to download the compressed files. The "
 "acquire system will try the first and proceed with the next compression type "
-"in this list on error, so to prefer one over the other type simple add the "
-"preferred type at first - not already added default types will be added at "
-"run time to the end of the list, so e.g. <placeholder type=\"synopsis\" id="
+"in this list on error, so to prefer one over the other type simply add the "
+"preferred type first - default types not already added will be implicitly "
+"appended to the end of the list, so e.g. <placeholder type=\"synopsis\" id="
 "\"0\"/> can be used to prefer <command>gzip</command> compressed files over "
 "<command>bzip2</command> and <command>lzma</command>.  If <command>lzma</"
 "command> should be preferred over <command>gzip</command> and "
-"<command>bzip2</command> the configure setting should look like this "
+"<command>bzip2</command> the configure setting should look like this: "
 "<placeholder type=\"synopsis\" id=\"1\"/> It is not needed to add "
-"<literal>bz2</literal> explicit to the list as it will be added automatic."
+"<literal>bz2</literal> to the list explicitly as it will be added "
+"automatically."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:461
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
+#: apt.conf.5.xml:512
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:459
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:507
 msgid ""
-"Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
-"replaceable></literal> will be checked: If this setting exists the method "
-"will only be used if this file exists, e.g. for the bzip2 method (the "
-"inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note "
-"also that list entries specified on the command line will be added at the "
-"end of the list specified in the configuration files, but before the default "
-"entries. To prefer a type in this case over the ones specified in the "
-"configuration files you can set the option direct - not in list style.  This "
-"will not override the defined list, it will only prefix the list with this "
-"type."
+"Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
+"literal> will be checked at run time. If this option has been set, the "
+"method will only be used if this file exists; e.g. for the <literal>bzip2</"
+"literal> method (the inbuilt) setting is: <placeholder type=\"literallayout"
+"\" id=\"0\"/> Note also that list entries specified on the command line will "
+"be added at the end of the list specified in the configuration files, but "
+"before the default entries. To prefer a type in this case over the ones "
+"specified in the configuration files you can set the option direct - not in "
+"list style.  This will not override the defined list; it will only prefix "
+"the list with this type."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:466
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:517
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "
 "uncompressed files so this is mostly only useable for local mirrors."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:471
-msgid "GzipIndexes"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:473
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:524
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -4987,92 +2926,87 @@ msgid ""
 "CPU requirements when building the local package caches. False by default."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:480
-msgid "Languages"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:481
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:532
 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 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."
+"files are downloaded and in which order APT tries to display the description-"
+"translations. APT will try to display the first available description in the "
+"language which is listed first. Languages can be defined with their short or "
+"long language codes. Note that not all archives provide "
+"<filename>Translation</filename> files for every language - the long "
+"language codes are especially rare."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:497
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
+#: apt.conf.5.xml:549
 #, 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:487
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:537
 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>environment</literal>\" has a special meaning here: it will be "
+"replaced at runtime with the language codes 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::"
+"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 "
-"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\"/>"
+"meaning code which will stop the search for a suitable "
+"<filename>Translation</filename> file.  This tells APT to download these "
+"translations too, without actually using them unless the environment "
+"specifies the languages. So the following example configuration will result "
+"in the order \"en, de\" in an English locale or \"de, en\" in a German one. "
+"Note that \"fr\" is downloaded, but not used unless APT is used in a French "
+"locale (where the order would be \"fr, de, en\").  <placeholder type="
+"\"programlisting\" id=\"0\"/>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:253
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:550
 msgid ""
-"The <literal>Acquire</literal> group of options controls the download of "
-"packages and the URI handlers.  <placeholder type=\"variablelist\" id=\"0\"/>"
+"Note: To prevent problems resulting from APT being executed in different "
+"environments (e.g. by different users or by other programs) all Translation "
+"files which are found in <filename>/var/lib/apt/lists/</filename> will be "
+"added to the end of the list (after an implicit \"<literal>none</literal>\")."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:504
+#: apt.conf.5.xml:560
 msgid "Directories"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:506
+#: apt.conf.5.xml:562
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
 "downloaded package lists in and <literal>status</literal> is the name of the "
-"dpkg status file.  <literal>preferences</literal> is the name of the APT "
-"preferences file.  <literal>Dir::State</literal> contains the default "
-"directory to prefix on all sub items if they do not start with <filename>/</"
-"filename> or <filename>./</filename>."
+"&dpkg; status file.  <literal>preferences</literal> is the name of the APT "
+"<filename>preferences</filename> file.  <literal>Dir::State</literal> "
+"contains the default directory to prefix on all sub-items if they do not "
+"start with <filename>/</filename> or <filename>./</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:513
+#: apt.conf.5.xml:569
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
 "and <literal>pkgcache</literal> as well as the location to place downloaded "
 "archives, <literal>Dir::Cache::archives</literal>. Generation of caches can "
-"be turned off by setting their names to be blank. This will slow down "
-"startup but save disk space. It is probably preferred to turn off the "
+"be turned off by setting their names to the empty string. This will slow "
+"down startup but save disk space. It is probably preferable to turn off the "
 "pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the "
 "default directory is contained in <literal>Dir::Cache</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:522
+#: apt.conf.5.xml:578
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -5082,7 +3016,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:528
+#: apt.conf.5.xml:584
 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 "
@@ -5090,7 +3024,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:532
+#: apt.conf.5.xml:588
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
@@ -5101,7 +3035,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:540
+#: apt.conf.5.xml:596
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
@@ -5114,7 +3048,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:553
+#: apt.conf.5.xml:609
 msgid ""
 "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
 "which files APT should silently ignore while parsing the files in the "
@@ -5125,121 +3059,93 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:562
+#: apt.conf.5.xml:618
 msgid "APT in DSelect"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:564
+#: apt.conf.5.xml:620
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
-"control the default behaviour. These are in the <literal>DSelect</literal> "
+"control the default behavior. These are in the <literal>DSelect</literal> "
 "section."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:568
-msgid "Clean"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:569
+#: apt.conf.5.xml:625
 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 "
-"upgrading, prompt (the default) does so conditionally.  auto removes only "
-"those packages which are no longer downloadable (replaced with a new version "
-"for instance).  pre-auto performs this action before downloading new "
-"packages."
+"Cache Clean mode; this value may be one of <literal>always</literal>, "
+"<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
+"literal> and <literal>never</literal>.  <literal>always</literal> and "
+"<literal>prompt</literal> will remove all packages from the cache after "
+"upgrading, <literal>prompt</literal> (the default) does so conditionally.  "
+"<literal>auto</literal> removes only those packages which are no longer "
+"downloadable (replaced with a new version for instance).  <literal>pre-auto</"
+"literal> performs this action before downloading new packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:578
+#: apt.conf.5.xml:639
 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:582
-msgid "Updateoptions"
+"The contents of this variable are passed to &apt-get; as command line "
+"options when it is run for the install phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:583
+#: apt.conf.5.xml:644
 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:587
-msgid "PromptAfterUpdate"
+"The contents of this variable are passed to &apt-get; as command line "
+"options when it is run for the update phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:588
+#: apt.conf.5.xml:649
 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:594
-msgid "How APT calls dpkg"
+#: apt.conf.5.xml:655
+msgid "How APT calls &dpkg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:595
+#: apt.conf.5.xml:656
 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:600
+#: apt.conf.5.xml:661
 msgid ""
-"This is a list of options to pass to dpkg. The options must be specified "
+"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 "
 "&dpkg;."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:605
-msgid "Pre-Invoke"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:605
-msgid "Post-Invoke"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:606
+#: apt.conf.5.xml:667
 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 "
-"commands are invoked in order using <filename>/bin/sh</filename>, should any "
+"commands are invoked in order using <filename>/bin/sh</filename>; should any "
 "fail APT will abort."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:612
-msgid "Pre-Install-Pkgs"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:613
+#: apt.conf.5.xml:674
 msgid ""
-"This is a list of shell commands to run before invoking dpkg. Like "
+"This is a list of shell commands to run before invoking &dpkg;. Like "
 "<literal>options</literal> this must be specified in list notation. The "
-"commands are invoked in order using <filename>/bin/sh</filename>, should any "
-"fail APT will abort. APT will pass to the commands on standard input the "
-"filenames of all .deb files it is going to install, one per line."
+"commands are invoked in order using <filename>/bin/sh</filename>; should any "
+"fail APT will abort. APT will pass the filenames of all .deb files it is "
+"going to install to the commands, one per line on standard input."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:619
+#: apt.conf.5.xml:680
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
@@ -5248,52 +3154,42 @@ msgid ""
 "given to <literal>Pre-Install-Pkgs</literal>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:626
-msgid "Run-Directory"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:627
+#: apt.conf.5.xml:688
 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:631
-msgid "Build-options"
+"APT chdirs to this directory before invoking &dpkg;, the default is "
+"<filename>/</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:632
+#: apt.conf.5.xml:693
 msgid ""
-"These options are passed to &dpkg-buildpackage; when compiling packages, the "
+"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:637
+#: apt.conf.5.xml:698
 msgid "dpkg trigger usage (and related options)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:638
+#: apt.conf.5.xml:699
 msgid ""
-"APT can call dpkg in a way so it can make aggressive use of triggers over "
-"multiple calls of dpkg. Without further options dpkg will use triggers only "
-"in between his own run. Activating these options can therefore decrease the "
-"time needed to perform the install / upgrade. Note that it is intended to "
-"activate these options per default in the future, but as it changes the way "
-"APT calling dpkg drastically it needs a lot more testing.  <emphasis>These "
-"options are therefore currently experimental and should not be used in "
-"productive environments.</emphasis> Also it breaks the progress reporting so "
-"all frontends will currently stay around half (or more) of the time in the "
-"100% state while it actually configures all packages."
+"APT can call &dpkg; in such a way as to let it make aggressive use of "
+"triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
+"use triggers once each time it runs.  Activating these options can therefore "
+"decrease the time needed to perform the install or upgrade. Note that it is "
+"intended to activate these options per default in the future, but as it "
+"drastically changes the way APT calls &dpkg; it needs a lot more testing.  "
+"<emphasis>These options are therefore currently experimental and should not "
+"be used in production environments.</emphasis> It also breaks progress "
+"reporting such that all front-ends will currently stay around half (or more) "
+"of the time in the 100% state while it actually configures all packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:653
+#: apt.conf.5.xml:714
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
@@ -5303,112 +3199,72 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:647
+#: apt.conf.5.xml:708
 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 "
 "understand the current risks and problems with these options, but are brave "
-"enough to help testing them create a new configuration file and test a "
+"enough to help testing them, create a new configuration file and test a "
 "combination of options. Please report any bugs, problems and improvements "
 "you encounter and make sure to note which options you have used in your "
-"reports. Asking dpkg for help could also be useful for debugging proposes, "
+"reports. Asking &dpkg; for help could also be useful for debugging proposes, "
 "see e.g. <command>dpkg --audit</command>. A defensive option combination "
 "would be <placeholder type=\"literallayout\" id=\"0\"/>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:659
-msgid "DPkg::NoTriggers"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:660
+#: apt.conf.5.xml:721
 msgid ""
-"Add the no triggers flag to all dpkg calls (except the ConfigurePending "
+"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 "
-"short: dpkg will not run the triggers when this flag is present unless it is "
-"explicitly called to do so in an extra call.  Note that this option exists "
-"(undocumented) also in older apt versions with a slightly different meaning: "
-"Previously these option only append --no-triggers to the configure calls to "
-"dpkg - now apt will add these flag also to the unpack and remove calls."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:667
-msgid "PackageManager::Configure"
+"short: &dpkg; will not run the triggers when this flag is present unless it "
+"is explicitly called to do so in an extra call.  Note that this option "
+"exists (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 also add this flag to the unpack and remove "
+"calls."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:729
 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 rely on dpkg for configuration (which will at the moment fail if a "
-"Pre-Depends is encountered).  Setting this option to another than the all "
-"value will implicitly activate also the next option per default as otherwise "
-"the system could end in an unconfigured status which could be unbootable!"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:678
-msgid "DPkg::ConfigurePending"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:679
-msgid ""
-"If this option is set apt will call <command>dpkg --configure --pending</"
-"command> to let dpkg handle all required configurations and triggers. This "
-"option is activated automatic per default if the previous option is not set "
-"to <literal>all</literal>, but deactivating could be useful if you want to "
-"run APT multiple times in a row - e.g. in an installer. In these sceneries "
-"you could deactivate this option in all but the last run."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:685
-msgid "DPkg::TriggersPending"
+"and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
+"\", which causes APT to configure all packages. The \"<literal>smart</"
+"literal>\" way is to configure only packages which need to be configured "
+"before another package can be unpacked (Pre-Depends), and let the rest be "
+"configured by &dpkg; with a call generated by the ConfigurePending option "
+"(see below). On the other hand, \"<literal>no</literal>\" will not configure "
+"anything, and totally relies on &dpkg; for configuration (which at the "
+"moment will fail if a Pre-Depends is encountered). Setting this option to "
+"any value other than <literal>all</literal> will implicitly also activate "
+"the next option by default, as otherwise the system could end in an "
+"unconfigured and potentially unbootable state."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:686
+#: apt.conf.5.xml:744
 msgid ""
-"Useful for <literal>smart</literal> configuration as a package which has "
-"pending triggers is not considered as <literal>installed</literal> and dpkg "
-"treats them as <literal>unpacked</literal> currently which is a dealbreaker "
-"for Pre-Dependencies (see debbugs #526774). Note that this will process all "
-"triggers, not only the triggers needed to configure this package."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:691
-msgid "PackageManager::UnpackAll"
+"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 automatically per default if the previous option is not "
+"set to <literal>all</literal>, but deactivating it could be useful if you "
+"want to run APT multiple times in a row - e.g. in an installer. In these "
+"sceneries you could deactivate this option in all but the last run."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:692
+#: apt.conf.5.xml:751
 msgid ""
-"As the configuration can be deferred to be done at the end by dpkg it can be "
-"tried to order the unpack series only by critical needs, e.g. by Pre-"
-"Depends. Default is true and therefore the \"old\" method of ordering in "
-"various steps by everything. While both method were present in earlier APT "
-"versions the <literal>OrderCritical</literal> method was unused, so this "
-"method is very experimental and needs further improvements before becoming "
-"really useful."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:699
-msgid "OrderList::Score::Immediate"
+"Useful for the <literal>smart</literal> configuration as a package which has "
+"pending triggers is not considered as <literal>installed</literal>, and "
+"&dpkg; treats them as <literal>unpacked</literal> currently which is a "
+"showstopper for Pre-Dependencies (see debbugs #526774). Note that this will "
+"process all triggers, not only the triggers needed to configure this package."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:707
+#: apt.conf.5.xml:764
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
@@ -5420,40 +3276,40 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:700
+#: apt.conf.5.xml:757
 msgid ""
-"Essential packages (and there dependencies) should be configured immediately "
-"after unpacking. It will be a good idea to do this quite early in the "
-"upgrade process as these these configure calls require currently also "
-"<literal>DPkg::TriggersPending</literal> which will run quite a few triggers "
-"(which maybe not needed). Essentials get per default a high score but the "
-"immediate flag is relatively low (a package which has a Pre-Depends is "
-"higher rated).  These option and the others in the same group can be used to "
-"change the scoring. The following example shows the settings with there "
-"default values.  <placeholder type=\"literallayout\" id=\"0\"/>"
+"Essential packages (and their dependencies) should be configured immediately "
+"after unpacking. It is a good idea to do this quite early in the upgrade "
+"process as these configure calls also currently require <literal>DPkg::"
+"TriggersPending</literal> which will run quite a few triggers (which may not "
+"be needed). Essentials get per default a high score but the immediate flag "
+"is relatively low (a package which has a Pre-Depends is rated higher).  "
+"These option and the others in the same group can be used to change the "
+"scoring. The following example shows the settings with their default "
+"values.  <placeholder type=\"literallayout\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:720
+#: apt.conf.5.xml:777
 msgid "Periodic and Archives options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:721
+#: apt.conf.5.xml:778
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
-"of options configure behavior of apt periodic updates, which is done by "
-"<literal>/etc/cron.daily/apt</literal> script. See header of this script for "
-"the brief documentation of these options."
+"of options configure behavior of apt periodic updates, which is done by the "
+"<literal>/etc/cron.daily/apt</literal> script. See the top of this script "
+"for the brief documentation of these options."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:729
+#: apt.conf.5.xml:786
 msgid "Debug options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:731
+#: apt.conf.5.xml:788
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -5464,7 +3320,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:742
+#: apt.conf.5.xml:799
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -5472,7 +3328,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:750
+#: apt.conf.5.xml:807
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
@@ -5480,7 +3336,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:759
+#: apt.conf.5.xml:816
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -5490,220 +3346,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:767
+#: apt.conf.5.xml:824
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
-"in CDROM IDs."
+"in CD-ROM IDs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:777
+#: apt.conf.5.xml:834
 msgid "A full list of debugging options to apt follows."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:782
-#, 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:786
+#: apt.conf.5.xml:843
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:793
-#, 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:797
+#: apt.conf.5.xml:854
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:804
-#, 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:808
+#: apt.conf.5.xml:865
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:815
-#, 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:819
+#: apt.conf.5.xml:876
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:826
-#, 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:830
+#: apt.conf.5.xml:887
 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:837
-#, 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:841
+#: apt.conf.5.xml:898
 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:848
-#, 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:851
+#: apt.conf.5.xml:908
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:858
-#, 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:861
+#: apt.conf.5.xml:918
 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:868
-#, 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:871
+#: apt.conf.5.xml:928
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
 "a CD-ROM."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:879
-#, 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:882
+#: apt.conf.5.xml:939
 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:890
-#, 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:894
+#: apt.conf.5.xml:951
 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:901
-#, 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:904
+#: apt.conf.5.xml:961
 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:911
-#, 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:914
+#: apt.conf.5.xml:971
 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:922
-#, 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:926
+#: apt.conf.5.xml:983
 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:933
-#, 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:937
+#: apt.conf.5.xml:994
 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:944
-msgid "<literal>Debug::pkgAutoRemove</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:948
+#: apt.conf.5.xml:1005
 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:955
-msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:958
+#: apt.conf.5.xml:1015
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
@@ -5712,170 +3468,99 @@ msgid ""
 "pkgProblemResolver</literal> for that."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:969
-msgid "<literal>Debug::pkgDepCache::Marker</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:972
+#: apt.conf.5.xml:1029
 msgid ""
-"Generate debug messages describing which package is marked as keep/install/"
+"Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
-"may trigger additional actions; they are shown indented two additional space "
-"under the original entry.  The format for each line is <literal>MarkKeep</"
-"literal>, <literal>MarkDelete</literal> or <literal>MarkInstall</literal> "
-"followed by <literal>package-name &lt;a.b.c -&gt; d.e.f | x.y.z&gt; (section)"
-"</literal> where <literal>a.b.c</literal> is the current version of the "
-"package, <literal>d.e.f</literal> is the version considered for installation "
-"and <literal>x.y.z</literal> is a newer version, but not considered for "
-"installation (because of a low pin score). The later two can be omitted if "
-"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 ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:991
-#, 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:994
-msgid "Dump the default configuration to standard error on startup."
+"may trigger additional actions; they are shown indented two additional "
+"spaces under the original entry.  The format for each line is "
+"<literal>MarkKeep</literal>, <literal>MarkDelete</literal> or "
+"<literal>MarkInstall</literal> followed by <literal>package-name &lt;a.b.c -"
+"&gt; d.e.f | x.y.z&gt; (section)</literal> where <literal>a.b.c</literal> is "
+"the current version of the package, <literal>d.e.f</literal> is the version "
+"considered for installation and <literal>x.y.z</literal> is a newer version, "
+"but not considered for installation (because of a low pin score). The later "
+"two can be omitted if there is none or if it is the same as the installed "
+"version.  <literal>section</literal> is the name of the section the package "
+"appears in."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1001
-#, 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:1004
+#: apt.conf.5.xml:1050
 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:1012
-msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1015
+#: apt.conf.5.xml:1061
 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:1022
-#, 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:1026
+#: apt.conf.5.xml:1072
 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:1034
-#, 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:1038
+#: apt.conf.5.xml:1084
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1045
-#, 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:1049
+#: apt.conf.5.xml:1095
 msgid "Output the priority of each package list on startup."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1055
-msgid "<literal>Debug::pkgProblemResolver</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1059
+#: apt.conf.5.xml:1105
 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:1067
-msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1070
+#: apt.conf.5.xml:1116
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
 "described in <literal>Debug::pkgDepCache::Marker</literal>"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1078
-#, 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:1082
+#: apt.conf.5.xml:1128
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><title>
+#: apt.conf.5.xml:1150 apt_preferences.5.xml:545 sources.list.5.xml:211
+#: apt-ftparchive.1.xml:596
+#, fuzzy
+msgid "Examples"
+msgstr "Exemplos"
+
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1105
+#: apt.conf.5.xml:1151
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1112
-msgid "&file-aptconf;"
-msgstr ""
-
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1117
+#: apt.conf.5.xml:1163
 #, fuzzy
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
-#.  The last update date 
-#. type: Content of: <refentry><refentryinfo>
-#: apt_preferences.5.xml:16
-msgid ""
-"&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"
-msgstr ""
-
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt_preferences.5.xml:24 apt_preferences.5.xml:31
-#, fuzzy
-msgid "apt_preferences"
-msgstr "apt_preferences"
-
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt_preferences.5.xml:32
 #, fuzzy
@@ -5904,9 +3589,9 @@ msgid ""
 "example, <literal>stable</literal> and <literal>testing</literal>).  APT "
 "assigns a priority to each version that is available.  Subject to dependency "
 "constraints, <command>apt-get</command> selects the version with the highest "
-"priority for installation.  The APT preferences file overrides the "
-"priorities that APT assigns to package versions by default, thus giving the "
-"user control over which one is selected for installation."
+"priority for installation.  The APT preferences override the priorities that "
+"APT assigns to package versions by default, thus giving the user control "
+"over which one is selected for installation."
 msgstr ""
 "Diversas versões de um pacote podem estar disponíveis para instalação quando "
 "o arquivo &sources-list; contém referências para mais de uma distribuição "
@@ -5925,8 +3610,8 @@ msgid ""
 "Several instances of the same version of a package may be available when the "
 "&sources-list; file contains references to more than one source.  In this "
 "case <command>apt-get</command> downloads the instance listed earliest in "
-"the &sources-list; file.  The APT preferences file does not affect the "
-"choice of instance, only the choice of version."
+"the &sources-list; file.  The APT preferences do not affect the choice of "
+"instance, only the choice of version."
 msgstr ""
 "Diversas instâncias da mesma versão de um pacote pode estar disponíveis "
 "quando o arquivo &sources-list; contém referências a mais de uma fonte. "
@@ -5939,13 +3624,13 @@ msgstr ""
 msgid ""
 "Preferences are a strong power in the hands of a system administrator but "
 "they can become also their biggest nightmare if used without care! APT will "
-"not questioning the preferences so wrong settings will therefore lead to "
-"uninstallable packages or wrong decisions while upgrading packages.  Even "
-"more problems will arise if multiply distribution releases are mixed without "
-"a good understanding of the following paragraphs.  Packages included in a "
-"specific release aren't tested in and therefore doesn't always work as "
-"expected in older or newer releases or together with other packages from "
-"different releases.  You have been warned."
+"not question the preferences, so wrong settings can lead to uninstallable "
+"packages or wrong decisions while upgrading packages.  Even more problems "
+"will arise if multiple distribution releases are mixed without a good "
+"understanding of the following paragraphs.  Packages included in a specific "
+"release aren't tested in (and therefore don't always work as expected in) "
+"older or newer releases, or together with other packages from different "
+"releases.  You have been warned."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -5956,8 +3641,8 @@ msgid ""
 "following naming convention: The files have either no or \"<literal>pref</"
 "literal>\" as filename extension and only contain alphanumeric, hyphen (-), "
 "underscore (_) and period (.) characters.  Otherwise APT will print a notice "
-"that it has ignored a file if the file doesn't match a pattern in the "
-"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
+"that it has ignored a file, unless that file matches a pattern in the "
+"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in which "
 "case it will be silently ignored."
 msgstr ""
 
@@ -6008,6 +3693,17 @@ msgstr ""
 "<command>apt-get</command> ou no arquivo de configuração do APT <filename>/"
 "etc/apt/apt.conf</filename>. Por exemplo,"
 
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:101
+#, fuzzy
+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:"
+msgstr ""
+"Caso uma versão alvo tenha sido especificada o APT usará o seguinte "
+"algoritmo para definir as prioridades das instâncias de um pacote. "
+"Atribuirá :"
+
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml:106
 #, fuzzy
@@ -6019,7 +3715,7 @@ msgstr "prioridade 100"
 msgid ""
 "to the versions coming from archives which in their <filename>Release</"
 "filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
-"emphasis> as \"ButAutomaticUpgrades: yes\" like the debian "
+"emphasis> as \"ButAutomaticUpgrades: yes\" like the Debian "
 "<literal>experimental</literal> archive."
 msgstr ""
 
@@ -6034,7 +3730,7 @@ msgstr "prioridade 100"
 msgid ""
 "to the version that is already installed (if any) and to the versions coming "
 "from archives which in their <filename>Release</filename> files are marked "
-"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the debian "
+"as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the Debian "
 "backports archive since <literal>squeeze-backports</literal>."
 msgstr ""
 
@@ -6068,18 +3764,6 @@ 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:101
-#, fuzzy
-msgid ""
-"If the target release has been specified then APT uses the following "
-"algorithm to set the priorities of the versions of a package.  Assign: "
-"<placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-"Caso uma versão alvo tenha sido especificada o APT usará o seguinte "
-"algoritmo para definir as prioridades das instâncias de um pacote. "
-"Atribuirá :"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt_preferences.5.xml:132
 #, fuzzy
 msgid ""
@@ -6226,10 +3910,11 @@ msgstr ""
 #, fuzzy
 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 "
-"following record assigns a high priority to all versions of the "
+"specified packages with a specified version or version range.  For example, "
+"the following record assigns a high priority to all versions of the "
 "<filename>perl</filename> package whose version number begins with "
-"\"<literal>5.8</literal>\".  Multiple packages can be separated by spaces."
+"\"<literal>&good-perl;</literal>\".  Multiple packages can be separated by "
+"spaces."
 msgstr ""
 "A forma específica atribui uma uma prioridade (uma \"Pin-Priority\") para um "
 "pacote e versão ou faixa de versão especificados. Por exemplo, o registro a "
@@ -6242,7 +3927,7 @@ msgstr ""
 #, fuzzy, no-wrap
 msgid ""
 "Package: perl\n"
-"Pin: version 5.8*\n"
+"Pin: version &good-perl;*\n"
 "Pin-Priority: 1001\n"
 msgstr ""
 "<programlisting>\n"
@@ -6387,7 +4072,7 @@ msgstr ""
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
-"and whose release Version number is \"<literal>3.0</literal>\"."
+"and whose release Version number is \"<literal>&stable-version;</literal>\"."
 msgstr ""
 "O registro a seguir atribui uma prioridade alta para todas as versões de "
 "pacotes que pertençam a qualquer versão cujo nome do Repositório seja "
@@ -6399,7 +4084,7 @@ msgstr ""
 #, fuzzy, no-wrap
 msgid ""
 "Package: *\n"
-"Pin: release a=stable, v=3.0\n"
+"Pin: release a=stable, v=&stable-version;\n"
 "Pin-Priority: 500\n"
 msgstr ""
 "<programlisting>\n"
@@ -6409,17 +4094,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt_preferences.5.xml:262
-msgid "Regular expressions and glob() syntax"
+msgid "Regular expressions and &glob; syntax"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt_preferences.5.xml:264
 msgid ""
-"APT also supports pinning by glob() expressions and regular expressions "
-"surrounded by /. For example, the following example assigns the priority 500 "
-"to all packages from experimental where the name starts with gnome (as a glob"
-"()-like expression) or contains the word kde (as a POSIX extended regular "
-"expression surrounded by slashes)."
+"APT also supports pinning by &glob; expressions, and regular expressions "
+"surrounded by slashes. For example, the following example assigns the "
+"priority 500 to all packages from experimental where the name starts with "
+"gnome (as a &glob;-like expression) or contains the word kde (as a POSIX "
+"extended regular expression surrounded by slashes)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
@@ -6440,7 +4125,7 @@ msgstr ""
 msgid ""
 "The rule for those expressions is that they can occur anywhere where a "
 "string can occur. Thus, the following pin assigns the priority 990 to all "
-"packages from a release starting with karmic."
+"packages from a release starting with &ubuntu-codename;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
@@ -6448,7 +4133,7 @@ msgstr ""
 #, fuzzy, no-wrap
 msgid ""
 "Package: *\n"
-"Pin: release n=karmic*\n"
+"Pin: release n=&ubuntu-codename;*\n"
 "Pin-Priority: 990\n"
 msgstr ""
 "<programlisting>\n"
@@ -6456,30 +4141,42 @@ msgstr ""
 "Pin: release a=unstable\n"
 "Pin-Priority: 50\n"
 
-#. type: Content of: <refentry><refsect1><refsect2><literal>
-#: apt_preferences.5.xml:290
-msgid "Package"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><literal>
-#: apt_preferences.5.xml:296
-msgid "*"
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:291
+msgid ""
+"If a regular expression occurs in a <literal>Package</literal> field, the "
+"behavior is the same as if this regular expression were replaced with a list "
+"of all package names it matches. It is undecided whether this will change in "
+"the future; thus you should always list wild-card pins first, so later "
+"specific pins override it.  The pattern \"<literal>*</literal>\" in a "
+"Package field is not considered a &glob; expression in itself."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:307
 #, fuzzy
 msgid "How APT Interprets Priorities"
 msgstr "Como o APT Interpreta Prioridades"
 
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:310
+#, fuzzy
+msgid ""
+"Priorities (P) assigned in the APT preferences file must be positive or "
+"negative integers.  They are interpreted as follows (roughly speaking):"
+msgstr ""
+"Prioridades (P) atribuídas no arquivo de preferências do APT devem ser "
+"números inteiros positivos ou negativos. Eles são interpretados como a "
+"seguir (a grosso modo):"
+
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:314
+#: apt_preferences.5.xml:315
 #, fuzzy
 msgid "P &gt; 1000"
 msgstr "P &gt; 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:315
+#: apt_preferences.5.xml:316
 #, fuzzy
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
@@ -6489,13 +4186,13 @@ msgstr ""
 "dowgrade do pacote"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:319
+#: apt_preferences.5.xml:320
 #, 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:320
+#: apt_preferences.5.xml:321
 #, fuzzy
 msgid ""
 "causes a version to be installed even if it does not come from the target "
@@ -6505,13 +4202,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:325
+#: apt_preferences.5.xml:326
 #, 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:326
+#: apt_preferences.5.xml:327
 #, fuzzy
 msgid ""
 "causes a version to be installed unless there is a version available "
@@ -6521,13 +4218,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:331
+#: apt_preferences.5.xml:332
 #, 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:332
+#: apt_preferences.5.xml:333
 #, fuzzy
 msgid ""
 "causes a version to be installed unless there is a version available "
@@ -6538,13 +4235,13 @@ msgstr ""
 "seja mais recente"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:337
+#: apt_preferences.5.xml:338
 #, 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:338
+#: apt_preferences.5.xml:339
 #, fuzzy
 msgid ""
 "causes a version to be installed only if there is no installed version of "
@@ -6554,31 +4251,19 @@ msgstr ""
 "instalada do pacote"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:342
+#: apt_preferences.5.xml:343
 #, fuzzy
 msgid "P &lt; 0"
 msgstr "P &lt; 0"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:343
+#: apt_preferences.5.xml:344
 #, 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:309
-#, fuzzy
-msgid ""
-"Priorities (P) assigned in the APT preferences file must be positive or "
-"negative integers.  They are interpreted as follows (roughly speaking): "
-"<placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-"Prioridades (P) atribuídas no arquivo de preferências do APT devem ser "
-"números inteiros positivos ou negativos. Eles são interpretados como a "
-"seguir (a grosso modo):"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:348
+#: apt_preferences.5.xml:349
 #, fuzzy
 msgid ""
 "If any specific-form records match an available package version then the "
@@ -6594,7 +4279,7 @@ msgstr ""
 "determinará a prioridade da versão do pacote."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:354
+#: apt_preferences.5.xml:355
 #, fuzzy
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
@@ -6604,11 +4289,11 @@ msgstr ""
 "registros apresentados anteriormente :"
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:358
+#: apt_preferences.5.xml:359
 #, fuzzy, no-wrap
 msgid ""
 "Package: perl\n"
-"Pin: version 5.8*\n"
+"Pin: version &good-perl;*\n"
 "Pin-Priority: 1001\n"
 "\n"
 "Package: *\n"
@@ -6633,19 +4318,19 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:371
+#: apt_preferences.5.xml:372
 msgid "Then:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:373
+#: apt_preferences.5.xml:374
 #, fuzzy
 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 "
-"\"<literal>5.8</literal>\".  If <emphasis>any</emphasis> 5.8* version of "
-"<literal>perl</literal> is available and the installed version is 5.9*, then "
-"<literal>perl</literal> will be downgraded."
+"\"<literal>&good-perl;</literal>\".  If <emphasis>any</emphasis> &good-perl;"
+"* version of <literal>perl</literal> is available and the installed version "
+"is &bad-perl;*, then <literal>perl</literal> will be downgraded."
 msgstr ""
 "A versão mais recente disponível do pacote <literal>perl</literal> será "
 "instalado, contanto que esse número de versão da versão inicie com "
@@ -6654,7 +4339,7 @@ msgstr ""
 "será feito um downgrade do <literal>perl</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:378
+#: apt_preferences.5.xml:379
 #, fuzzy
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
@@ -6666,7 +4351,7 @@ msgstr ""
 "mesmo versões pertencentes a versão alvo."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:382
+#: apt_preferences.5.xml:383
 #, fuzzy
 msgid ""
 "A version of a package whose origin is not the local system but some other "
@@ -6681,13 +4366,13 @@ msgstr ""
 "instalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:392
+#: apt_preferences.5.xml:393
 #, 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:394
+#: apt_preferences.5.xml:395
 #, fuzzy
 msgid ""
 "The locations listed in the &sources-list; file should provide "
@@ -6698,60 +4383,82 @@ msgstr ""
 "<filename>Packages</filename> e <filename>Release</filename> para descrever "
 "os pacotes disponíveis nessas localidades."
 
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:399
+#, fuzzy
+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>: for example, <filename>.../dists/stable/main/binary-i386/"
+"Packages</filename>.  It consists of a series of multi-line records, one for "
+"each package available in that directory.  Only two lines in each record are "
+"relevant for setting APT priorities:"
+msgstr ""
+"O arquivo <filename>Packages</filename> é normalmente encontrado no "
+"diretório <filename>.../dists/<replaceable>nome-distribuição</replaceable>/"
+"<replaceable>componente</replaceable>/<replaceable>arquitetura</"
+"replaceable></filename> : por exemplo, <filename>.../dists/stable/main/"
+"binary-i386/Packages</filename>. O arquivo consiste de uma série de "
+"registros de múltiplas linhas, uma para cada pacote disponível no diretório. "
+"Somente duas linhas em cada registro são relevantes para definir prioridades "
+"do APT :"
+
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:406
+#: apt_preferences.5.xml:407
 #, 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:407
+#: apt_preferences.5.xml:408
 #, 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:410 apt_preferences.5.xml:460
+#: apt_preferences.5.xml:411 apt_preferences.5.xml:461
 #, 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:411
+#: apt_preferences.5.xml:412
 #, 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:398
+#: apt_preferences.5.xml:417
 #, fuzzy
 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>: for example, <filename>.../dists/stable/main/binary-i386/"
-"Packages</filename>.  It consists of a series of multi-line records, one for "
-"each package available in that directory.  Only two lines in each record are "
-"relevant for setting APT priorities: <placeholder type=\"variablelist\" id="
-"\"0\"/>"
+"The <filename>Release</filename> file is normally found in the directory "
+"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
+"example, <filename>.../dists/stable/Release</filename>, or <filename>.../"
+"dists/&stable-codename;/Release</filename>.  It consists of a single multi-"
+"line record which applies to <emphasis>all</emphasis> of the packages in the "
+"directory tree below its parent.  Unlike the <filename>Packages</filename> "
+"file, nearly all of the lines in a <filename>Release</filename> file are "
+"relevant for setting APT priorities:"
 msgstr ""
-"O arquivo <filename>Packages</filename> é normalmente encontrado no "
-"diretório <filename>.../dists/<replaceable>nome-distribuição</replaceable>/"
-"<replaceable>componente</replaceable>/<replaceable>arquitetura</"
-"replaceable></filename> : por exemplo, <filename>.../dists/stable/main/"
-"binary-i386/Packages</filename>. O arquivo consiste de uma série de "
-"registros de múltiplas linhas, uma para cada pacote disponível no diretório. "
-"Somente duas linhas em cada registro são relevantes para definir prioridades "
+"O arquivo <filename>Release</filename> é normalmente encontrado no diretório "
+"<filename>.../dists/<replaceable>nome-distribuição</replaceable></"
+"filename> : por exemplo, <filename>.../dists/stable/Release</filename>, ou "
+"<filename>.../dists/woody/Release</filename>. O arquivo consiste de um "
+"registro de múltiplas linhas o qual se aplica a <emphasis>todos</emphasis> "
+"os pacotes na àrvore de diretórios abaixo de seu diretório pai. Diferente do "
+"arquivo <filename>Packages</filename>, quase todas as linhas em um arquivo "
+"<filename>Release</filename> são relevantes para a definição de prioridades "
 "do APT :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:427
+#: apt_preferences.5.xml:428
 #, 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:428
+#: apt_preferences.5.xml:429
 #, fuzzy
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
@@ -6769,7 +4476,7 @@ msgstr ""
 "requerer a linha :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:438
+#: apt_preferences.5.xml:439
 #, fuzzy, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr ""
@@ -6777,13 +4484,13 @@ msgstr ""
 "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:444
+#: apt_preferences.5.xml:445
 #, 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:445
+#: apt_preferences.5.xml:446
 #, fuzzy
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
@@ -6801,7 +4508,7 @@ msgstr ""
 "requerer a linha :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:455
 #, fuzzy, no-wrap
 msgid "Pin: release n=&testing-codename;\n"
 msgstr ""
@@ -6809,29 +4516,30 @@ msgstr ""
 "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:461
+#: apt_preferences.5.xml:462
 #, fuzzy
 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 "
-"no version number for the <literal>testing</literal> and <literal>unstable</"
-"literal> distributions because they have not been released yet.  Specifying "
-"this in the APT preferences file would require one of the following lines."
+"belong to Debian release version &stable-version;.  Note that there is "
+"normally no version number for the <literal>testing</literal> and "
+"<literal>unstable</literal> distributions because they have not been "
+"released yet.  Specifying this in the APT preferences file would require one "
+"of the following lines."
 msgstr ""
 "dá nome a versão da distribuição. Por exemplo, os pacote na àrvore podem "
-"pertencer a distribuição Debian GNU/Linux versão 3.0. Note que normalmente "
-"não existe número de versão para as distribuições <literal>testing</literal> "
-"e <literal>unstable</literal> devido as mesmas não terem sido lançadas "
-"ainda. Especificar isso no arquivo de preferências do APT iria requerer uma "
-"das linhas a seguir."
+"pertencer a distribuição Debian versão 3.0. Note que normalmente não existe "
+"número de versão para as distribuições <literal>testing</literal> e "
+"<literal>unstable</literal> devido as mesmas não terem sido lançadas ainda. "
+"Especificar isso no arquivo de preferências do APT iria requerer uma das "
+"linhas a seguir."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:470
+#: apt_preferences.5.xml:471
 #, fuzzy, no-wrap
 msgid ""
-"Pin: release v=3.0\n"
-"Pin: release a=stable, v=3.0\n"
-"Pin: release 3.0\n"
+"Pin: release v=&stable-version;\n"
+"Pin: release a=stable, v=&stable-version;\n"
+"Pin: release &stable-version;\n"
 msgstr ""
 "<programlisting>\n"
 "Pin: release v=3.0\n"
@@ -6839,13 +4547,13 @@ msgstr ""
 "Pin: release 3.0\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:480
 #, 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:480
+#: apt_preferences.5.xml:481
 #, fuzzy
 msgid ""
 "names the licensing component associated with the packages in the directory "
@@ -6864,7 +4572,7 @@ msgstr ""
 "requerer a linha :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:489
+#: apt_preferences.5.xml:490
 #, fuzzy, no-wrap
 msgid "Pin: release c=main\n"
 msgstr ""
@@ -6872,13 +4580,13 @@ msgstr ""
 "Pin: release c=main\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:495
+#: apt_preferences.5.xml:496
 #, 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:496
+#: apt_preferences.5.xml:497
 #, fuzzy
 msgid ""
 "names the originator of the packages in the directory tree of the "
@@ -6892,7 +4600,7 @@ msgstr ""
 "requerer a linha :"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:502
+#: apt_preferences.5.xml:503
 #, fuzzy, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr ""
@@ -6900,13 +4608,13 @@ msgstr ""
 "Pin: release o=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:508
+#: apt_preferences.5.xml:509
 #, 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:509
+#: apt_preferences.5.xml:510
 #, fuzzy
 msgid ""
 "names the label of the packages in the directory tree of the "
@@ -6919,7 +4627,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:515
+#: apt_preferences.5.xml:516
 #, fuzzy, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr ""
@@ -6927,31 +4635,7 @@ msgstr ""
 "Pin: release l=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:416
-#, fuzzy
-msgid ""
-"The <filename>Release</filename> file is normally found in the directory "
-"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
-"example, <filename>.../dists/stable/Release</filename>, or <filename>.../"
-"dists/&stable-codename;/Release</filename>.  It consists of a single multi-"
-"line record which applies to <emphasis>all</emphasis> of the packages in the "
-"directory tree below its parent.  Unlike the <filename>Packages</filename> "
-"file, nearly all of the lines in a <filename>Release</filename> file are "
-"relevant for setting APT priorities: <placeholder type=\"variablelist\" id="
-"\"0\"/>"
-msgstr ""
-"O arquivo <filename>Release</filename> é normalmente encontrado no diretório "
-"<filename>.../dists/<replaceable>nome-distribuição</replaceable></"
-"filename> : por exemplo, <filename>.../dists/stable/Release</filename>, ou "
-"<filename>.../dists/woody/Release</filename>. O arquivo consiste de um "
-"registro de múltiplas linhas o qual se aplica a <emphasis>todos</emphasis> "
-"os pacotes na àrvore de diretórios abaixo de seu diretório pai. Diferente do "
-"arquivo <filename>Packages</filename>, quase todas as linhas em um arquivo "
-"<filename>Release</filename> são relevantes para a definição de prioridades "
-"do APT :"
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:522
+#: apt_preferences.5.xml:523
 #, fuzzy
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
@@ -6977,13 +4661,13 @@ msgstr ""
 "<literal>unstable</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:535
+#: apt_preferences.5.xml:536
 #, 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:537
+#: apt_preferences.5.xml:538
 #, fuzzy
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
@@ -6995,13 +4679,13 @@ msgstr ""
 "</literal>. Isto oferece um local para inserir comentários."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:546
+#: apt_preferences.5.xml:547
 #, fuzzy
 msgid "Tracking Stable"
 msgstr "Acompanhando a Stable"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:554
+#: apt_preferences.5.xml:555
 #, fuzzy, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -7026,7 +4710,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:549
 #, fuzzy
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
@@ -7042,8 +4726,8 @@ msgstr ""
 "outras distribuições <literal>Debian</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:571 apt_preferences.5.xml:617
-#: apt_preferences.5.xml:675
+#: apt_preferences.5.xml:572 apt_preferences.5.xml:618
+#: apt_preferences.5.xml:676
 #, fuzzy, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -7056,7 +4740,7 @@ msgstr ""
 "apt-get dist-upgrade\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:566
+#: apt_preferences.5.xml:567
 #, fuzzy
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
@@ -7069,7 +4753,7 @@ msgstr ""
 "ulítma(s) versão(ôes) <literal>stable</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:583
+#: apt_preferences.5.xml:584
 #, fuzzy, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr ""
@@ -7077,7 +4761,7 @@ msgstr ""
 "apt-get install <replaceable>pacote</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:577
+#: apt_preferences.5.xml:578
 #, fuzzy
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
@@ -7090,13 +4774,13 @@ msgstr ""
 "atualizado novamente a menos que esse comando seja executado novamente."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:589
+#: apt_preferences.5.xml:590
 #, fuzzy
 msgid "Tracking Testing or Unstable"
 msgstr "Acompanhando a Testing"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:598
+#: apt_preferences.5.xml:599
 #, fuzzy, no-wrap
 msgid ""
 "Package: *\n"
@@ -7125,7 +4809,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:591
+#: apt_preferences.5.xml:592
 #, fuzzy
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
@@ -7142,7 +4826,7 @@ msgstr ""
 "versões de pacotes de outras distribuições <literal>Debian</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:612
+#: apt_preferences.5.xml:613
 #, fuzzy
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
@@ -7155,7 +4839,7 @@ msgstr ""
 "(s) última(s) versão(ões) <literal>testing</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:632
+#: apt_preferences.5.xml:633
 #, fuzzy, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr ""
@@ -7163,7 +4847,7 @@ msgstr ""
 "apt-get install <replaceable>pacote</replaceable>/unstable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:623
+#: apt_preferences.5.xml:624
 #, fuzzy
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
@@ -7183,12 +4867,12 @@ msgstr ""
 "recente que a versão instalada."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:639
+#: apt_preferences.5.xml:640
 msgid "Tracking the evolution of a codename release"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:653
+#: apt_preferences.5.xml:654
 #, fuzzy, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
@@ -7218,7 +4902,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:641
+#: apt_preferences.5.xml:642
 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 "
@@ -7233,7 +4917,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:670
+#: apt_preferences.5.xml:671
 #, fuzzy
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
@@ -7246,7 +4930,7 @@ msgstr ""
 "ulítma(s) versão(ôes) <literal>stable</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:690
+#: apt_preferences.5.xml:691
 #, fuzzy, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr ""
@@ -7254,7 +4938,7 @@ msgstr ""
 "apt-get install <replaceable>pacote</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:681
+#: apt_preferences.5.xml:682
 #, fuzzy
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
@@ -7273,48 +4957,36 @@ msgstr ""
 "versão <literal>unstable</literal> mais recente caso a mesma seja mais "
 "recente que a versão instalada."
 
-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:699
-#, fuzzy
-msgid "&file-preferences;"
-msgstr "apt_preferences"
-
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:705
+#: apt_preferences.5.xml:706
 #, fuzzy
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
-#. type: Content of: <refentry><refnamediv><refname>
-#: sources.list.5.xml:25 sources.list.5.xml:32
-msgid "sources.list"
-msgstr ""
-
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: sources.list.5.xml:33
-msgid "Package resource list for APT"
+msgid "List of configured APT data sources"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:37
+#: sources.list.5.xml:38
 msgid ""
-"The package resource list is used to locate archives of the package "
-"distribution system in use on the system. At this time, this manual page "
-"documents only the packaging system used by the Debian GNU/Linux system.  "
-"This control file is <filename>/etc/apt/sources.list</filename>."
+"The source list <filename>/etc/apt/sources.list</filename> 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 "
+"information available from the configured sources is acquired by "
+"<command>apt-get update</command> (or by an equivalent command from another "
+"APT front-end)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:42
+#: sources.list.5.xml:45
 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 #."
+"Each line specifying a source starts with type (e.g. <literal>deb-src</"
+"literal>)  followed by options and arguments for this type.  Individual "
+"entries cannot be continued onto a following line. Empty lines are ignored, "
+"and a <literal>#</literal> character anywhere on a line marks the remainder "
+"of that line as a comment."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
@@ -7330,9 +5002,9 @@ msgid ""
 "the regular <filename>sources.list</filename> file.  File names need to end "
 "with <filename>.list</filename> and may only contain letters (a-z and A-Z), "
 "digits (0-9), underscore (_), hyphen (-) and period (.) characters.  "
-"Otherwise APT will print a notice that it has ignored a file if the file "
-"doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
-"configuration list - in this case it will be silently ignored."
+"Otherwise APT will print a notice that it has ignored a file, unless that "
+"file matches a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
+"configuration list - in which case it will be silently ignored."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
@@ -7343,16 +5015,16 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:66
 msgid ""
-"The <literal>deb</literal> type describes a typical two-level Debian "
-"archive, <filename>distribution/component</filename>. Typically, "
-"<literal>distribution</literal> is generally an archivename like "
+"The <literal>deb</literal> type references a typical two-level Debian "
+"archive, <filename>distribution/component</filename>. The "
+"<literal>distribution</literal> is generally an archive name like "
 "<literal>stable</literal> or <literal>testing</literal> or a codename like "
 "<literal>&stable-codename;</literal> or <literal>&testing-codename;</"
-"literal> while component is one of <literal>main</literal> <literal>contrib</"
-"literal> or <literal>non-free</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."
+"literal> while component is one of <literal>main</literal>, "
+"<literal>contrib</literal> or <literal>non-free</literal>. The <literal>deb-"
+"src</literal> type references 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."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -7375,21 +5047,22 @@ msgid ""
 "Debian distribution, from which APT will find the information it needs.  "
 "<literal>distribution</literal> can specify an exact path, in which case the "
 "components must be omitted and <literal>distribution</literal> must end with "
-"a slash (/). This is useful for when the case only a particular sub-section "
-"of the archive denoted by the URI is of interest.  If <literal>distribution</"
-"literal> does not specify an exact path, at least one <literal>component</"
-"literal> must be present."
+"a slash (<literal>/</literal>). This is useful for the case when only a "
+"particular sub-section of the archive denoted by the URI is of interest.  If "
+"<literal>distribution</literal> does not specify an exact path, at least one "
+"<literal>component</literal> must be present."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:92
 msgid ""
 "<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)"
-"</literal> which expands to the Debian architecture (i386, m68k, "
-"powerpc, ...)  used on the system. This permits architecture-independent "
-"<filename>sources.list</filename> files to be used. In general this is only "
-"of interest when specifying an exact path, <literal>APT</literal> will "
-"automatically generate a URI with the current architecture otherwise."
+"</literal> which expands to the Debian architecture (such as <literal>amd64</"
+"literal> or <literal>armel</literal>) used on the system. This permits "
+"architecture-independent <filename>sources.list</filename> files to be used. "
+"In general this is only of interest when specifying an exact path, "
+"<literal>APT</literal> will automatically generate a URI with the current "
+"architecture otherwise."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -7410,12 +5083,12 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:112
 msgid ""
-"<literal>options</literal> is always optional and needs to be surounded by "
+"<literal>options</literal> is always optional and needs to be surrounded by "
 "square brackets. It can consist of multiple settings in the form "
 "<literal><replaceable>setting</replaceable>=<replaceable>value</"
 "replaceable></literal>.  Multiple settings are separated by spaces. The "
-"following settings are supported by APT, note though that unsupported "
-"settings will be ignored silently:"
+"following settings are supported by APT (note however that unsupported "
+"settings will be ignored silently):"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
@@ -7423,7 +5096,7 @@ msgstr ""
 msgid ""
 "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
 "replaceable>,…</literal> can be used to specify for which architectures "
-"packages information should be downloaded. If this option is not set all "
+"information should be downloaded. If this option is not set all "
 "architectures defined by the <literal>APT::Architectures</literal> option "
 "will be downloaded."
 msgstr ""
@@ -7432,11 +5105,11 @@ msgstr ""
 #: sources.list.5.xml:121
 msgid ""
 "<literal>trusted=yes</literal> can be set to indicate that packages from "
-"this source are always authenificated even if the <filename>Release</"
+"this source are always authenticated even if the <filename>Release</"
 "filename> file is not signed or the signature can't be checked. This "
 "disables parts of &apt-secure; and should therefore only be used in a local "
 "and trusted context. <literal>trusted=no</literal> is the opposite which "
-"handles even correctly authenificated sources as not authenificated."
+"handles even correctly authenticated sources as not authenticated."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -7468,13 +5141,13 @@ msgstr ""
 msgid "URI specification"
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:146
-msgid "file"
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:143
+msgid "The currently recognized URI types are:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:148
+#: sources.list.5.xml:147
 msgid ""
 "The file scheme allows an arbitrary directory in the file system to be "
 "considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -7482,14 +5155,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:155
+#: sources.list.5.xml:154
 msgid ""
-"The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
+"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
 "Use the &apt-cdrom; program to create cdrom entries in the source list."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:162
+#: sources.list.5.xml:161
 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:"
@@ -7500,112 +5173,90 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:173
+#: sources.list.5.xml:172
 msgid ""
 "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
 "is highly configurable; for more information see the &apt-conf; manual page. "
-"Please note that a ftp proxy can be specified by using the <envar>ftp_proxy</"
-"envar> environment variable. It is possible to specify a http proxy (http "
-"proxy servers often understand ftp urls)  using this method and ONLY this "
-"method. ftp proxies using http specified in the configuration file will be "
+"Please note that an FTP proxy can be specified by using the "
+"<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
+"HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
+"environment variable and <emphasis>only</emphasis> this environment "
+"variable. Proxies using HTTP specified in the configuration file will be "
 "ignored."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:182
-msgid "copy"
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:184
 msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "
-"This is useful for people using a zip disk to copy files around with APT."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:189
-msgid "rsh"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:189
-msgid "ssh"
+"This is useful for people using removable media to copy files around with "
+"APT."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:191
 msgid ""
-"The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
-"user and access the files. It is a good idea to do prior arrangements with "
-"RSA keys or rhosts.  Access to files on the remote uses standard "
-"<command>find</command> and <command>dd</command> commands to perform the "
-"file transfers from the remote."
+"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
+"the files as a given user. Prior configuration of rhosts or RSA keys is "
+"recommended. The standard <command>find</command> and <command>dd</command> "
+"commands are used to perform the file transfers from the remote host."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:199
-msgid "more recognizable URI types"
+#: sources.list.5.xml:198
+msgid "adding more recognizable URI types"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:201
+#: sources.list.5.xml:200
 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. 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>."
+"APT can be extended with more methods shipped in other optional packages, "
+"which should follow the naming scheme <package>apt-transport-"
+"<replaceable>method</replaceable></package>.  For instance, the APT team "
+"also maintains the package <package>apt-transport-https</package>, which "
+"provides access methods for HTTPS URIs with features similar to the http "
+"method.  Methods for using e.g. debtorrent are also available - see &apt-"
+"transport-debtorrent;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:143
-msgid ""
-"The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, "
-"rsh.  <placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:215
+#: sources.list.5.xml:212
 msgid ""
 "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
 "stable/main, stable/contrib, and stable/non-free."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:217
+#: sources.list.5.xml:214
 #, no-wrap
 msgid "deb file:/home/jason/debian stable main contrib non-free"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:219
+#: sources.list.5.xml:216
 msgid "As above, except this uses the unstable (development) distribution."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:217
 #, no-wrap
 msgid "deb file:/home/jason/debian unstable main contrib non-free"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:219
 msgid "Source line for the above"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:223
+#: sources.list.5.xml:220
 #, no-wrap
 msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:225
+#: sources.list.5.xml:222
 msgid ""
 "The first line gets package information for the architectures in "
 "<literal>APT::Architectures</literal> while the second always retrieves "
@@ -7613,7 +5264,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:227
+#: sources.list.5.xml:224
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main\n"
@@ -7621,33 +5272,33 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:230
+#: sources.list.5.xml:227
 msgid ""
 "Uses HTTP to access the archive at archive.debian.org, and uses only the "
 "hamm/main area."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:232
+#: sources.list.5.xml:229
 #, no-wrap
 msgid "deb http://archive.debian.org/debian-archive hamm main"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:234
+#: sources.list.5.xml:231
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the &stable-codename;/contrib area."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:236
+#: sources.list.5.xml:233
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:238
+#: sources.list.5.xml:235
 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 "
@@ -7656,19 +5307,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:242
+#: sources.list.5.xml:239
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian unstable contrib"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:251
+#: sources.list.5.xml:248
 #, no-wrap
 msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:244
+#: sources.list.5.xml:241
 msgid ""
 "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
 "directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -7680,11 +5331,932 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:256
+#: sources.list.5.xml:253
 #, fuzzy
 msgid "&apt-cache; &apt-conf;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
+#. type: Content of: <refentry><refmeta><manvolnum>
+#: apt-extracttemplates.1.xml:26 apt-sortpkgs.1.xml:26 apt-ftparchive.1.xml:26
+msgid "1"
+msgstr ""
+
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-extracttemplates.1.xml:33
+msgid ""
+"Utility to extract <command>debconf</command> config and templates from "
+"Debian packages"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-extracttemplates.1.xml:39
+msgid ""
+"<command>apt-extracttemplates</command> will take one or more Debian package "
+"files as input and write out (to a temporary directory) all associated "
+"config scripts and template files. For each passed in package that contains "
+"config scripts and templates, one line of output will be generated in the "
+"format:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-extracttemplates.1.xml:44
+msgid "package version template-file config-script"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-extracttemplates.1.xml:45
+msgid ""
+"template-file and config-script are written to the temporary directory "
+"specified by the <option>-t</option> or <option>--tempdir</option> "
+"(<literal>APT::ExtractTemplates::TempDir</literal>) directory, with "
+"filenames of the form <filename>package.template.XXXX</filename> and "
+"<filename>package.config.XXXX</filename>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-extracttemplates.1.xml:58
+msgid ""
+"Temporary directory in which to write extracted <command>debconf</command> "
+"template files and config scripts.  Configuration Item: <literal>APT::"
+"ExtractTemplates::TempDir</literal>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-extracttemplates.1.xml:75
+msgid ""
+"<command>apt-extracttemplates</command> returns zero on normal operation, "
+"decimal 100 on error."
+msgstr ""
+
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-sortpkgs.1.xml:33
+msgid "Utility to sort package index files"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-sortpkgs.1.xml:39
+msgid ""
+"<command>apt-sortpkgs</command> will take an index file (source index or "
+"package index) and sort the records so that they are ordered by the package "
+"name.  It will also sort the internal fields of each record according to the "
+"internal sorting rules."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-sortpkgs.1.xml:45
+msgid ""
+"All output is sent to standard output; the input must be a seekable file."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-sortpkgs.1.xml:54
+msgid ""
+"Use source index field ordering.  Configuration Item: <literal>APT::"
+"SortPkgs::Source</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-sortpkgs.1.xml:68
+msgid ""
+"<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
+"100 on error."
+msgstr ""
+
+#. type: Content of: <refentry><refnamediv><refpurpose>
+#: apt-ftparchive.1.xml:33
+msgid "Utility to generate index files"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-ftparchive.1.xml:39
+msgid ""
+"<command>apt-ftparchive</command> is the command line tool that generates "
+"the index files that APT uses to access a distribution source. The index "
+"files should be generated on the origin site based on the content of that "
+"site."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-ftparchive.1.xml:43
+msgid ""
+"<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
+"program, incorporating its entire functionality via the <literal>packages</"
+"literal> command.  It also contains a contents file generator, "
+"<literal>contents</literal>, and an elaborate means to 'script' the "
+"generation process for a complete archive."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-ftparchive.1.xml:49
+msgid ""
+"Internally <command>apt-ftparchive</command> can make use of binary "
+"databases to cache the contents of a .deb file and it does not rely on any "
+"external programs aside from &gzip;. When doing a full generate it "
+"automatically performs file-change checks and builds the desired compressed "
+"output files."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:60
+msgid ""
+"The packages command generates a package file from a directory tree. It "
+"takes the given directory and recursively searches it for .deb files, "
+"emitting a package record to stdout for each. This command is approximately "
+"equivalent to &dpkg-scanpackages;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:65 apt-ftparchive.1.xml:89
+msgid ""
+"The option <option>--db</option> can be used to specify a binary caching DB."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:70
+msgid ""
+"The <literal>sources</literal> command generates a source index file from a "
+"directory tree.  It takes the given directory and recursively searches it "
+"for .dsc files, emitting a source record to stdout for each. This command is "
+"approximately equivalent to &dpkg-scansources;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:75
+msgid ""
+"If an override file is specified then a source override file will be looked "
+"for with an extension of .src. The --source-override option can be used to "
+"change the source override file that will be used."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:82
+msgid ""
+"The <literal>contents</literal> command generates a contents file from a "
+"directory tree. It takes the given directory and recursively searches it "
+"for .deb files, and reads the file list from each file. It then sorts and "
+"writes to stdout the list of files matched to packages. Directories are not "
+"written to the output. If multiple packages own the same file then each "
+"package is separated by a comma in the output."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:94
+msgid ""
+"The <literal>release</literal> command generates a Release file from a "
+"directory tree. It recursively searches the given directory for uncompressed "
+"<filename>Packages</filename> and <filename>Sources</filename> files and "
+"ones compressed with <command>gzip</command>, <command>bzip2</command> or "
+"<command>lzma</command> as well as <filename>Release</filename> and "
+"<filename>md5sum.txt</filename> files by default (<literal>APT::FTPArchive::"
+"Release::Default-Patterns</literal>). Additional filename patterns can be "
+"added by listing them in <literal>APT::FTPArchive::Release::Patterns</"
+"literal>.  It then writes to stdout a <filename>Release</filename> file "
+"containing an MD5, SHA1 and SHA256 digest for each file."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:104
+msgid ""
+"Values for the additional metadata fields in the Release file are taken from "
+"the corresponding variables under <literal>APT::FTPArchive::Release</"
+"literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>.  The "
+"supported fields are: <literal>Origin</literal>, <literal>Label</literal>, "
+"<literal>Suite</literal>, <literal>Version</literal>, <literal>Codename</"
+"literal>, <literal>Date</literal>, <literal>Valid-Until</literal>, "
+"<literal>Architectures</literal>, <literal>Components</literal>, "
+"<literal>Description</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:117
+msgid ""
+"The <literal>generate</literal> command is designed to be runnable from a "
+"cron script and builds indexes according to the given config file. The "
+"config language provides a flexible means of specifying which index files "
+"are built from which directories, as well as providing a simple means of "
+"maintaining the required settings."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:126
+msgid ""
+"The <literal>clean</literal> command tidies the databases used by the given "
+"configuration file by removing any records that are no longer necessary."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-ftparchive.1.xml:132
+msgid "The Generate Configuration"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-ftparchive.1.xml:134
+msgid ""
+"The <literal>generate</literal> command uses a configuration file to "
+"describe the archives that are going to be generated. It follows the typical "
+"ISC configuration format as seen in ISC tools like bind 8 and dhcpd.  &apt-"
+"conf; contains a description of the syntax. Note that the generate "
+"configuration is parsed in sectional manner, but &apt-conf; is parsed in a "
+"tree manner. This only effects how the scope tag is handled."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-ftparchive.1.xml:142
+msgid ""
+"The generate configuration has four separate sections, each described below."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-ftparchive.1.xml:144
+#, fuzzy
+msgid "<literal>Dir</literal> Section"
+msgstr "a linha <literal>Origin:</literal>"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-ftparchive.1.xml:146
+msgid ""
+"The <literal>Dir</literal> section defines the standard directories needed "
+"to locate the files required during the generation process. These "
+"directories are prepended certain relative paths defined in later sections "
+"to produce a complete an absolute path."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:153
+msgid ""
+"Specifies the root of the FTP archive, in a standard Debian configuration "
+"this is the directory that contains the <filename>ls-LR</filename> and dist "
+"nodes."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:160
+msgid "Specifies the location of the override files."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:165
+msgid "Specifies the location of the cache files."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:170
+msgid ""
+"Specifies the location of the file list files, if the <literal>FileList</"
+"literal> setting is used below."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-ftparchive.1.xml:176
+#, fuzzy
+msgid "<literal>Default</literal> Section"
+msgstr "a linha <literal>Label:</literal>"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-ftparchive.1.xml:178
+msgid ""
+"The <literal>Default</literal> section specifies default values, and "
+"settings that control the operation of the generator. Other sections may "
+"override these defaults with a per-section setting."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:184
+msgid ""
+"Sets the default compression schemes to use for the package index files. It "
+"is a string that contains a space separated list of at least one of: '.' (no "
+"compression), 'gzip' and 'bzip2'. The default for all compression schemes is "
+"'. gzip'."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:192
+msgid ""
+"Sets the default list of file extensions that are package files.  This "
+"defaults to '.deb'."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:198
+msgid ""
+"This is similar to <literal>Packages::Compress</literal> except that it "
+"controls the compression for the Sources files."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:204
+msgid ""
+"Sets the default list of file extensions that are source files.  This "
+"defaults to '.dsc'."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:210
+msgid ""
+"This is similar to <literal>Packages::Compress</literal> except that it "
+"controls the compression for the Contents files."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:216
+msgid ""
+"This is similar to <literal>Packages::Compress</literal> except that it "
+"controls the compression for the Translation-en master file."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:222
+msgid ""
+"Specifies the number of kilobytes to delink (and replace with hard links) "
+"per run. This is used in conjunction with the per-section <literal>External-"
+"Links</literal> setting."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:229
+msgid ""
+"Specifies the mode of all created index files. It defaults to 0644. All "
+"index files are set to this mode with no regard to the umask."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:236 apt-ftparchive.1.xml:382
+msgid ""
+"Specifies whether long descriptions should be included in the "
+"<filename>Packages</filename> file or split out into a master "
+"<filename>Translation-en</filename> file."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-ftparchive.1.xml:242
+#, fuzzy
+msgid "<literal>TreeDefault</literal> Section"
+msgstr "a linha <literal>Label:</literal>"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-ftparchive.1.xml:244
+msgid ""
+"Sets defaults specific to <literal>Tree</literal> sections. All of these "
+"variables are substitution variables and have the strings $(DIST), "
+"$(SECTION) and $(ARCH) replaced with their respective values."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:251
+msgid ""
+"Sets the number of kilobytes of contents files that are generated each day. "
+"The contents files are round-robined so that over several days they will all "
+"be rebuilt."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:258
+msgid ""
+"Controls the number of days a contents file is allowed to be checked without "
+"changing. If this limit is passed the mtime of the contents file is updated. "
+"This case can occur if the package file is changed in such a way that does "
+"not result in a new contents file [override edit for instance]. A hold off "
+"is allowed in hopes that new .debs will be installed, requiring a new file "
+"anyhow. The default is 10, the units are in days."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:269
+msgid ""
+"Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
+"$(SECTION)/binary-$(ARCH)/</filename>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:275
+msgid ""
+"Sets the top of the source package directory tree. Defaults to <filename>"
+"$(DIST)/$(SECTION)/source/</filename>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:281
+msgid ""
+"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
+"binary-$(ARCH)/Packages</filename>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:287
+msgid ""
+"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
+"source/Sources</filename>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:293
+msgid ""
+"Sets the output Translation-en master file with the long descriptions if "
+"they should be not included in the Packages file. Defaults to <filename>"
+"$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:300
+msgid ""
+"Sets the path prefix that causes a symlink to be considered an internal link "
+"instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
+"filename>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:307
+msgid ""
+"Sets the output Contents file. Defaults to <filename>$(DIST)/$(SECTION)/Contents-$(ARCH)"
+"</filename>. If this setting causes multiple Packages files to map onto a "
+"single Contents file (as is the default)  then <command>apt-ftparchive</"
+"command> will integrate those package files together automatically."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:316
+msgid "Sets header file to prepend to the contents output."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:321
+msgid ""
+"Sets the binary cache database to use for this section. Multiple sections "
+"can share the same database."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:327
+msgid ""
+"Specifies that instead of walking the directory tree, <command>apt-"
+"ftparchive</command> should read the list of files from the given file. "
+"Relative files names are prefixed with the archive directory."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:334
+msgid ""
+"Specifies that instead of walking the directory tree, <command>apt-"
+"ftparchive</command> should read the list of files from the given file. "
+"Relative files names are prefixed with the archive directory.  This is used "
+"when processing source indexes."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-ftparchive.1.xml:342
+#, fuzzy
+msgid "<literal>Tree</literal> Section"
+msgstr "a linha <literal>Label:</literal>"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-ftparchive.1.xml:344
+msgid ""
+"The <literal>Tree</literal> section defines a standard Debian file tree "
+"which consists of a base directory, then multiple sections in that base "
+"directory and finally multiple Architectures in each section. The exact "
+"pathing used is defined by the <literal>Directory</literal> substitution "
+"variable."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-ftparchive.1.xml:349
+msgid ""
+"The <literal>Tree</literal> section takes a scope tag which sets the "
+"<literal>$(DIST)</literal> variable and defines the root of the tree (the "
+"path is prefixed by <literal>ArchiveDir</literal>).  Typically this is a "
+"setting such as <filename>dists/&stable-codename;</filename>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-ftparchive.1.xml:354
+msgid ""
+"All of the settings defined in the <literal>TreeDefault</literal> section "
+"can be used in a <literal>Tree</literal> section as well as three new "
+"variables."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
+#: apt-ftparchive.1.xml:360
+#, 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:357
+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><listitem><para>
+#: apt-ftparchive.1.xml:368
+msgid ""
+"This is a space separated list of sections which appear under the "
+"distribution; typically this is something like <literal>main contrib non-"
+"free</literal>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:375
+msgid ""
+"This is a space separated list of all the architectures that appear under "
+"search section. The special architecture 'source' is used to indicate that "
+"this tree has a source archive."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:388
+msgid ""
+"Sets the binary override file. The override file contains section, priority "
+"and maintainer address information."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:394
+msgid ""
+"Sets the source override file. The override file contains section "
+"information."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:446
+msgid "Sets the binary extra override file."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:405 apt-ftparchive.1.xml:451
+msgid "Sets the source extra override file."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt-ftparchive.1.xml:410
+#, fuzzy
+msgid "<literal>BinDirectory</literal> Section"
+msgstr "a linha <literal>Component:</literal>"
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-ftparchive.1.xml:412
+msgid ""
+"The <literal>bindirectory</literal> section defines a binary directory tree "
+"with no special structure. The scope tag specifies the location of the "
+"binary directory and the settings are similar to the <literal>Tree</literal> "
+"section with no substitution variables or <literal>Section</"
+"literal><literal>Architecture</literal> settings."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:420
+msgid "Sets the Packages file output."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:425
+msgid ""
+"Sets the Sources file output. At least one of <literal>Packages</literal> or "
+"<literal>Sources</literal> is required."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:431
+msgid "Sets the Contents file output (optional)."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:436
+msgid "Sets the binary override file."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:441
+msgid "Sets the source override file."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:456
+msgid "Sets the cache DB."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:461
+msgid "Appends a path to all the output paths."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:466
+msgid "Specifies the file list file."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-ftparchive.1.xml:473
+msgid "The Binary Override File"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-ftparchive.1.xml:474
+msgid ""
+"The binary override file is fully compatible with &dpkg-scanpackages;. It "
+"contains four fields separated by spaces. The first field is the package "
+"name, the second is the priority to force that package to, the third is the "
+"section to force that package to and the final field is the maintainer "
+"permutation field."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt-ftparchive.1.xml:480
+#, no-wrap
+msgid "old [// oldn]* => new"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: apt-ftparchive.1.xml:482
+#, no-wrap
+msgid "new"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-ftparchive.1.xml:479
+msgid ""
+"The general form of the maintainer field is: <placeholder type="
+"\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
+"id=\"1\"/> The first form allows a double-slash separated list of old email "
+"addresses to be specified. If any of those are found then new is substituted "
+"for the maintainer field. The second form unconditionally substitutes the "
+"maintainer field."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-ftparchive.1.xml:490
+msgid "The Source Override File"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-ftparchive.1.xml:492
+msgid ""
+"The source override file is fully compatible with &dpkg-scansources;. It "
+"contains two fields separated by spaces. The first field is the source "
+"package name, the second is the section to assign it."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-ftparchive.1.xml:497
+msgid "The Extra Override File"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-ftparchive.1.xml:499
+msgid ""
+"The extra override file allows any arbitrary tag to be added or replaced in "
+"the output. It has three columns, the first is the package, the second is "
+"the tag and the remainder of the line is the new value."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:510
+msgid ""
+"Generate the given checksum. These options default to on, when turned off "
+"the generated index files will not have the checksum fields where possible.  "
+"Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</"
+"replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</"
+"replaceable>::<replaceable>Checksum</replaceable></literal> where "
+"<literal><replaceable>Index</replaceable></literal> can be "
+"<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</"
+"literal> and <literal><replaceable>Checksum</replaceable></literal> can be "
+"<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:521
+msgid ""
+"Use a binary caching DB. This has no effect on the generate command.  "
+"Configuration Item: <literal>APT::FTPArchive::DB</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:527
+msgid ""
+"Quiet; produces output suitable for logging, omitting progress indicators.  "
+"More q's will produce more quiet up to a maximum of 2. You can also use "
+"<option>-q=#</option> to set the quiet level, overriding the configuration "
+"file.  Configuration Item: <literal>quiet</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:535
+msgid ""
+"Perform Delinking. If the <literal>External-Links</literal> setting is used "
+"then this option actually enables delinking of the files. It defaults to on "
+"and can be turned off with <option>--no-delink</option>.  Configuration "
+"Item: <literal>APT::FTPArchive::DeLinkAct</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:543
+msgid ""
+"Perform contents generation. When this option is set and package indexes are "
+"being generated with a cache DB then the file listing will also be extracted "
+"and stored in the DB for later use. When using the generate command this "
+"option also allows the creation of any Contents files. The default is on.  "
+"Configuration Item: <literal>APT::FTPArchive::Contents</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:553
+msgid ""
+"Select the source override file to use with the <literal>sources</literal> "
+"command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
+"literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:559
+msgid ""
+"Make the caching databases read only.  Configuration Item: <literal>APT::"
+"FTPArchive::ReadOnlyDB</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:564
+msgid ""
+"Accept in the <literal>packages</literal> and <literal>contents</literal> "
+"commands only package files matching <literal>*_arch.deb</literal> or "
+"<literal>*_all.deb</literal> instead of all package files in the given "
+"path.  Configuration Item: <literal>APT::FTPArchive::Architecture</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:572
+msgid ""
+"&apt-ftparchive; caches as much as possible of metadata in a 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><listitem><para>
+#: apt-ftparchive.1.xml:584
+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 the <filename>Translation-en</filename> master file can only be created "
+"in the generate command."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><programlisting>
+#: apt-ftparchive.1.xml:602
+#, 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:598
+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:612
+msgid ""
+"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
+"100 on error."
+msgstr ""
+
+#. type: TH
+#: apt.8:17
+#, no-wrap
+msgid "apt"
+msgstr ""
+
+#. type: TH
+#: apt.8:17
+#, no-wrap
+msgid "16 June 1998"
+msgstr ""
+
+#. type: TH
+#: apt.8:17
+#, no-wrap
+msgid "Debian"
+msgstr ""
+
+#. type: SH
+#: apt.8:18
+#, no-wrap
+msgid "NAME"
+msgstr ""
+
+#. type: Plain text
+#: apt.8:20
+msgid "apt - Advanced Package Tool"
+msgstr ""
+
+#. type: SH
+#: apt.8:20
+#, no-wrap
+msgid "SYNOPSIS"
+msgstr ""
+
+#. type: Plain text
+#: apt.8:22
+msgid "B<apt>"
+msgstr ""
+
+#. type: SH
+#: apt.8:22
+#, no-wrap
+msgid "DESCRIPTION"
+msgstr ""
+
+#. type: Plain text
+#: apt.8:31
+msgid ""
+"APT is a management system for software packages. For normal day to day "
+"package management there are several frontends available, such as B<aptitude>"
+"(8)  for the command line or B<synaptic>(8)  for the X Window System. Some "
+"options are only implemented in B<apt-get>(8)  though."
+msgstr ""
+
+#. type: SH
+#: apt.8:31
+#, no-wrap
+msgid "SEE ALSO"
+msgstr ""
+
+#. type: Plain text
+#: apt.8:38
+msgid ""
+"B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
+"B<apt_preferences>(5), B<apt-secure>(8)"
+msgstr ""
+
+#. type: SH
+#: apt.8:38
+#, no-wrap
+msgid "DIAGNOSTICS"
+msgstr ""
+
+#. type: Plain text
+#: apt.8:40
+msgid "apt returns zero on normal operation, decimal 100 on error."
+msgstr ""
+
+#. type: SH
+#: apt.8:40
+#, no-wrap
+msgid "BUGS"
+msgstr ""
+
+#. type: Plain text
+#: apt.8:42
+msgid "This manpage isn't even started."
+msgstr ""
+
+#. type: Plain text
+#: apt.8:51
+#, fuzzy
+msgid ""
+"See E<lt>http://bugs.debian.org/aptE<gt>.  If you wish to report a bug in "
+"B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the "
+"B<reportbug>(1)  command."
+msgstr ""
+"\n"
+" <RefSect1><Title>Bugs</>\n"
+"   <para>\n"
+"   Consulte a <ulink url='http://bugs.debian.org/apt'>página de bugs do APT</"
+">.\n"
+"   Caso você queira relatar um bug no APT, por favor consulte o arquivo\n"
+"   <filename>/usr/share/doc/debian/bug-reporting.txt</> ou o comando "
+"&reportbug;.\n"
+" </RefSect1>\n"
+
+#. type: SH
+#: apt.8:51
+#, no-wrap
+msgid "AUTHOR"
+msgstr ""
+
+#. type: Plain text
+#: apt.8:52
+#, fuzzy
+msgid "apt was written by the APT team E<lt>apt@packages.debian.orgE<gt>."
+msgstr ""
+"\n"
+" <RefSect1><Title>Author</>\n"
+"   <para>\n"
+"   O APT foi escrito pela equipe APT <email>apt@packages.debian.org</>.\n"
+" </RefSect1>\n"
+
 #. type: <title></title>
 #: guide.sgml:4
 msgid "APT User's Guide"
@@ -7723,8 +6295,8 @@ msgstr ""
 #. type: <p></p>
 #: guide.sgml:24 offline.sgml:25
 msgid ""
-"For more details, on Debian GNU/Linux systems, see the file /usr/share/"
-"common-licenses/GPL for the full license."
+"For more details, on Debian systems, see the file /usr/share/common-licenses/"
+"GPL for the full license."
 msgstr ""
 
 #. type: <heading></heading>
@@ -7817,6 +6389,11 @@ msgid ""
 "packages for installation."
 msgstr ""
 
+#. type: <heading></heading>
+#: guide.sgml:96
+msgid "apt-get"
+msgstr ""
+
 #. type: <p></p>
 #: guide.sgml:102
 msgid ""
@@ -7853,6 +6430,11 @@ msgstr ""
 msgid "Once updated there are several commands that can be used:"
 msgstr ""
 
+#. type: <tag></tag>
+#: guide.sgml:121
+msgid "upgrade"
+msgstr ""
+
 #. type: <p></p>
 #: guide.sgml:131
 msgid ""
@@ -7865,6 +6447,11 @@ msgid ""
 "<tt>apt-get install</tt> can be used to force these packages to install."
 msgstr ""
 
+#. type: <tag></tag>
+#: guide.sgml:131
+msgid "install"
+msgstr ""
+
 #. type: <p></p>
 #: guide.sgml:140
 msgid ""
@@ -7877,6 +6464,11 @@ msgid ""
 "anything other than its arguments are changed."
 msgstr ""
 
+#. type: <tag></tag>
+#: guide.sgml:140
+msgid "dist-upgrade"
+msgstr ""
+
 #. type: <p></p>
 #: guide.sgml:149
 msgid ""
@@ -7928,12 +6520,12 @@ 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 "
+"remote Internet sites, local Debian mirrors or CD-ROMs. 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 "
+"combine them to form a complete set of packages. If you have a CD-ROM 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."
+"your CD-ROM before downloading from the Internet."
 msgstr ""
 
 #. type: <example></example>
@@ -8743,12 +7335,64 @@ msgid "Which will use the already fetched archives on the disc."
 msgstr ""
 
 #, fuzzy
-#~ msgid "--keyring <replaceable>filename</replaceable>"
+#~ msgid ""
+#~ "Package: *\n"
+#~ "Pin: release n=karmic*\n"
+#~ "Pin-Priority: 990\n"
+#~ msgstr ""
+#~ "<programlisting>\n"
+#~ "Package: *\n"
+#~ "Pin: release a=unstable\n"
+#~ "Pin-Priority: 50\n"
+
+#, fuzzy
+#~ msgid "Dir Section"
+#~ msgstr "Descrição"
+
+#, fuzzy
+#~ msgid "<replaceable>&synopsis-filename;</replaceable>"
 #~ msgstr ""
 #~ "<programlisting>\n"
 #~ "apt-get install <replaceable>pacote</replaceable>/testing\n"
 
 #, fuzzy
+#~ msgid "&apt-get;,&aptitude;,&apt-conf;"
+#~ msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
+
+#, fuzzy
+#~ msgid "&file-preferences;"
+#~ msgstr "apt_preferences"
+
+#, fuzzy
+#~ msgid "&apt-author.team; &apt-email; &apt-product;"
+#~ msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
+
+#, fuzzy
+#~ msgid ""
+#~ "<!-- Boiler plate docinfo section -->\n"
+#~ "<!ENTITY apt-docinfo \"\n"
+#~ " <refentryinfo>\n"
+#~ "   <address><email>apt@packages.debian.org</email></address>\n"
+#~ "   <author>\n"
+#~ "     <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
+#~ "     <contrib></contrib>\n"
+#~ "   </author>\n"
+#~ "   <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></"
+#~ "copyright>\n"
+#~ "   <date>28 October 2008</date>\n"
+#~ "   <productname>Linux</productname>\n"
+#~ " </refentryinfo>\n"
+#~ "\">\n"
+#~ msgstr ""
+#~ "\n"
+#~ " <docinfo>\n"
+#~ "   <address><email>apt@packages.debian.org</></address>\n"
+#~ "   <author><firstname>Jason</> <surname>Gunthorpe</></>\n"
+#~ "   <copyright><year>1998-2001</> <holder>Jason Gunthorpe</></>\n"
+#~ "   <date>12 Março 2001</>\n"
+#~ " </docinfo>\n"
+
+#, fuzzy
 #~ msgid "to the version that is already installed (if any)."
 #~ msgstr "para a instância que já esteja instalada (caso exista)."
 
@@ -8765,26 +7409,6 @@ msgstr ""
 #~ "Priority: release ...</literal>."
 
 #, fuzzy
-#~ msgid "<filename>/etc/apt/trusted.gpg</filename>"
-#~ msgstr "<filename>/etc/apt.conf</>"
-
-#, fuzzy
-#~ msgid "/usr/share/doc/apt/"
-#~ msgstr "/usr/share/doc/apt/"
-
-#, fuzzy
-#~ msgid "<filename>&docdir;examples/configure-index.gz</>"
-#~ msgstr "<filename>&docdir;examples/configure-index.gz</>"
-
-#, fuzzy
-#~ msgid "/var/lib/apt"
-#~ msgstr "/var/lib/apt"
-
-#, fuzzy
-#~ msgid "/var/cache/apt"
-#~ msgstr "/var/cache/apt"
-
-#, fuzzy
 #~ msgid ""
 #~ "\n"
 #~ "     <VarListEntry><term><option/-h/</><term><option/--help/</>\n"
@@ -8837,13 +7461,5 @@ msgstr ""
 #~ "     </VarListEntry>\n"
 
 #, fuzzy
-#~ msgid "<manvolnum>5</manvolnum>"
-#~ msgstr "<manvolnum>5</manvolnum>"
-
-#, fuzzy
 #~ msgid "</programlisting> Then:"
 #~ msgstr "</programlisting> Então :"
-
-#, fuzzy
-#~ msgid "&manbugs; &manauthor;"
-#~ msgstr "&manbugs; &manauthor;"