Polish manpage translation update (Closes: #675603)

[apt.git] / doc / po / it.po

diff --git a/doc/po/it.po b/doc/po/it.po
index 7c0d1a121114ef5fcb39150e639861bb4bd6d0ed..177905070d3a12fb72fcf0c94309771a306d8e2c 100644 (file)
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -9,7 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"

-"POT-Creation-Date: 2012-05-20 18:22+0300\n"
+"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
+"POT-Creation-Date: 2012-06-02 18:01+0300\n"

 "PO-Revision-Date: 2003-04-26 23:26+0100\n"
 "Last-Translator: Traduzione di Eugenia Franzoni <eugenia@linuxcare.com>\n"
 "Language-Team: <debian-l10n-italian@lists.debian.org>\n"
 "PO-Revision-Date: 2003-04-26 23:26+0100\n"
 "Last-Translator: Traduzione di Eugenia Franzoni <eugenia@linuxcare.com>\n"
 "Language-Team: <debian-l10n-italian@lists.debian.org>\n"


@@ -33,7 +34,7 @@ msgstr ""
 #. type: TH
 #: apt.8:17
 #, no-wrap
 #. type: TH
 #: apt.8:17
 #, no-wrap

-msgid "Debian GNU/Linux"
+msgid "Debian"

 msgstr ""
 
 #. type: SH
 msgstr ""
 
 #. type: SH


@@ -128,31 +129,7 @@ msgid "apt was written by the APT team E<lt>apt@packages.debian.orgE<gt>."
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

-#: apt.ent:2
-msgid "<!-- -*- mode: sgml; mode: fold -*- -->"
-msgstr ""
-
-#. type: Plain text
-#: apt.ent:16
-#, 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 ""
-
-#. type: Plain text
-#: apt.ent:23
+#: apt.ent:7

 #, no-wrap
 msgid ""
 "<!ENTITY apt-author.team \"\n"
 #, no-wrap
 msgid ""
 "<!ENTITY apt-author.team \"\n"


@@ -164,7 +141,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

-#: apt.ent:29
+#: apt.ent:13

 #, no-wrap
 msgid ""
 "<!ENTITY apt-qapage \"\n"
 #, no-wrap
 msgid ""
 "<!ENTITY apt-qapage \"\n"


@@ -175,7 +152,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

-#: apt.ent:40
+#: apt.ent:24

 #, no-wrap
 msgid ""
 "<!-- Boiler plate Bug reporting section -->\n"
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Bug reporting section -->\n"


@@ -191,7 +168,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

-#: apt.ent:48
+#: apt.ent:32

 #, no-wrap
 msgid ""
 "<!-- Boiler plate Author section -->\n"
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Author section -->\n"


@@ -204,7 +181,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

-#: apt.ent:58
+#: apt.ent:42

 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"


@@ -219,7 +196,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

-#: apt.ent:66
+#: apt.ent:50

 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"


@@ -232,7 +209,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

-#: apt.ent:78
+#: apt.ent:62

 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"


@@ -249,7 +226,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

-#: apt.ent:90
+#: apt.ent:74

 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"


@@ -266,7 +243,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

-#: apt.ent:101
+#: apt.ent:85

 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"


@@ -282,7 +259,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

-#: apt.ent:107
+#: apt.ent:91

 #, no-wrap
 msgid ""
 "<!ENTITY file-aptconf \"\n"
 #, no-wrap
 msgid ""
 "<!ENTITY file-aptconf \"\n"


@@ -293,7 +270,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

-#: apt.ent:113
+#: apt.ent:97

 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"


@@ -304,7 +281,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

-#: apt.ent:119
+#: apt.ent:103

 #, no-wrap
 msgid ""
 "<!ENTITY file-cachearchives \"\n"
 #, no-wrap
 msgid ""
 "<!ENTITY file-cachearchives \"\n"


@@ -315,18 +292,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 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"
 #, 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> (<filename>partial</filename> will be implicitly appended). </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
 "     </varlistentry>\n"
 "\">\n"
 msgstr ""
 
 #. type: Plain text

-#: apt.ent:135
+#: apt.ent:119

 #, no-wrap
 msgid ""
 "<!ENTITY file-preferences \"\n"
 #, no-wrap
 msgid ""
 "<!ENTITY file-preferences \"\n"


@@ -341,7 +318,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

-#: apt.ent:141
+#: apt.ent:125

 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"


@@ -352,7 +329,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

-#: apt.ent:147
+#: apt.ent:131

 #, no-wrap
 msgid ""
 "<!ENTITY file-sourceslist \"\n"
 #, no-wrap
 msgid ""
 "<!ENTITY file-sourceslist \"\n"


@@ -363,7 +340,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

-#: apt.ent:153
+#: apt.ent:137

 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"


@@ -374,7 +351,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

-#: apt.ent:160
+#: apt.ent:144

 #, no-wrap
 msgid ""
 "<!ENTITY file-statelists \"\n"
 #, no-wrap
 msgid ""
 "<!ENTITY file-statelists \"\n"


@@ -386,18 +363,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 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"
 #, 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> (<filename>partial</filename> will be implicitly appended).</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
 "     </varlistentry>\n"
 "\">\n"
 msgstr ""
 
 #. type: Plain text

-#: apt.ent:172
+#: apt.ent:156

 #, no-wrap
 msgid ""
 "<!ENTITY file-trustedgpg \"\n"
 #, no-wrap
 msgid ""
 "<!ENTITY file-trustedgpg \"\n"


@@ -408,7 +385,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

-#: apt.ent:179
+#: apt.ent:163

 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"


@@ -420,7 +397,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

-#: apt.ent:187
+#: apt.ent:171

 #, no-wrap
 msgid ""
 "<!ENTITY file-extended_states \"\n"
 #, no-wrap
 msgid ""
 "<!ENTITY file-extended_states \"\n"


@@ -433,7 +410,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 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"
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"


@@ -442,7 +419,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. 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"
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"


@@ -456,7 +433,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. 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"
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"


@@ -472,21 +449,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 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
 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
 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 "
 msgid ""
 "<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
 "t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "


@@ -494,49 +471,49 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 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
 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
 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
 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
 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
 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
 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 "
 msgid ""
 "<!-- TRANSLATOR: used as in apt-extracttemplates -t=temporary_directory e.g. "
 "apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "


@@ -544,21 +521,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 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
 msgid ""
 "<!-- TRANSLATOR: used as in apt-extracttemplates filename --> <!ENTITY "
 "synopsis-filename \"filename\">"
 msgstr ""
 
 #. type: Plain text

-#: apt.ent:247
+#: apt.ent:231

 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">"
 msgstr ""
 
 #. type: Plain text
 msgid ""
 "<!-- 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:250
+#: apt.ent:234

 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-override "
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-override "


@@ -566,7 +543,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

-#: apt.ent:253
+#: apt.ent:237

 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix "
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix "


@@ -574,44 +551,30 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

-#: apt.ent:256
+#: apt.ent:240

 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "generate section --> <!ENTITY synopsis-section \"section\">"
 msgstr ""
 
 #. type: Plain text
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "generate section --> <!ENTITY synopsis-section \"section\">"
 msgstr ""
 
 #. type: Plain text

-#: apt.ent:259
+#: apt.ent:243

 msgid ""
 "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
 "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
 msgstr ""
 
 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
-#, fuzzy
-msgid "apt-cache"
-msgstr "apt-get"
-

 #. 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
 #. 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
+#: apt-key.8.xml:25 apt-mark.8.xml:26 apt-secure.8.xml:25

 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
 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
+#: apt-key.8.xml:26 apt-mark.8.xml:27 apt-secure.8.xml:26
+#: apt-sortpkgs.1.xml:27 apt.conf.5.xml:32 apt_preferences.5.xml:26

 #: sources.list.5.xml:27
 msgid "APT"
 msgstr ""
 #: sources.list.5.xml:27
 msgid "APT"
 msgstr ""


@@ -624,8 +587,8 @@ 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
 #. 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
+#: apt-key.8.xml:37 apt-mark.8.xml:38 apt-secure.8.xml:50
+#: apt-sortpkgs.1.xml:38 apt.conf.5.xml:41 apt_preferences.5.xml:36

 #: sources.list.5.xml:36
 msgid "Description"
 msgstr ""
 #: sources.list.5.xml:36
 msgid "Description"
 msgstr ""


@@ -640,17 +603,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-cache.8.xml:44 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 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 ""
 
 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 ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:49
 msgid ""


@@ -658,9 +617,11 @@ msgid ""
 "implicitly by all commands needing this cache if it is missing or outdated."
 msgstr ""
 
 "implicitly by all commands needing this cache if it is missing or outdated."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:53
-msgid "showpkg <replaceable>&synopsis-pkg;</replaceable>…"
+#. 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><refsect1><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>


@@ -705,11 +666,6 @@ msgid ""
 "best to consult the apt source code."
 msgstr ""
 
 "best to consult the apt source code."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:87
-msgid "stats"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:87
 msgid ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:87
 msgid ""


@@ -739,9 +695,9 @@ 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, "
 "<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\"."
+"\"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>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>


@@ -749,8 +705,8 @@ msgstr ""
 msgid ""
 "<literal>Single virtual packages</literal> is the number of packages with "
 "only one package providing a particular virtual package. For example, in the "
 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\"."
+"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>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>


@@ -758,8 +714,8 @@ msgstr ""
 msgid ""
 "<literal>Mixed virtual packages</literal> is the number of packages that "
 "either provide a particular virtual package or have the virtual package name "
 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."
+"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>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>


@@ -777,9 +733,9 @@ msgstr ""
 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 "
 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."
+"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>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>


@@ -789,22 +745,12 @@ msgid ""
 "relationships claimed by all of the packages in the cache."
 msgstr ""
 
 "relationships claimed by all of the packages in the cache."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:142
-msgid "showsrc <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:143
 msgid ""
 "<literal>showsrc</literal> displays all the source package records that "
 "match the given package names. All versions are shown, as well as all "
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:143
 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:148 apt-config.8.xml:75
-msgid "dump"
+"records that declare the name to be a binary package."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>


@@ -814,11 +760,6 @@ msgid ""
 "It is primarily for debugging."
 msgstr ""
 
 "It is primarily for debugging."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:153
-msgid "dumpavail"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:154
 msgid ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:154
 msgid ""


@@ -826,11 +767,6 @@ msgid ""
 "suitable for use with &dpkg; and is used by the &dselect; method."
 msgstr ""
 
 "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:158
-msgid "unmet"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:159
 msgid ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:159
 msgid ""


@@ -838,11 +774,6 @@ msgid ""
 "package cache."
 msgstr ""
 
 "package cache."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:163
-msgid "show <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:164
 msgid ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:164
 msgid ""


@@ -850,64 +781,52 @@ msgid ""
 "avail</command>; it displays the package records for the named packages."
 msgstr ""
 
 "avail</command>; it displays the package records for the named packages."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>

 #: apt-cache.8.xml:169
 #: apt-cache.8.xml:169

-msgid "search <replaceable>&synopsis-regex;</replaceable>…"
+msgid "&synopsis-regex;"

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:170
 msgid ""
 "<literal>search</literal> performs a full text search on all available "
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: 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 "
-"<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."
+"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><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:183
+#: apt-cache.8.xml:181

 msgid ""
 "Separate arguments can be used to specify multiple search patterns that are "
 "and'ed together."
 msgstr ""
 
 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:187
-msgid "depends <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:188
+#: 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 ""
 
 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:192
-msgid "rdepends <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:193
+#: 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>
 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:197
-msgid "pkgnames [ <replaceable>&synopsis-prefix;</replaceable> ]"
+#: apt-cache.8.xml:195
+msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:198
+#: 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 "
 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 "


@@ -917,20 +836,15 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:203
+#: 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 ""
 
 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:208
-msgid "dotty <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:209
+#: 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."
 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."


@@ -943,38 +857,33 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:218
+#: apt-cache.8.xml:216

 msgid ""
 "The resulting nodes will have several shapes; normal packages are boxes, "
 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."
+"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>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:223
+#: apt-cache.8.xml:221

 msgid "Caution, dotty cannot graph larger sets of packages."
 msgstr ""
 
 msgid "Caution, dotty cannot graph larger sets of packages."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:226
-msgid "xvcg <replaceable>&synopsis-pkg;</replaceable>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:227
+#: 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>
 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:231
-msgid "policy [ <replaceable>&synopsis-pkg;</replaceable>… ]"
+#: apt-cache.8.xml:229
+msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:232
+#: 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 "
 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 "


@@ -982,13 +891,8 @@ msgid ""
 "selection of the named package."
 msgstr ""
 
 "selection of the named package."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:238
-msgid "madison <replaceable>&synopsis-pkg;</replaceable>…"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:239
+#: 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 "
 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 "


@@ -999,44 +903,23 @@ msgid ""
 "Architecture</literal>)."
 msgstr ""
 
 "Architecture</literal>)."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:250 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:586 apt.conf.5.xml:608
+#. type: Content of: <refentry><refsect1><title>
+#: apt-cache.8.xml:248 apt-config.8.xml:84 apt-extracttemplates.1.xml:52
+#: apt-ftparchive.1.xml:504 apt-get.8.xml:258 apt-mark.8.xml:108
+#: apt-sortpkgs.1.xml:48

 msgid "options"
 msgstr ""
 
 msgid "options"
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:254
-msgid "<option>-p</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:254
-msgid "<option>--pkg-cache</option>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:255
+#: 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 ""
 
 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:260 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:260
-msgid "<option>--src-cache</option>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:261
+#: 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 "
 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 "


@@ -1045,18 +928,8 @@ msgid ""
 "Item: <literal>Dir::Cache::srcpkgcache</literal>."
 msgstr ""
 
 "Item: <literal>Dir::Cache::srcpkgcache</literal>."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:268 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:268 apt-ftparchive.1.xml:525 apt-get.8.xml:311
-msgid "<option>--quiet</option>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:269
+#: 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 "
 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 "


@@ -1064,66 +937,16 @@ msgid ""
 "configuration file.  Configuration Item: <literal>quiet</literal>."
 msgstr ""
 
 "configuration file.  Configuration Item: <literal>quiet</literal>."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:275
-msgid "<option>-i</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:275
-msgid "<option>--important</option>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:276
+#: apt-cache.8.xml:274

 msgid ""
 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:281
-msgid "<option>--no-pre-depends</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:282
-msgid "<option>--no-depends</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:283
-msgid "<option>--no-recommends</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:284
-msgid "<option>--no-suggests</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:285
-msgid "<option>--no-conflicts</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:286
-msgid "<option>--no-breaks</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:287
-msgid "<option>--no-replaces</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288
-msgid "<option>--no-enhances</option>"
+"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>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:289
+#: 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 "
 msgid ""
 "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
 "print all dependencies. This can be tweaked with these flags which will omit "


@@ -1132,186 +955,106 @@ msgid ""
 "Cache::ShowRecommends</literal>."
 msgstr ""
 
 "Cache::ShowRecommends</literal>."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:295 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:295
-msgid "<option>--full</option>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:296
+#: apt-cache.8.xml:295

 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
 msgstr ""
 
 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:300 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:300
-msgid "<option>--all-versions</option>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:301
+#: 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-"
 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 "
+"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 ""
 
 "(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:309
-msgid "<option>-g</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:309
-msgid "<option>--generate</option>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:310
+#: 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 ""
 
 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:315
-msgid "<option>--names-only</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:315 apt-cdrom.8.xml:129
-msgid "<option>-n</option>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:316
+#: apt-cache.8.xml:315

 msgid ""
 "Only search on the package names, not the long descriptions.  Configuration "
 "Item: <literal>APT::Cache::NamesOnly</literal>."
 msgstr ""
 
 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:320
-msgid "<option>--all-names</option>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:321
+#: 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 ""
 
 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:326
-msgid "<option>--recurse</option>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:327
+#: 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 ""
 
 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:332
-msgid "<option>--installed</option>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:334
+#: apt-cache.8.xml: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 ""
 
 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:339 apt-cdrom.8.xml:140 apt-config.8.xml:104
-#: apt-extracttemplates.1.xml:62 apt-ftparchive.1.xml:591 apt-get.8.xml:514
-#: apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
-msgid "&apt-commonoptions;"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>

-#: apt-cache.8.xml:344 apt-get.8.xml:519 apt-key.8.xml:167 apt-mark.8.xml:126
-#: apt.conf.5.xml:1119 apt_preferences.5.xml:697
+#: apt-cache.8.xml:343 apt-get.8.xml:518 apt-key.8.xml:174 apt-mark.8.xml:125
+#: apt.conf.5.xml:1118 apt_preferences.5.xml:698

 msgid "Files"
 msgstr ""
 
 msgid "Files"
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:346
-msgid "&file-sourceslist; &file-statelists;"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>

-#: apt-cache.8.xml:351 apt-cdrom.8.xml:145 apt-config.8.xml:109
-#: apt-extracttemplates.1.xml:69 apt-ftparchive.1.xml:607 apt-get.8.xml:529
-#: apt-key.8.xml:188 apt-mark.8.xml:132 apt-secure.8.xml:185
-#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1125 apt_preferences.5.xml:704
-#: sources.list.5.xml:255
+#: apt-cache.8.xml:350 apt-cdrom.8.xml:144 apt-config.8.xml:109
+#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:528
+#: apt-key.8.xml:195 apt-mark.8.xml:131 apt-secure.8.xml:192
+#: apt-sortpkgs.1.xml:63 apt.conf.5.xml:1124 apt_preferences.5.xml:705
+#: sources.list.5.xml:252

 msgid "See Also"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "See Also"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-cache.8.xml:352
+#: apt-cache.8.xml:351

 msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:114
-#: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:611 apt-get.8.xml:535
-#: apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
+#: apt-cache.8.xml:355 apt-cdrom.8.xml:149 apt-config.8.xml:114
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:534
+#: apt-mark.8.xml:135 apt-sortpkgs.1.xml:67

 msgid "Diagnostics"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "Diagnostics"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-cache.8.xml:357
+#: apt-cache.8.xml:356

 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
 msgstr ""
 
 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
 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
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-cdrom.8.xml:32

-msgid "APT CDROM management utility"
+msgid "APT CD-ROM management utility"

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-cdrom.8.xml:38
 msgid ""
 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 "
+"<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."
 "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."


@@ -1321,119 +1064,66 @@ msgstr ""
 #: apt-cdrom.8.xml:45
 msgid ""
 "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
 #: 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 "
+"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 ""
 
 "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>
+#. 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 "
 #: 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 "
+"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 "
 "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 "
+"<filename>.disk</filename> directory you will be prompted for a descriptive "

 "title."
 msgstr ""
 
 "title."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

 #: apt-cdrom.8.xml:64
 msgid ""
 #: apt-cdrom.8.xml:64
 msgid ""

-"APT uses a CDROM ID to track which disc is currently in the drive and "
+"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 ""
 
 "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>
+#. 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 ""
 
 #: 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>
 #. type: Content of: <refentry><refsect1><title>

-#: apt-cdrom.8.xml:81 apt-key.8.xml:153
+#: apt-cdrom.8.xml:80 apt-key.8.xml:160

 msgid "Options"
 msgstr ""
 
 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>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cdrom.8.xml:86
+#: apt-cdrom.8.xml:85

 msgid ""
 msgid ""

-"Mount point; specify the location to mount the cdrom. This mount point must "
+"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 ""
 
 "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>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cdrom.8.xml:95
+#: apt-cdrom.8.xml:94

 msgid ""
 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>"
+"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>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cdrom.8.xml:104
+#: 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 ""
 
 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>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cdrom.8.xml:112
+#: 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 "
 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 "


@@ -1441,36 +1131,16 @@ msgid ""
 "Item: <literal>APT::CDROM::Fast</literal>."
 msgstr ""
 
 "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>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cdrom.8.xml:122
+#: 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 ""
 
 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>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cdrom.8.xml:133
+#: 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: "
 msgid ""
 "No Changes; Do not change the &sources-list; file and do not write index "
 "files. Everything is still checked however.  Configuration Item: "


@@ -1478,31 +1148,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-cdrom.8.xml:146
+#: apt-cdrom.8.xml:145

 msgid "&apt-conf;, &apt-get;, &sources-list;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "&apt-conf;, &apt-get;, &sources-list;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-cdrom.8.xml:151
+#: apt-cdrom.8.xml:150

 msgid ""
 "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
 "on error."
 msgstr ""
 
 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"
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-config.8.xml:33
 msgid "APT Configuration Query program"


@@ -1514,19 +1170,7 @@ 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 "
 "<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"
+"manner that is easy to use for scripted applications."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>


@@ -1534,9 +1178,9 @@ msgstr ""
 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 "
 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:"
+"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>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>


@@ -1568,11 +1212,6 @@ msgstr ""
 msgid "Just show the contents of the configuration space."
 msgstr ""
 
 msgid "Just show the contents of the configuration space."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-config.8.xml:89
-msgid "<option>--empty</option>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-config.8.xml:90
 msgid ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-config.8.xml:90
 msgid ""


@@ -1580,27 +1219,24 @@ msgid ""
 "empty to remove them from the output."
 msgstr ""
 
 "empty to remove them from the output."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>

 #: apt-config.8.xml:95
 #: apt-config.8.xml:95

-msgid ""
-"<option>--format '<replaceable>&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;"
-"n</replaceable>'</option>"
+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 "
 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 "

-"the name of the option, &percnt;f with the complete optionname and &percnt;v "
-"with the value of the option.  Use uppercase letters and special characters "
-"in the value will be encoded to ensure that it can e.g. be savely used in a "
-"quoted-string as defined by RFC822. Additionally &percnt;n will be replaced "
-"by a newline, &percnt;N by a tab. A &percnt; can be printed by using &percnt;"
-"&percnt;."
+"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>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-config.8.xml:110 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:608
+#: apt-config.8.xml:110 apt-extracttemplates.1.xml:71 apt-ftparchive.1.xml:608

 #: apt-sortpkgs.1.xml:64
 msgid "&apt-conf;"
 msgstr ""
 #: apt-sortpkgs.1.xml:64
 msgid "&apt-conf;"
 msgstr ""


@@ -1612,11 +1248,6 @@ msgid ""
 "on error."
 msgstr ""
 
 "on error."
 msgstr ""
 

-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-extracttemplates.1.xml:25 apt-extracttemplates.1.xml:32
-msgid "apt-extracttemplates"
-msgstr ""
-

 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt-extracttemplates.1.xml:26 apt-ftparchive.1.xml:26 apt-sortpkgs.1.xml:26
 msgid "1"
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt-extracttemplates.1.xml:26 apt-ftparchive.1.xml:26 apt-sortpkgs.1.xml:26
 msgid "1"


@@ -1624,7 +1255,9 @@ msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-extracttemplates.1.xml:33
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-extracttemplates.1.xml:33

-msgid "Utility to extract DebConf config and templates from Debian packages"
+msgid ""
+"Utility to extract <command>debconf</command> config and templates from "
+"Debian packages"

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>


@@ -1646,49 +1279,27 @@ msgstr ""
 #: apt-extracttemplates.1.xml:45
 msgid ""
 "template-file and config-script are written to the temporary directory "
 #: 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:448
-msgid "<option>-t</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:55
-msgid "<option>--tempdir</option>"
+"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>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-extracttemplates.1.xml:57
+#: apt-extracttemplates.1.xml:58

 msgid ""
 msgid ""

-"Temporary directory in which to write extracted debconf template files and "
-"config scripts.  Configuration Item: <literal>APT::ExtractTemplates::"
-"TempDir</literal>"
+"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>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-extracttemplates.1.xml:74
+#: apt-extracttemplates.1.xml:75

 msgid ""
 "<command>apt-extracttemplates</command> returns zero on normal operation, "
 "decimal 100 on error."
 msgstr ""
 
 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>"
-msgstr ""
-
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-ftparchive.1.xml:25 apt-ftparchive.1.xml:32
-msgid "apt-ftparchive"
-msgstr ""
-

 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-ftparchive.1.xml:33
 msgid "Utility to generate index files"
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-ftparchive.1.xml:33
 msgid "Utility to generate index files"


@@ -1723,11 +1334,6 @@ msgid ""
 "output files."
 msgstr ""
 
 "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 ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:60
 msgid ""


@@ -1743,11 +1349,6 @@ msgid ""
 "The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr ""
 
 "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 ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:70
 msgid ""


@@ -1765,11 +1366,6 @@ msgid ""
 "change the source override file that will be used."
 msgstr ""
 
 "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 ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:82
 msgid ""


@@ -1781,11 +1377,6 @@ msgid ""
 "package is separated by a comma in the output."
 msgstr ""
 
 "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 ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:94
 msgid ""


@@ -1814,12 +1405,6 @@ msgid ""
 "<literal>Description</literal>."
 msgstr ""
 
 "<literal>Description</literal>."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:115
-#, fuzzy
-msgid "generate"
-msgstr "Descrizione generale"
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:117
 msgid ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:117
 msgid ""


@@ -1830,11 +1415,6 @@ msgid ""
 "maintaining the required settings."
 msgstr ""
 
 "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 ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:126
 msgid ""


@@ -1866,7 +1446,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt-ftparchive.1.xml:144
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt-ftparchive.1.xml:144

-msgid "Dir Section"
+msgid "<literal>Dir</literal> Section"

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>


@@ -1878,11 +1458,6 @@ msgid ""
 "to produce a complete an absolute path."
 msgstr ""
 
 "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 ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:153
 msgid ""


@@ -1891,31 +1466,16 @@ msgid ""
 "nodes."
 msgstr ""
 
 "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><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><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 ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:170
 msgid ""


@@ -1925,7 +1485,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt-ftparchive.1.xml:176
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt-ftparchive.1.xml:176

-msgid "Default Section"
+msgid "<literal>Default</literal> Section"

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>


@@ -1936,11 +1496,6 @@ msgid ""
 "override these defaults with a per-section setting."
 msgstr ""
 
 "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 ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:184
 msgid ""


@@ -1950,11 +1505,6 @@ msgid ""
 "'. gzip'."
 msgstr ""
 
 "'. 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 ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:192
 msgid ""


@@ -1962,11 +1512,6 @@ msgid ""
 "defaults to '.deb'."
 msgstr ""
 
 "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 ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:198
 msgid ""


@@ -1974,11 +1519,6 @@ msgid ""
 "controls the compression for the Sources files."
 msgstr ""
 
 "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 ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:204
 msgid ""


@@ -1986,11 +1526,6 @@ msgid ""
 "defaults to '.dsc'."
 msgstr ""
 
 "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 ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:210
 msgid ""


@@ -1998,11 +1533,6 @@ msgid ""
 "controls the compression for the Contents files."
 msgstr ""
 
 "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 ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:216
 msgid ""


@@ -2010,11 +1540,6 @@ msgid ""
 "controls the compression for the Translation-en master file."
 msgstr ""
 
 "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 ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:222
 msgid ""


@@ -2023,11 +1548,6 @@ msgid ""
 "Links</literal> setting."
 msgstr ""
 
 "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 ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:229
 msgid ""


@@ -2035,11 +1555,6 @@ msgid ""
 "index files are set to this mode with no regard to the umask."
 msgstr ""
 
 "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
-msgid "LongDescription"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:236 apt-ftparchive.1.xml:382
 msgid ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:236 apt-ftparchive.1.xml:382
 msgid ""


@@ -2049,7 +1564,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt-ftparchive.1.xml:242
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt-ftparchive.1.xml:242

-msgid "TreeDefault Section"
+msgid "<literal>TreeDefault</literal> Section"

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>


@@ -2060,11 +1575,6 @@ msgid ""
 "$(SECTION) and $(ARCH) replaced with their respective values."
 msgstr ""
 
 "$(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 ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:251
 msgid ""


@@ -2073,11 +1583,6 @@ msgid ""
 "be rebuilt."
 msgstr ""
 
 "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 ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:258
 msgid ""


@@ -2089,11 +1594,6 @@ msgid ""
 "anyhow. The default is 10, the units are in days."
 msgstr ""
 
 "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 ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:269
 msgid ""


@@ -2101,11 +1601,6 @@ msgid ""
 "$(SECTION)/binary-$(ARCH)/</filename>"
 msgstr ""
 
 "$(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 ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:275
 msgid ""


@@ -2113,11 +1608,6 @@ msgid ""
 "$(DIST)/$(SECTION)/source/</filename>"
 msgstr ""
 
 "$(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 ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:281
 msgid ""


@@ -2125,11 +1615,6 @@ msgid ""
 "binary-$(ARCH)/Packages</filename>"
 msgstr ""
 
 "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 ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:287
 msgid ""


@@ -2137,11 +1622,6 @@ msgid ""
 "source/Sources</filename>"
 msgstr ""
 
 "source/Sources</filename>"
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:291
-msgid "Translation"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:293
 msgid ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:293
 msgid ""


@@ -2150,11 +1630,6 @@ msgid ""
 "$(SECTION)/i18n/Translation-en</filename>"
 msgstr ""
 
 "$(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 ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:300
 msgid ""


@@ -2163,11 +1638,6 @@ msgid ""
 "filename>"
 msgstr ""
 
 "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 ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:307
 msgid ""


@@ -2177,21 +1647,11 @@ msgid ""
 "command> will integrate those package files together automatically."
 msgstr ""
 
 "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><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 ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:321
 msgid ""


@@ -2199,11 +1659,6 @@ msgid ""
 "can share the same database."
 msgstr ""
 
 "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 ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:327
 msgid ""


@@ -2212,11 +1667,6 @@ msgid ""
 "Relative files names are prefixed with the archive directory."
 msgstr ""
 
 "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 ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:334
 msgid ""


@@ -2228,7 +1678,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt-ftparchive.1.xml:342
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt-ftparchive.1.xml:342

-msgid "Tree Section"
+msgid "<literal>Tree</literal> Section"

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>


@@ -2276,11 +1726,6 @@ msgid ""
 "\" id=\"0\"/>"
 msgstr ""
 
 "\" id=\"0\"/>"
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:366
-msgid "Sections"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:368
 msgid ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:368
 msgid ""


@@ -2289,11 +1734,6 @@ msgid ""
 "free</literal>"
 msgstr ""
 
 "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 ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:375
 msgid ""


@@ -2302,11 +1742,6 @@ msgid ""
 "this tree has a source archive."
 msgstr ""
 
 "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 ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:388
 msgid ""


@@ -2314,11 +1749,6 @@ msgid ""
 "and maintainer address information."
 msgstr ""
 
 "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 ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:394
 msgid ""


@@ -2326,21 +1756,11 @@ msgid ""
 "information."
 msgstr ""
 
 "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><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."
 #. 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."


@@ -2348,7 +1768,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt-ftparchive.1.xml:410
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt-ftparchive.1.xml:410

-msgid "BinDirectory Section"
+msgid "<literal>BinDirectory</literal> Section"

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>


@@ -2393,21 +1813,11 @@ msgstr ""
 msgid "Sets the cache DB."
 msgstr ""
 
 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><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."
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:466
 msgid "Specifies the file list file."


@@ -2477,12 +1887,6 @@ msgid ""
 "tag and the remainder of the line is the new value."
 msgstr ""
 
 "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 ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:510
 msgid ""


@@ -2497,11 +1901,6 @@ msgid ""
 "<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
 msgstr ""
 
 "<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 ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:521
 msgid ""


@@ -2518,11 +1917,6 @@ msgid ""
 "file.  Configuration Item: <literal>quiet</literal>."
 msgstr ""
 
 "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 ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:535
 msgid ""


@@ -2532,11 +1926,6 @@ msgid ""
 "Item: <literal>APT::FTPArchive::DeLinkAct</literal>."
 msgstr ""
 
 "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 ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:543
 msgid ""


@@ -2547,11 +1936,6 @@ msgid ""
 "Configuration Item: <literal>APT::FTPArchive::Contents</literal>."
 msgstr ""
 
 "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 ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:553
 msgid ""


@@ -2560,11 +1944,6 @@ msgid ""
 "literal>."
 msgstr ""
 
 "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 ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:559
 msgid ""


@@ -2572,11 +1951,6 @@ msgid ""
 "FTPArchive::ReadOnlyDB</literal>."
 msgstr ""
 
 "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 ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:564
 msgid ""


@@ -2586,11 +1960,6 @@ msgid ""
 "path.  Configuration Item: <literal>APT::FTPArchive::Architecture</literal>."
 msgstr ""
 
 "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 ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:572
 msgid ""


@@ -2605,11 +1974,6 @@ msgid ""
 "are useless."
 msgstr ""
 
 "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 ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:584
 msgid ""


@@ -2621,8 +1985,8 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1113 apt_preferences.5.xml:544
-#: sources.list.5.xml:214
+#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1112 apt_preferences.5.xml:545
+#: sources.list.5.xml:211

 msgid "Examples"
 msgstr ""
 
 msgid "Examples"
 msgstr ""
 


@@ -2646,20 +2010,6 @@ msgid ""
 "100 on error."
 msgstr ""
 
 "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
-#, fuzzy
-msgid "apt-get"
-msgstr "apt-get"
-

 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-get.8.xml:33
 msgid "APT package handling utility -- command-line interface"
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-get.8.xml:33
 msgid "APT package handling utility -- command-line interface"


@@ -2674,12 +2024,6 @@ msgid ""
 "&aptitude;, &synaptic; and &wajig;."
 msgstr ""
 
 "&aptitude;, &synaptic; and &wajig;."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:48 apt-key.8.xml:119
-#, fuzzy
-msgid "update"
-msgstr "upgrade"
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:49
 msgid ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:49
 msgid ""


@@ -2694,12 +2038,6 @@ msgid ""
 "as the size of the package files cannot be known in advance."
 msgstr ""
 
 "as the size of the package files cannot be known in advance."
 msgstr ""
 

-#. type: <tag></tag>
-#: apt-get.8.xml:60 guide.sgml:121
-#, fuzzy
-msgid "upgrade"
-msgstr "upgrade"
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:61
 msgid ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:61
 msgid ""


@@ -2715,15 +2053,24 @@ msgid ""
 "command> knows that new versions of packages are available."
 msgstr ""
 
 "command> knows that new versions of packages are available."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:73
-#, fuzzy
-msgid "dselect-upgrade"
-msgstr "dist-upgrade"
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:74
 msgid ""
 #. 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:87
+msgid ""

 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
 "literal> follows the changes made by &dselect; to the <literal>Status</"
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
 "literal> follows the changes made by &dselect; to the <literal>Status</"


@@ -2732,46 +2079,21 @@ msgid ""
 "new packages)."
 msgstr ""
 
 "new packages)."
 msgstr ""
 

-#. type: <tag></tag>
-#: apt-get.8.xml:83 guide.sgml:140
-#, fuzzy
-msgid "dist-upgrade"
-msgstr "dist-upgrade"
-
-#. 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
-#, fuzzy
-msgid "install"
-msgstr "install"
-

 #. 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 "
 #. 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>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>


@@ -2823,26 +2145,16 @@ msgid ""
 "expression."
 msgstr ""
 
 "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 "
 #. 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 ""
 
 "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 ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:159
 msgid ""


@@ -2851,11 +2163,6 @@ msgid ""
 "too)."
 msgstr ""
 
 "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 ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:164
 msgid ""


@@ -2872,14 +2179,14 @@ msgstr ""
 #: apt-get.8.xml:172
 msgid ""
 "Source packages are tracked separately from binary packages via <literal>deb-"
 #: 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>
 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 "
 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 "


@@ -2889,7 +2196,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 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 "
 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 "


@@ -2899,20 +2206,15 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:192
+#: apt-get.8.xml:191

 msgid ""
 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>
 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 "
 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 "


@@ -2921,32 +2223,22 @@ msgid ""
 "option> option instead."
 msgstr ""
 
 "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>
 #. 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 ""
 
 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>
 #. 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>
 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 "
 msgid ""
 "<literal>clean</literal> clears out the local repository of retrieved "
 "package files. It removes everything but the lock file from "


@@ -2957,13 +2249,8 @@ msgid ""
 "disk space."
 msgstr ""
 
 "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>
 #. 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 "
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "


@@ -2974,80 +2261,51 @@ msgid ""
 "is set to off."
 msgstr ""
 
 "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>
 #. 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 ""
 
 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>
 #. 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> "
 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 ""
 
 "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>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. 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 ""
 
 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>
 #. 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 ""
 
 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>
 #. 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 ""
 
 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>
 #. 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 "
 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 "


@@ -3062,20 +2320,10 @@ msgid ""
 "<literal>APT::Get::Fix-Broken</literal>."
 msgstr ""
 
 "<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>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:294
+#: apt-get.8.xml:293

 msgid ""
 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 "
 "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 "


@@ -3084,13 +2332,8 @@ msgid ""
 "Configuration Item: <literal>APT::Get::Fix-Missing</literal>."
 msgstr ""
 
 "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>
 #. 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 "
 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 "


@@ -3098,29 +2341,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 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 "
 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 "
 "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 ""
 
 "<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>
 #. 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::"
 msgid ""
 "No action; perform a simulation of events that would occur but do not "
 "actually change the system.  Configuration Item: <literal>APT::Get::"


@@ -3128,38 +2361,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:331
+#: apt-get.8.xml:330

 msgid ""
 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>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:337
+#: apt-get.8.xml:338

 msgid ""
 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>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>


@@ -3172,11 +2392,6 @@ msgid ""
 "Configuration Item: <literal>APT::Get::Assume-Yes</literal>."
 msgstr ""
 
 "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 ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:354
 msgid ""


@@ -3184,33 +2399,13 @@ msgid ""
 "Assume-No</literal>."
 msgstr ""
 
 "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 ""
 #. 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 ""
 
 "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 ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:365
 msgid ""


@@ -3218,11 +2413,6 @@ msgid ""
 "<literal>APT::Get::Show-Versions</literal>."
 msgstr ""
 
 "<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 ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:371
 msgid ""


@@ -3234,21 +2424,6 @@ msgid ""
 "Architecture</literal>"
 msgstr ""
 
 "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 ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:381
 msgid ""


@@ -3256,73 +2431,48 @@ msgid ""
 "<literal>APT::Get::Compile</literal>."
 msgstr ""
 
 "<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 ""
 #. 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 ""
 
 "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 ""
 #. 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 ""
 
 "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 ""
 #. 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</"
+"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 ""
 
 "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:407
-msgid "<option>--force-yes</option>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:408
 msgid ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: 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 ""
 
 "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:415
-msgid "<option>--print-uris</option>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:416
 msgid ""
 "Instead of fetching the files to install their URIs are printed. Each URI "
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: 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</"
 "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</"


@@ -3331,11 +2481,6 @@ msgid ""
 "Print-URIs</literal>."
 msgstr ""
 
 "Print-URIs</literal>."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:426
-msgid "<option>--purge</option>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:427
 msgid ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:427
 msgid ""


@@ -3345,48 +2490,28 @@ msgid ""
 "command.  Configuration Item: <literal>APT::Get::Purge</literal>."
 msgstr ""
 
 "command.  Configuration Item: <literal>APT::Get::Purge</literal>."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:434
-msgid "<option>--reinstall</option>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:435
 msgid ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: 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 ""
 
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:439
-msgid "<option>--list-cleanup</option>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:440
 msgid ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: 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:449
-msgid "<option>--target-release</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:450
-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>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:451
+#: apt-get.8.xml:450

 msgid ""
 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 "
 "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 "


@@ -3397,53 +2522,33 @@ msgid ""
 "also the &apt-preferences; manual page."
 msgstr ""
 
 "also the &apt-preferences; manual page."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:464
-msgid "<option>--trivial-only</option>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:466
+#: apt-get.8.xml:465

 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 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 ""
 
 "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:472
-msgid "<option>--no-remove</option>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:473
+#: apt-get.8.xml:472

 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
 msgstr ""
 
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:478
-msgid "<option>--auto-remove</option>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:479
+#: apt-get.8.xml:478

 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 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 ""
 
 "<literal>APT::Get::AutomaticRemove</literal>."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:485
-msgid "<option>--only-source</option>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:486
+#: apt-get.8.xml:485

 msgid ""
 "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
 "literal> commands.  Indicates that the given source names are not to be "
 msgid ""
 "Only has meaning for the <literal>source</literal> and <literal>build-dep</"
 "literal> commands.  Indicates that the given source names are not to be "


@@ -3454,63 +2559,31 @@ msgid ""
 "Source</literal>."
 msgstr ""
 
 "Source</literal>."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:496
-msgid "<option>--diff-only</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:496
-msgid "<option>--dsc-only</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:496
-msgid "<option>--tar-only</option>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:497
+#: apt-get.8.xml:496

 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
 "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
 "literal>, and <literal>APT::Get::Tar-Only</literal>."
 msgstr ""
 
 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
 "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
 "literal>, and <literal>APT::Get::Tar-Only</literal>."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:502
-msgid "<option>--arch-only</option>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:503
+#: apt-get.8.xml:502

 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
 msgstr ""
 
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:507
-msgid "<option>--allow-unauthenticated</option>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:508
+#: apt-get.8.xml:507

 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
 "is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
 "AllowUnauthenticated</literal>."
 msgstr ""
 
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
 "is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
 "AllowUnauthenticated</literal>."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:521
-msgid ""
-"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
-"&file-statelists;"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt-get.8.xml:530
+#: apt-get.8.xml:529

 msgid ""
 "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
 "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
 msgid ""
 "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
 "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"


@@ -3518,45 +2591,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-get.8.xml:536
+#: apt-get.8.xml:535

 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
 msgstr ""
 
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:539
-msgid "ORIGINAL AUTHORS"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:540
-msgid "&apt-author.jgunthorpe;"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:543
-msgid "CURRENT AUTHORS"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:545
-msgid "&apt-author.team;"
-msgstr ""
-
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-key.8.xml:17 apt-key.8.xml:24
-#, fuzzy
-msgid "apt-key"
-msgstr "apt-get"
-

 #. type: Content of: <refentry><refnamediv><refpurpose>
 #. type: Content of: <refentry><refnamediv><refpurpose>

-#: apt-key.8.xml:25
+#: apt-key.8.xml:32

 msgid "APT key management utility"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "APT key management utility"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-key.8.xml:32
+#: 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 "
 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 "


@@ -3564,87 +2611,52 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt-key.8.xml:38
+#: apt-key.8.xml:45

 msgid "Commands"
 msgstr ""
 
 msgid "Commands"
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:40
-msgid "add &synopsis-param-filename;"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-key.8.xml:43
+#: 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 ""
 
 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><term>
-#: apt-key.8.xml:52
-msgid "del &synopsis-param-keyid;"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-key.8.xml:56
-msgid "Remove a key from the list of trusted keys."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

 #: apt-key.8.xml:63
 #: apt-key.8.xml:63

-msgid "export &synopsis-param-keyid;"
+msgid "Remove a key from the list of trusted keys."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 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."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

 #: apt-key.8.xml:74
 #: apt-key.8.xml:74

-msgid "exportall"
+msgid "Output the key &synopsis-param-keyid; to standard output."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-key.8.xml:78
-msgid "Output all trusted keys to standard output."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

 #: apt-key.8.xml:85
 #: apt-key.8.xml:85

-msgid "list"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:89
-msgid "List trusted keys."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:96
-msgid "finger"
+msgid "Output all trusted keys to standard output."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-key.8.xml:100
-msgid "List fingerprints of trusted keys."
+#: apt-key.8.xml:96
+msgid "List trusted keys."

 msgstr ""
 
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

 #: apt-key.8.xml:107
 #: apt-key.8.xml:107

-msgid "adv"
+msgid "List fingerprints of trusted keys."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 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>
 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 "
 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 "


@@ -3653,14 +2665,8 @@ msgid ""
 "Debian."
 msgstr ""
 
 "Debian."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:133
-#, fuzzy
-msgid "net-update"
-msgstr "upgrade"
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. 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.  "
 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.  "


@@ -3671,19 +2677,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 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 ""
 
 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>
 #. 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 "
 "command should operate on. The default is that a command is executed on the "
 msgid ""
 "With this option it is possible to specify a specific keyring file the "
 "command should operate on. The default is that a command is executed on the "


@@ -3693,60 +2694,42 @@ msgid ""
 "this one."
 msgstr ""
 
 "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>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-key.8.xml:172
+#: apt-key.8.xml:179

 msgid "<filename>/etc/apt/trustdb.gpg</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<filename>/etc/apt/trustdb.gpg</filename>"
 msgstr ""
 
 #. 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>
 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>
 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>
 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>
 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>
 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

 msgid "&apt-get;, &apt-secure;"
 msgstr ""
 
 msgid "&apt-get;, &apt-secure;"
 msgstr ""
 

-#.  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"
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-mark.8.xml:33
 msgid "mark/unmark a package as being automatically-installed"


@@ -3769,11 +2752,6 @@ msgid ""
 "removed by e.g.  <command>apt-get</command> or <command>aptitude</command>."
 msgstr ""
 
 "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 ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:52
 msgid ""


@@ -3782,11 +2760,6 @@ msgid ""
 "installed packages depend on this package."
 msgstr ""
 
 "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 ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:60
 msgid ""


@@ -3795,11 +2768,6 @@ msgid ""
 "if no other packages depend on it."
 msgstr ""
 
 "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 ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:68
 msgid ""


@@ -3810,11 +2778,6 @@ msgid ""
 "effected by the <option>--filename</option> option."
 msgstr ""
 
 "effected by the <option>--filename</option> option."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:77
-msgid "unhold"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:78
 msgid ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:78
 msgid ""


@@ -3822,11 +2785,6 @@ msgid ""
 "package to allow all actions again."
 msgstr ""
 
 "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 ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:84
 msgid ""


@@ -3836,11 +2794,6 @@ msgid ""
 "given only those which are automatically installed will be shown."
 msgstr ""
 
 "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 ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:92
 msgid ""


@@ -3849,11 +2802,6 @@ msgid ""
 "installed packages instead."
 msgstr ""
 
 "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 ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:99
 msgid ""


@@ -3861,57 +2809,29 @@ msgid ""
 "the same way as for the other show commands."
 msgstr ""
 
 "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>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-mark.8.xml:116
+#: apt-mark.8.xml:115

 msgid ""
 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 ""
 
 "<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
-msgid "&apt-get;,&aptitude;,&apt-conf;"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><para>
 #. 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 ""
 
 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>
 #. 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>
 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 "
 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 "


@@ -3920,7 +2840,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 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 "
 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 "


@@ -3930,19 +2850,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 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>
 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>
 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 "
 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 "


@@ -3953,7 +2873,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 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 "
 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 "


@@ -3962,7 +2882,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 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 "
 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 "


@@ -3973,7 +2893,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 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 "
 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 "


@@ -3984,7 +2904,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-secure.8.xml:105
+#: apt-secure.8.xml:112

 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 "
 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 "


@@ -3994,14 +2914,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-secure.8.xml:112
+#: apt-secure.8.xml:119

 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>
 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:124

 msgid ""
 "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
 "checking, a malicious agent can introduce himself in the package download "
 msgid ""
 "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
 "checking, a malicious agent can introduce himself in the package download "


@@ -4011,7 +2931,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>

-#: apt-secure.8.xml:125
+#: apt-secure.8.xml:132

 msgid ""
 "<literal>Mirror network compromise</literal>.  Without signature checking, a "
 "malicious agent can compromise a mirror host and modify the files in it to "
 msgid ""
 "<literal>Mirror network compromise</literal>.  Without signature checking, a "
 "malicious agent can compromise a mirror host and modify the files in it to "


@@ -4020,7 +2940,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-secure.8.xml:132
+#: apt-secure.8.xml:139

 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 "
 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 "


@@ -4029,12 +2949,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt-secure.8.xml:138
+#: apt-secure.8.xml:145

 msgid "User configuration"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "User configuration"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-secure.8.xml:140
+#: apt-secure.8.xml:147

 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 "
 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 "


@@ -4043,7 +2963,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-secure.8.xml:147
+#: apt-secure.8.xml:154

 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 "
 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 "


@@ -4054,19 +2974,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt-secure.8.xml:156
+#: apt-secure.8.xml:163

 msgid "Archive configuration"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "Archive configuration"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-secure.8.xml:158
+#: apt-secure.8.xml:165

 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>
 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:170

 msgid ""
 "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
 "already. You can do this by running <command>apt-ftparchive release</"
 msgid ""
 "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
 "already. You can do this by running <command>apt-ftparchive release</"


@@ -4074,7 +2994,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>

-#: apt-secure.8.xml:168
+#: apt-secure.8.xml:175

 msgid ""
 "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
 "clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
 msgid ""
 "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
 "clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."


@@ -4082,7 +3002,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>

-#: apt-secure.8.xml:172
+#: apt-secure.8.xml:179

 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 "
 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 "


@@ -4090,7 +3010,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-secure.8.xml:179
+#: apt-secure.8.xml:186

 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 "
 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 "


@@ -4098,14 +3018,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-secure.8.xml:187
+#: apt-secure.8.xml:194

 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
 "&debsign; &debsig-verify;, &gpg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 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:198

 msgid ""
 "For more background information you might want to review the <ulink url="
 "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
 msgid ""
 "For more background information you might want to review the <ulink url="
 "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "


@@ -4116,22 +3036,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt-secure.8.xml:204
+#: apt-secure.8.xml:211

 msgid "Manpage Authors"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "Manpage Authors"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-secure.8.xml:206
+#: apt-secure.8.xml:213

 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 ""
 
 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"
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-sortpkgs.1.xml:33
 msgid "Utility to sort package index files"


@@ -4151,11 +3066,6 @@ msgstr ""
 msgid "All output is sent to stdout, the input must be a seekable file."
 msgstr ""
 
 msgid "All output is sent to stdout, the input must be a seekable file."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-sortpkgs.1.xml:52
-msgid "<option>--source</option>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-sortpkgs.1.xml:54
 msgid ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-sortpkgs.1.xml:54
 msgid ""


@@ -4170,33 +3080,28 @@ msgid ""
 "100 on error."
 msgstr ""
 
 "100 on error."
 msgstr ""
 

-#.  The last update date 
-#. type: Content of: <refentry><refentryinfo>
-#: apt.conf.5.xml:16
-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>"
+#. type: Content of: <refentry><refentryinfo><author><contrib>
+#: apt.conf.5.xml:20
+msgid "Initial documentation of Debug::*."

 msgstr ""
 
 msgstr ""
 

-#. type: Content of: <refentry><refnamediv><refname>
-#: apt.conf.5.xml:31 apt.conf.5.xml:38
-msgid "apt.conf"
+#. type: Content of: <refentry><refentryinfo><author><email>
+#: apt.conf.5.xml:21
+msgid "dburrows@debian.org"

 msgstr ""
 
 #. type: Content of: <refentry><refmeta><manvolnum>
 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>
 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>
 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 "
 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 "


@@ -4205,21 +3110,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><para>

-#: apt.conf.5.xml:48
+#: apt.conf.5.xml:47

 msgid ""
 "When an APT tool starts up it will read the configuration files in the "
 "following order:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
 msgid ""
 "When an APT tool starts up it will read the configuration files in the "
 "following order:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>

-#: apt.conf.5.xml:50
+#: apt.conf.5.xml:49

 msgid ""
 "the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
 "any)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
 msgid ""
 "the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
 "any)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>

-#: apt.conf.5.xml:52
+#: apt.conf.5.xml:51

 msgid ""
 "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
 "order which have either no or \"<literal>conf</literal>\" as filename "
 msgid ""
 "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
 "order which have either no or \"<literal>conf</literal>\" as filename "


@@ -4231,25 +3136,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>

-#: apt.conf.5.xml:59
+#: apt.conf.5.xml:58

 msgid ""
 "the main configuration file specified by <literal>Dir::Etc::main</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
 msgid ""
 "the main configuration file specified by <literal>Dir::Etc::main</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>

-#: apt.conf.5.xml:61
+#: apt.conf.5.xml:60

 msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt.conf.5.xml:65
+#: apt.conf.5.xml:64

 msgid "Syntax"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "Syntax"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:66
+#: apt.conf.5.xml:65

 msgid ""
 "The configuration file is organized in a tree with options organized into "
 "functional groups. Option specification is given with a double colon "
 msgid ""
 "The configuration file is organized in a tree with options organized into "
 "functional groups. Option specification is given with a double colon "


@@ -4259,7 +3164,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:72
+#: apt.conf.5.xml:71

 msgid ""
 "Syntactically the configuration language is modeled after what the ISC tools "
 "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
 msgid ""
 "Syntactically the configuration language is modeled after what the ISC tools "
 "such as bind and dhcp use. Lines starting with <literal>//</literal> are "


@@ -4275,7 +3180,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>

-#: apt.conf.5.xml:86
+#: apt.conf.5.xml:85

 #, no-wrap
 msgid ""
 "APT {\n"
 #, no-wrap
 msgid ""
 "APT {\n"


@@ -4287,7 +3192,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 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 "
 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 "


@@ -4295,27 +3200,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
 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>
 #, 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>
 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>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgid ""
 "The names of the configuration items are not case-sensitive. So in the "
 "previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml: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. "
 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. "


@@ -4325,7 +3230,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 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</"
 msgid ""
 "Two specials are allowed, <literal>#include</literal> (which is deprecated "
 "and not supported by alternative implementations) and <literal>#clear</"


@@ -4337,7 +3242,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:122
+#: apt.conf.5.xml:121

 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</"
 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</"


@@ -4347,7 +3252,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:127
+#: apt.conf.5.xml:126

 msgid ""
 "All of the APT tools take a -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "
 msgid ""
 "All of the APT tools take a -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "


@@ -4358,7 +3263,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:134
+#: apt.conf.5.xml:133

 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 "
 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 "


@@ -4375,24 +3280,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt.conf.5.xml:146
+#: apt.conf.5.xml:145

 msgid "The APT Group"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "The APT Group"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:147
+#: apt.conf.5.xml:146

 msgid ""
 "This group of options controls general APT behavior as well as holding the "
 "options for all of the tools."
 msgstr ""
 
 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>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:152
+#: apt.conf.5.xml:151

 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "
 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "


@@ -4400,7 +3300,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:158
+#: apt.conf.5.xml:157

 msgid ""
 "All Architectures the system supports. Processors implementing the "
 "<literal>amd64</literal> (also called <literal>x86-64</literal>) instruction "
 msgid ""
 "All Architectures the system supports. Processors implementing the "
 "<literal>amd64</literal> (also called <literal>x86-64</literal>) instruction "


@@ -4412,13 +3312,8 @@ msgid ""
 "architectures</command>."
 msgstr ""
 
 "architectures</command>."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:167
-msgid "Default-Release"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:168
+#: apt.conf.5.xml:167

 msgid ""
 "Default release to install packages from if more than one version available. "
 "Contains release name, codename or release version. Examples: 'stable', "
 msgid ""
 "Default release to install packages from if more than one version available. "
 "Contains release name, codename or release version. Examples: 'stable', "


@@ -4426,25 +3321,15 @@ msgid ""
 "'5.0*'. See also &apt-preferences;."
 msgstr ""
 
 "'5.0*'. See also &apt-preferences;."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:173
-msgid "Ignore-Hold"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:174
+#: apt.conf.5.xml:173

 msgid ""
 "Ignore Held packages; This global option causes the problem resolver to "
 "ignore held packages in its decision making."
 msgstr ""
 
 msgid ""
 "Ignore Held packages; This global option causes the problem resolver to "
 "ignore held packages in its decision making."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:178
-msgid "Clean-Installed"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:179
+#: apt.conf.5.xml:178

 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 "
 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 "


@@ -4452,13 +3337,8 @@ msgid ""
 "but note that APT provides no direct means to reinstall them."
 msgstr ""
 
 "but note that APT provides no direct means to reinstall them."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:185
-msgid "Immediate-Configure"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:186
+#: apt.conf.5.xml:185

 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 "
 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 "


@@ -4490,13 +3370,8 @@ msgid ""
 "improving or correcting the upgrade process."
 msgstr ""
 
 "improving or correcting the upgrade process."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:208
-msgid "Force-LoopBreak"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:209
+#: apt.conf.5.xml:208

 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/"
 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/"


@@ -4506,13 +3381,8 @@ msgid ""
 "those packages depend on."
 msgstr ""
 
 "those packages depend on."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:217
-msgid "Cache-Start, Cache-Grow and Cache-Limit"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:218
+#: apt.conf.5.xml:217

 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 "
 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 "


@@ -4531,64 +3401,46 @@ msgid ""
 "automatic grow of the cache is disabled."
 msgstr ""
 
 "automatic grow of the cache is disabled."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:233
-msgid "Build-Essential"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:234
+#: apt.conf.5.xml:233

 msgid "Defines which package(s) are considered essential build dependencies."
 msgstr ""
 
 msgid "Defines which package(s) are considered essential build dependencies."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:237
-msgid "Get"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:238
+#: apt.conf.5.xml:237

 msgid ""
 "The Get subsection controls the &apt-get; tool, please see its documentation "
 "for more information about the options here."
 msgstr ""
 
 msgid ""
 "The Get subsection controls the &apt-get; tool, please see its documentation "
 "for more information about the options here."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:242
-msgid "Cache"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:243
+#: apt.conf.5.xml:242

 msgid ""
 "The Cache subsection controls the &apt-cache; tool, please see its "
 "documentation for more information about the options here."
 msgstr ""
 
 msgid ""
 "The Cache subsection controls the &apt-cache; tool, please see its "
 "documentation for more information about the options here."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:247
-msgid "CDROM"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:248
+#: apt.conf.5.xml:247

 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool, please see its "
 "documentation for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool, please see its "
 "documentation for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt.conf.5.xml:254
+#: apt.conf.5.xml:253

 msgid "The Acquire Group"
 msgstr ""
 
 msgid "The Acquire Group"
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:259
-msgid "Check-Valid-Until"
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:254
+msgid ""
+"The <literal>Acquire</literal> group of options controls the download of "
+"packages and the URI handlers."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:260
+#: apt.conf.5.xml:259

 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 "
 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 "


@@ -4599,13 +3451,8 @@ msgid ""
 "<literal>Max-ValidTime</literal> option can be used."
 msgstr ""
 
 "<literal>Max-ValidTime</literal> option can be used."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:270
-msgid "Max-ValidTime"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:271
+#: apt.conf.5.xml:270

 msgid ""
 "Seconds the Release file should be considered valid after it was created "
 "(indicated by the <literal>Date</literal> header).  If the Release file "
 msgid ""
 "Seconds the Release file should be considered valid after it was created "
 "(indicated by the <literal>Date</literal> header).  If the Release file "


@@ -4615,13 +3462,8 @@ msgid ""
 "be made by appending the label of the archive to the option name."
 msgstr ""
 
 "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:281
-msgid "Min-ValidTime"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:282
+#: apt.conf.5.xml:281

 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 "
 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 "


@@ -4631,20 +3473,15 @@ msgid ""
 "should be used by appending the label of the archive to the option name."
 msgstr ""
 
 "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:292
-msgid "PDiffs"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:293
+#: apt.conf.5.xml:292

 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for Packages or "
 "Sources files instead of downloading whole ones. True by default."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for Packages or "
 "Sources files instead of downloading whole ones. True by default."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:296
+#: apt.conf.5.xml:295

 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 "
 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 "


@@ -4654,13 +3491,8 @@ msgid ""
 "complete file is downloaded instead of the patches."
 msgstr ""
 
 "complete file is downloaded instead of the patches."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:305
-msgid "Queue-Mode"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:306
+#: apt.conf.5.xml:305

 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
 "literal> or <literal>access</literal> which determines how APT parallelizes "


@@ -4669,37 +3501,22 @@ msgid ""
 "connection per URI type will be opened."
 msgstr ""
 
 "connection per URI type will be opened."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:313
-msgid "Retries"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:314
+#: apt.conf.5.xml:313

 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
 msgstr ""
 
 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:318
-msgid "Source-Symlinks"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:319
+#: apt.conf.5.xml:318

 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 ""
 
 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:323 sources.list.5.xml:160
-msgid "http"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:324
+#: apt.conf.5.xml:323

 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 "
 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 "


@@ -4710,7 +3527,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:332
+#: apt.conf.5.xml:331

 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 "
 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 "


@@ -4724,7 +3541,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:342 apt.conf.5.xml:408
+#: apt.conf.5.xml:341 apt.conf.5.xml:407

 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method, this applies to all things including connection timeout and data "
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method, this applies to all things including connection timeout and data "


@@ -4732,7 +3549,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:345
+#: apt.conf.5.xml:344

 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
 "enabled HTTP pipeling (RFC 2616 section 8.1.2.2) which can be beneficial e."
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
 "enabled HTTP pipeling (RFC 2616 section 8.1.2.2) which can be beneficial e."


@@ -4744,14 +3561,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:352
+#: apt.conf.5.xml:351

 msgid ""
 "<literal>Acquire::http::AllowRedirect</literal> controls if APT will follow "
 "redirects, which is enabled by default."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 msgid ""
 "<literal>Acquire::http::AllowRedirect</literal> controls if APT will follow "
 "redirects, which is enabled by default."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:355
+#: apt.conf.5.xml:354

 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 "
 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 "


@@ -4761,20 +3578,15 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:360
+#: apt.conf.5.xml:359

 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 ""
 
 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:366
-msgid "https"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:367
+#: apt.conf.5.xml:366

 msgid ""
 "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
 "options are the same as for <literal>http</literal> method and will also "
 msgid ""
 "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
 "options are the same as for <literal>http</literal> method and will also "


@@ -4784,7 +3596,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:373
+#: apt.conf.5.xml:372

 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is "
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is "


@@ -4804,13 +3616,8 @@ msgid ""
 "option."
 msgstr ""
 
 "option."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:391 sources.list.5.xml:171
-msgid "ftp"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:392
+#: apt.conf.5.xml:391

 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 "
 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 "


@@ -4829,7 +3636,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:411
+#: apt.conf.5.xml:410

 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 "
 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 "


@@ -4839,7 +3646,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:418
+#: apt.conf.5.xml:417

 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 "
 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 "


@@ -4848,7 +3655,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:423
+#: apt.conf.5.xml:422

 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "


@@ -4857,22 +3664,17 @@ msgid ""
 "that most FTP servers do not support RFC2428."
 msgstr ""
 
 "that most FTP servers do not support RFC2428."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:430 sources.list.5.xml:153
-msgid "cdrom"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>

-#: apt.conf.5.xml:436
+#: apt.conf.5.xml:435

 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:431
+#: apt.conf.5.xml:430

 msgid ""
 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 "
+"CD-ROM URIs; the only setting for CD-ROM URIs is the mount point, "
+"<literal>cdrom::Mount</literal> which must be the mount point for the CD-ROM "

 "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 "
 "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 "


@@ -4881,32 +3683,22 @@ msgid ""
 "can be specified using UMount."
 msgstr ""
 
 "can be specified using UMount."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:441
-msgid "gpgv"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:442
+#: apt.conf.5.xml:441

 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 ""
 
 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:447
-msgid "CompressionTypes"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>

-#: apt.conf.5.xml:453
+#: apt.conf.5.xml:452

 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #, 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:448
+#: apt.conf.5.xml:447

 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "


@@ -4918,19 +3710,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>

-#: apt.conf.5.xml:458
+#: apt.conf.5.xml:457

 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>

-#: apt.conf.5.xml:461
+#: apt.conf.5.xml:460

 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:454
+#: apt.conf.5.xml:453

 msgid ""
 "Also the <literal>Order</literal> subgroup can be used to define in which "
 "order the acquire system will try to download the compressed files. The "
 msgid ""
 "Also the <literal>Order</literal> subgroup can be used to define in which "
 "order the acquire system will try to download the compressed files. The "


@@ -4947,13 +3739,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>

-#: apt.conf.5.xml:465
+#: apt.conf.5.xml:464

 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:463
+#: apt.conf.5.xml:462

 msgid ""
 "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
 "replaceable></literal> will be checked: If this setting exists the method "
 msgid ""
 "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
 "replaceable></literal> will be checked: If this setting exists the method "


@@ -4968,20 +3760,15 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:470
+#: apt.conf.5.xml:469

 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 ""
 
 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:475
-msgid "GzipIndexes"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:477
+#: apt.conf.5.xml:476

 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "


@@ -4989,13 +3776,8 @@ msgid ""
 "CPU requirements when building the local package caches. False by default."
 msgstr ""
 
 "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:484
-msgid "Languages"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:485
+#: apt.conf.5.xml:484

 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the Description-"
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the Description-"


@@ -5008,13 +3790,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>

-#: apt.conf.5.xml:501
+#: apt.conf.5.xml:500

 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #, 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:491
+#: apt.conf.5.xml:490

 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: It will be "
 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: It will be "


@@ -5037,7 +3819,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:502
+#: apt.conf.5.xml:501

 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "


@@ -5045,20 +3827,13 @@ msgid ""
 "added to the end of the list (after an implicit \"<literal>none</literal>\")."
 msgstr ""
 
 "added to the end of the list (after an implicit \"<literal>none</literal>\")."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:255
-msgid ""
-"The <literal>Acquire</literal> group of options controls the download of "
-"packages and the URI handlers.  <placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>

-#: apt.conf.5.xml:513
+#: apt.conf.5.xml:512

 msgid "Directories"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "Directories"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:515
+#: apt.conf.5.xml:514

 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "


@@ -5070,7 +3845,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:522
+#: apt.conf.5.xml:521

 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "


@@ -5083,7 +3858,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:531
+#: apt.conf.5.xml:530

 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "


@@ -5093,7 +3868,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:537
+#: apt.conf.5.xml:536

 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 "
 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 "


@@ -5101,7 +3876,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:541
+#: apt.conf.5.xml:540

 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "
 msgid ""
 "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
 "Bin::Methods</literal> specifies the location of the method handlers and "


@@ -5112,7 +3887,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:549
+#: apt.conf.5.xml:548

 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths in <literal>Dir::</literal> will be relative to "


@@ -5125,7 +3900,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:562
+#: apt.conf.5.xml:561

 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 "
 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 "


@@ -5136,26 +3911,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt.conf.5.xml:571
+#: apt.conf.5.xml:570

 #, fuzzy
 msgid "APT in DSelect"
 msgstr "DSelect"
 
 #. type: Content of: <refentry><refsect1><para>
 #, fuzzy
 msgid "APT in DSelect"
 msgstr "DSelect"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:573
+#: apt.conf.5.xml:572

 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behaviour. These are in the <literal>DSelect</literal> "
 "section."
 msgstr ""
 
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behaviour. These are in the <literal>DSelect</literal> "
 "section."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:577
-msgid "Clean"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:578
+#: apt.conf.5.xml:577

 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 "
 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 "


@@ -5166,68 +3936,48 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:587
+#: apt.conf.5.xml:586

 msgid ""
 "The contents of this variable is passed to &apt-get; as command line options "
 "when it is run for the install phase."
 msgstr ""
 
 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:591
-msgid "Updateoptions"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:592
+#: apt.conf.5.xml:591

 msgid ""
 "The contents of this variable is passed to &apt-get; as command line options "
 "when it is run for the update phase."
 msgstr ""
 
 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:596
-msgid "PromptAfterUpdate"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:597
+#: apt.conf.5.xml:596

 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>
 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:603
+#: apt.conf.5.xml:602

 msgid "How APT calls dpkg"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "How APT calls dpkg"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:604
+#: apt.conf.5.xml:603

 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>
 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:609
+#: apt.conf.5.xml:608

 msgid ""
 "This is a list of options to pass to dpkg. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
 "&dpkg;."
 msgstr ""
 
 msgid ""
 "This is a list of options to pass to dpkg. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
 "&dpkg;."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:614
-msgid "Pre-Invoke"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:614
-msgid "Post-Invoke"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:615
+#: apt.conf.5.xml:614

 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 "
 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 "


@@ -5235,13 +3985,8 @@ msgid ""
 "fail APT will abort."
 msgstr ""
 
 "fail APT will abort."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:621
-msgid "Pre-Install-Pkgs"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:622
+#: apt.conf.5.xml:621

 msgid ""
 "This is a list of shell commands to run before invoking dpkg. Like "
 "<literal>options</literal> this must be specified in list notation. The "
 msgid ""
 "This is a list of shell commands to run before invoking dpkg. Like "
 "<literal>options</literal> this must be specified in list notation. The "


@@ -5251,7 +3996,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:628
+#: apt.conf.5.xml:627

 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "
 msgid ""
 "Version 2 of this protocol dumps more information, including the protocol "
 "version, the APT configuration space and the packages, files and versions "


@@ -5260,37 +4005,27 @@ msgid ""
 "given to <literal>Pre-Install-Pkgs</literal>."
 msgstr ""
 
 "given to <literal>Pre-Install-Pkgs</literal>."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:635
-msgid "Run-Directory"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:636
+#: apt.conf.5.xml:635

 msgid ""
 "APT chdirs to this directory before invoking dpkg, the default is <filename>/"
 "</filename>."
 msgstr ""
 
 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:640
-msgid "Build-options"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:641
+#: apt.conf.5.xml:640

 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages, the "
 "default is to disable signing and produce all binaries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages, the "
 "default is to disable signing and produce all binaries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt.conf.5.xml:646
+#: apt.conf.5.xml:645

 msgid "dpkg trigger usage (and related options)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgid "dpkg trigger usage (and related options)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt.conf.5.xml:647
+#: apt.conf.5.xml:646

 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 "
 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 "


@@ -5305,7 +4040,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>

-#: apt.conf.5.xml:662
+#: apt.conf.5.xml:661

 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"
 #, no-wrap
 msgid ""
 "DPkg::NoTriggers \"true\";\n"


@@ -5315,7 +4050,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt.conf.5.xml:656
+#: apt.conf.5.xml:655

 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 "
 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 "


@@ -5328,13 +4063,8 @@ msgid ""
 "would be <placeholder type=\"literallayout\" id=\"0\"/>"
 msgstr ""
 
 "would be <placeholder type=\"literallayout\" id=\"0\"/>"
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:668
-msgid "DPkg::NoTriggers"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:669
+#: apt.conf.5.xml:668

 msgid ""
 "Add the no triggers flag to all dpkg calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "
 msgid ""
 "Add the no triggers flag to all dpkg calls (except the ConfigurePending "
 "call).  See &dpkg; if you are interested in what this actually means. In "


@@ -5345,13 +4075,8 @@ msgid ""
 "dpkg - now apt will add these flag also to the unpack and remove calls."
 msgstr ""
 
 "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:676
-msgid "PackageManager::Configure"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:677
+#: apt.conf.5.xml:676

 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  \"<literal>all</literal>\" is the default "
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  \"<literal>all</literal>\" is the default "


@@ -5366,13 +4091,8 @@ msgid ""
 "the system could end in an unconfigured status which could be unbootable!"
 msgstr ""
 
 "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:687
-msgid "DPkg::ConfigurePending"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:688
+#: apt.conf.5.xml:687

 msgid ""
 "If this option is set apt will call <command>dpkg --configure --pending</"
 "command> to let dpkg handle all required configurations and triggers. This "
 msgid ""
 "If this option is set apt will call <command>dpkg --configure --pending</"
 "command> to let dpkg handle all required configurations and triggers. This "


@@ -5382,13 +4102,8 @@ msgid ""
 "you could deactivate this option in all but the last run."
 msgstr ""
 
 "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:694
-msgid "DPkg::TriggersPending"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:695
+#: apt.conf.5.xml:694

 msgid ""
 "Useful for <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal> and dpkg "
 msgid ""
 "Useful for <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal> and dpkg "


@@ -5397,13 +4112,8 @@ msgid ""
 "triggers, not only the triggers needed to configure this package."
 msgstr ""
 
 "triggers, not only the triggers needed to configure this package."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:700
-msgid "PackageManager::UnpackAll"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:701
+#: apt.conf.5.xml:700

 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-"
 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-"


@@ -5414,13 +4124,8 @@ msgid ""
 "really useful."
 msgstr ""
 
 "really useful."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:708
-msgid "OrderList::Score::Immediate"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>

-#: apt.conf.5.xml:716
+#: apt.conf.5.xml:715

 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"


@@ -5432,7 +4137,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:709
+#: apt.conf.5.xml:708

 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 "
 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 "


@@ -5446,12 +4151,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt.conf.5.xml:729
+#: apt.conf.5.xml:728

 msgid "Periodic and Archives options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "Periodic and Archives options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:730
+#: apt.conf.5.xml:729

 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by "
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by "


@@ -5460,12 +4165,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt.conf.5.xml:738
+#: apt.conf.5.xml:737

 msgid "Debug options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "Debug options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:740
+#: apt.conf.5.xml:739

 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "


@@ -5476,7 +4181,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>

-#: apt.conf.5.xml:751
+#: apt.conf.5.xml:750

 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"


@@ -5484,7 +4189,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>

-#: apt.conf.5.xml:759
+#: apt.conf.5.xml:758

 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s install</"


@@ -5492,7 +4197,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>

-#: apt.conf.5.xml:768
+#: apt.conf.5.xml:767

 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."


@@ -5502,205 +4207,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>
 #.        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:776
+#: apt.conf.5.xml:775

 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 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>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:786
+#: apt.conf.5.xml:785

 msgid "A full list of debugging options to apt follows."
 msgstr ""
 
 msgid "A full list of debugging options to apt follows."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:791
-msgid "<literal>Debug::Acquire::cdrom</literal>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:795
+#: apt.conf.5.xml:794

 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:802
-msgid "<literal>Debug::Acquire::ftp</literal>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:806
+#: apt.conf.5.xml:805

 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:813
-msgid "<literal>Debug::Acquire::http</literal>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:817
+#: apt.conf.5.xml:816

 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:824
-msgid "<literal>Debug::Acquire::https</literal>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:828
+#: apt.conf.5.xml:827

 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:835
-msgid "<literal>Debug::Acquire::gpgv</literal>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:839
+#: apt.conf.5.xml:838

 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
 msgstr ""
 
 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:846
-msgid "<literal>Debug::aptcdrom</literal>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:850
+#: apt.conf.5.xml:849

 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
 msgstr ""
 
 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:857
-msgid "<literal>Debug::BuildDeps</literal>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:860
+#: apt.conf.5.xml:859

 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:867
-msgid "<literal>Debug::Hashes</literal>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:870
+#: apt.conf.5.xml:869

 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
 msgstr ""
 
 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:877
-msgid "<literal>Debug::IdentCDROM</literal>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:880
+#: apt.conf.5.xml:879

 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 ""
 
 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:888
-msgid "<literal>Debug::NoLocking</literal>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:891
+#: apt.conf.5.xml:890

 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 ""
 
 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:899
-msgid "<literal>Debug::pkgAcquire</literal>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:903
+#: apt.conf.5.xml:902

 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 
 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:910
-msgid "<literal>Debug::pkgAcquire::Auth</literal>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:913
+#: apt.conf.5.xml:912

 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
 msgstr ""
 
 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:920
-msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:923
+#: apt.conf.5.xml:922

 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
 msgstr ""
 
 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:931
-msgid "<literal>Debug::pkgAcquire::RRed</literal>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:935
+#: apt.conf.5.xml:934

 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
 msgstr ""
 
 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:942
-msgid "<literal>Debug::pkgAcquire::Worker</literal>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:946
+#: apt.conf.5.xml:945

 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
 
 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:953
-msgid "<literal>Debug::pkgAutoRemove</literal>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:957
+#: apt.conf.5.xml:956

 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
 msgstr ""
 
 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:964
-msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:967
+#: apt.conf.5.xml:966

 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial auto-"


@@ -5709,13 +4329,8 @@ msgid ""
 "pkgProblemResolver</literal> for that."
 msgstr ""
 
 "pkgProblemResolver</literal> for that."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:978
-msgid "<literal>Debug::pkgDepCache::Marker</literal>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:981
+#: apt.conf.5.xml:980

 msgid ""
 "Generate debug messages describing which package is marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
 msgid ""
 "Generate debug messages describing which package is marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "


@@ -5731,140 +4346,78 @@ msgid ""
 "<literal>section</literal> is the name of the section the package appears in."
 msgstr ""
 
 "<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:1000
-msgid "<literal>Debug::pkgInitConfig</literal>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1003
+#: apt.conf.5.xml:1002

 msgid "Dump the default configuration to standard error on startup."
 msgstr ""
 
 msgid "Dump the default configuration to standard error on startup."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1010
-msgid "<literal>Debug::pkgDPkgPM</literal>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1013
+#: apt.conf.5.xml:1012

 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
 msgstr ""
 
 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:1021
-msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml:1023

 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
 msgstr ""
 
 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:1031
-msgid "<literal>Debug::pkgOrderList</literal>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1035
+#: apt.conf.5.xml:1034

 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
 msgstr ""
 
 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:1043
-msgid "<literal>Debug::pkgPackageManager</literal>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1047
+#: apt.conf.5.xml:1046

 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
 
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1054
-msgid "<literal>Debug::pkgPolicy</literal>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1058
+#: apt.conf.5.xml:1057

 msgid "Output the priority of each package list on startup."
 msgstr ""
 
 msgid "Output the priority of each package list on startup."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1064
-msgid "<literal>Debug::pkgProblemResolver</literal>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1068
+#: apt.conf.5.xml:1067

 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
 msgstr ""
 
 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:1076
-msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1079
+#: apt.conf.5.xml:1078

 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 ""
 
 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:1087
-msgid "<literal>Debug::sourceList</literal>"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1091
+#: apt.conf.5.xml:1090

 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:1114
+#: apt.conf.5.xml:1113

 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
 msgstr ""
 
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1121
-msgid "&file-aptconf;"
-msgstr ""
-

 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:1126
+#: apt.conf.5.xml:1125

 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr ""
 
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr ""
 

-#.  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
-msgid "apt_preferences"
-msgstr ""
-

 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt_preferences.5.xml:32
 msgid "Preference control file for APT"
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt_preferences.5.xml:32
 msgid "Preference control file for APT"


@@ -5962,6 +4515,13 @@ msgid ""
 "\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
 msgstr ""
 
 "\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
 msgstr ""
 

+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:101
+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 ""
+

 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml:106
 msgid "priority 1"
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml:106
 msgid "priority 1"


@@ -6013,14 +4573,6 @@ msgid ""
 "to the versions that are not installed and belong to the target release."
 msgstr ""
 
 "to the versions that are not installed and belong to the target release."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:101
-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 ""
-

 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt_preferences.5.xml:132
 msgid ""
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt_preferences.5.xml:132
 msgid ""


@@ -6280,101 +4832,101 @@ msgid ""
 "Pin-Priority: 990\n"
 msgstr ""
 
 "Pin-Priority: 990\n"
 msgstr ""
 

-#. 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>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:307

 msgid "How APT Interprets Priorities"
 msgstr ""
 
 msgid "How APT Interprets Priorities"
 msgstr ""
 

+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:310
+msgid ""
+"Priorities (P) assigned in the APT preferences file must be positive or "
+"negative integers.  They are interpreted as follows (roughly speaking):"
+msgstr ""
+

 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:314
+#: apt_preferences.5.xml:315

 msgid "P &gt; 1000"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "P &gt; 1000"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:315
+#: apt_preferences.5.xml:316

 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:319
+#: apt_preferences.5.xml:320

 msgid "990 &lt; P &lt;=1000"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "990 &lt; P &lt;=1000"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:320
+#: apt_preferences.5.xml:321

 msgid ""
 "causes a version to be installed even if it does not come from the target "
 "release, unless the installed version is more recent"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 msgid ""
 "causes a version to be installed even if it does not come from the target "
 "release, unless the installed version is more recent"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:325
+#: apt_preferences.5.xml:326

 msgid "500 &lt; P &lt;=990"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "500 &lt; P &lt;=990"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:326
+#: apt_preferences.5.xml:327

 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to the target release or the installed version is more recent"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to the target release or the installed version is more recent"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:331
+#: apt_preferences.5.xml:332

 msgid "100 &lt; P &lt;=500"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "100 &lt; P &lt;=500"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:332
+#: apt_preferences.5.xml:333

 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to some other distribution or the installed version is more recent"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to some other distribution or the installed version is more recent"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:337
+#: apt_preferences.5.xml:338

 msgid "0 &lt; P &lt;=100"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "0 &lt; P &lt;=100"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:338
+#: apt_preferences.5.xml:339

 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:342
+#: apt_preferences.5.xml:343

 msgid "P &lt; 0"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "P &lt; 0"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:343
+#: apt_preferences.5.xml:344

 msgid "prevents the version from being installed"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgid "prevents the version from being installed"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:309
-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 ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:348
+#: apt_preferences.5.xml:349

 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "
 msgid ""
 "If any specific-form records match an available package version then the "
 "first such record determines the priority of the package version.  Failing "


@@ -6383,14 +4935,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:354
+#: apt_preferences.5.xml:355

 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>

-#: apt_preferences.5.xml:358
+#: apt_preferences.5.xml:359

 #, no-wrap
 msgid ""
 "Package: perl\n"
 #, no-wrap
 msgid ""
 "Package: perl\n"


@@ -6407,12 +4959,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgstr ""
 
 #. 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>
 msgid "Then:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>

-#: apt_preferences.5.xml:373
+#: apt_preferences.5.xml:374

 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 "
 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 "


@@ -6422,7 +4974,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>

-#: apt_preferences.5.xml:378
+#: apt_preferences.5.xml:379

 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "


@@ -6430,7 +4982,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>

-#: apt_preferences.5.xml:382
+#: apt_preferences.5.xml:383

 msgid ""
 "A version of a package whose origin is not the local system but some other "
 "site listed in &sources-list; and which belongs to an <literal>unstable</"
 msgid ""
 "A version of a package whose origin is not the local system but some other "
 "site listed in &sources-list; and which belongs to an <literal>unstable</"


@@ -6439,58 +4991,70 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt_preferences.5.xml:392
+#: apt_preferences.5.xml:393

 msgid "Determination of Package Version and Distribution Properties"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgid "Determination of Package Version and Distribution Properties"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:394
+#: apt_preferences.5.xml:395

 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
 "describe the packages available at that location."
 msgstr ""
 
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
 "describe the packages available at that location."
 msgstr ""
 

+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:399
+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 ""
+

 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:406
+#: apt_preferences.5.xml:407

 msgid "the <literal>Package:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "the <literal>Package:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:407
+#: apt_preferences.5.xml:408

 msgid "gives the package name"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 msgid "gives the package name"
 msgstr ""
 
 #. 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

 msgid "the <literal>Version:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "the <literal>Version:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:411
+#: apt_preferences.5.xml:412

 msgid "gives the version number for the named package"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgid "gives the version number for the named package"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:398
+#: apt_preferences.5.xml:417

 msgid ""
 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 ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:427
+#: apt_preferences.5.xml:428

 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:428
+#: apt_preferences.5.xml:429

 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "


@@ -6501,18 +5065,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>

-#: apt_preferences.5.xml:438
+#: apt_preferences.5.xml:439

 #, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:444
+#: apt_preferences.5.xml:445

 msgid "the <literal>Codename:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "the <literal>Codename:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:445
+#: apt_preferences.5.xml:446

 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
 "For example, the line \"Codename: &testing-codename;\" specifies that all of "
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
 "For example, the line \"Codename: &testing-codename;\" specifies that all of "


@@ -6523,23 +5087,23 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>

-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:455

 #, no-wrap
 msgid "Pin: release n=&testing-codename;\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #, no-wrap
 msgid "Pin: release n=&testing-codename;\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:461
+#: apt_preferences.5.xml:462

 msgid ""
 "names the release version.  For example, the packages in the tree might "
 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</"
+"belong to Debian 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."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 "literal> distributions because they have not been released yet.  Specifying "
 "this in the APT preferences file would require one of the following lines."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>

-#: apt_preferences.5.xml:470
+#: apt_preferences.5.xml:471

 #, no-wrap
 msgid ""
 "Pin: release v=3.0\n"
 #, no-wrap
 msgid ""
 "Pin: release v=3.0\n"


@@ -6548,12 +5112,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:480

 msgid "the <literal>Component:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "the <literal>Component:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:480
+#: apt_preferences.5.xml:481

 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "


@@ -6564,18 +5128,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>

-#: apt_preferences.5.xml:489
+#: apt_preferences.5.xml:490

 #, no-wrap
 msgid "Pin: release c=main\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #, no-wrap
 msgid "Pin: release c=main\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:495
+#: apt_preferences.5.xml:496

 msgid "the <literal>Origin:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "the <literal>Origin:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:496
+#: apt_preferences.5.xml:497

 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"


@@ -6584,18 +5148,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>

-#: apt_preferences.5.xml:502
+#: apt_preferences.5.xml:503

 #, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:508
+#: apt_preferences.5.xml:509

 msgid "the <literal>Label:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "the <literal>Label:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:509
+#: apt_preferences.5.xml:510

 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"


@@ -6604,27 +5168,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>

-#: apt_preferences.5.xml:515
+#: apt_preferences.5.xml:516

 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:416
-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 ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:522
+#: apt_preferences.5.xml:523

 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "


@@ -6639,12 +5189,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt_preferences.5.xml:535
+#: apt_preferences.5.xml:536

 msgid "Optional Lines in an APT Preferences Record"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgid "Optional Lines in an APT Preferences Record"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:537
+#: apt_preferences.5.xml:538

 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "


@@ -6652,12 +5202,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt_preferences.5.xml:546
+#: apt_preferences.5.xml:547

 msgid "Tracking Stable"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 msgid "Tracking Stable"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>

-#: apt_preferences.5.xml:554
+#: apt_preferences.5.xml:555

 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"


@@ -6672,7 +5222,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:549

 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 "
 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 "


@@ -6682,8 +5232,8 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 msgstr ""
 
 #. 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

 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"


@@ -6692,7 +5242,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:566
+#: apt_preferences.5.xml:567

 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest "
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest "


@@ -6701,13 +5251,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>

-#: apt_preferences.5.xml:583
+#: apt_preferences.5.xml:584

 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:577
+#: apt_preferences.5.xml:578

 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "


@@ -6716,12 +5266,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt_preferences.5.xml:589
+#: apt_preferences.5.xml:590

 msgid "Tracking Testing or Unstable"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 msgid "Tracking Testing or Unstable"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>

-#: apt_preferences.5.xml:598
+#: apt_preferences.5.xml:599

 #, no-wrap
 msgid ""
 "Package: *\n"
 #, no-wrap
 msgid ""
 "Package: *\n"


@@ -6738,7 +5288,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:591
+#: apt_preferences.5.xml:592

 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "


@@ -6749,7 +5299,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:612
+#: apt_preferences.5.xml:613

 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest "
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest "


@@ -6758,13 +5308,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>

-#: apt_preferences.5.xml:632
+#: apt_preferences.5.xml:633

 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:623
+#: apt_preferences.5.xml:624

 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "


@@ -6776,12 +5326,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 msgstr ""
 
 #. 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>
 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

 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"


@@ -6801,7 +5351,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgstr ""
 
 #. 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 "
 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 "


@@ -6816,7 +5366,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:670
+#: apt_preferences.5.xml:671

 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest version(s) in "
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest version(s) in "


@@ -6825,13 +5375,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>

-#: apt_preferences.5.xml:690
+#: apt_preferences.5.xml:691

 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:681
+#: apt_preferences.5.xml:682

 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>sid</literal> distribution.  Thereafter, "
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>sid</literal> distribution.  Thereafter, "


@@ -6842,21 +5392,11 @@ msgid ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:699
-msgid "&file-preferences;"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>

-#: apt_preferences.5.xml:705
+#: apt_preferences.5.xml:706

 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr ""
 
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr ""
 

-#. 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"
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: sources.list.5.xml:33
 msgid "Package resource list for APT"


@@ -6867,8 +5407,8 @@ msgstr ""
 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 "
 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>."
+"documents only the packaging system used by the Debian system.  This control "
+"file is <filename>/etc/apt/sources.list</filename>."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>


@@ -7034,13 +5574,13 @@ msgstr ""
 msgid "URI specification"
 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>
 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 "
 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 "


@@ -7048,14 +5588,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: sources.list.5.xml:155
+#: sources.list.5.xml:154

 msgid ""
 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>
 "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:"
 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:"


@@ -7066,7 +5606,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 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. "
 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. "


@@ -7077,31 +5617,16 @@ msgid ""
 "ignored."
 msgstr ""
 
 "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>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: sources.list.5.xml:184
+#: sources.list.5.xml:183

 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 ""
 
 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"
-msgstr ""
-

 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: sources.list.5.xml:191
+#: sources.list.5.xml:190

 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 "
 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 "


@@ -7111,67 +5636,59 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 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>
 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 "
 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 "
+"which should follow the nameing scheme <package>apt-transport-"
+"<replaceable>method</replaceable></package>.  The APT team e.g. maintains "
+"also the <package>apt-transport-https</package> package which provides "

 "access methods for https-URIs with features similar to the http method, but "
 "access methods for https-URIs with features similar to the http method, but "

-"other methods for using e.g. debtorrent are also available, see "
-"<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></"
-"refentrytitle> <manvolnum>1</manvolnum></citerefentry>."
-msgstr ""
-
-#. 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\"/>"
+"other methods for using e.g. debtorrent are also available, see &apt-"
+"transport-debtorrent;."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 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>
 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>
 #, 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>
 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>
 #, 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>
 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>
 #, 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 "
 msgid ""
 "The first line gets package information for the architectures in "
 "<literal>APT::Architectures</literal> while the second always retrieves "


@@ -7179,7 +5696,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
 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"
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main\n"


@@ -7187,33 +5704,33 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 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>
 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>
 #, 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>
 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>
 #, 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 "
 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 "


@@ -7222,19 +5739,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
 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>
 #, 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>
 #, 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</"
 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</"


@@ -7246,7 +5763,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: sources.list.5.xml:256
+#: sources.list.5.xml:253

 msgid "&apt-cache; &apt-conf;"
 msgstr ""
 
 msgid "&apt-cache; &apt-conf;"
 msgstr ""
 


@@ -7299,11 +5816,11 @@ msgstr ""
 #: guide.sgml:24 offline.sgml:25
 #, fuzzy
 msgid ""
 #: guide.sgml:24 offline.sgml:25
 #, fuzzy
 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 ""
 msgstr ""

-"Per ulteriori dettagli sui sistemi GNU/Linux si veda il testo completo della "
-"licenza nel file /usr/share/common-licenses/GPL."
+"Per ulteriori dettagli sui sistemi si veda il testo completo della licenza "
+"nel file /usr/share/common-licenses/GPL."

 
 #. type: <heading></heading>
 #: guide.sgml:32
 
 #. type: <heading></heading>
 #: guide.sgml:32


@@ -7448,6 +5965,12 @@ msgstr ""
 "con un buon numero di algoritmi automatici, che aiutano a selezionare i "
 "pacchetti da installare."
 
 "con un buon numero di algoritmi automatici, che aiutano a selezionare i "
 "pacchetti da installare."
 

+#. type: <heading></heading>
+#: guide.sgml:96
+#, fuzzy
+msgid "apt-get"
+msgstr "apt-get"
+

 #. type: <p></p>
 #: guide.sgml:102
 #, fuzzy
 #. type: <p></p>
 #: guide.sgml:102
 #, fuzzy


@@ -7501,6 +6024,12 @@ msgstr ""
 msgid "Once updated there are several commands that can be used:"
 msgstr "Dopo aver aggiornato l'elenco si possono usare molti comandi:"
 
 msgid "Once updated there are several commands that can be used:"
 msgstr "Dopo aver aggiornato l'elenco si possono usare molti comandi:"
 

+#. type: <tag></tag>
+#: guide.sgml:121
+#, fuzzy
+msgid "upgrade"
+msgstr "upgrade"
+

 #. type: <p></p>
 #: guide.sgml:131
 #, fuzzy
 #. type: <p></p>
 #: guide.sgml:131
 #, fuzzy


@@ -7521,6 +6050,12 @@ msgstr ""
 "altri. Per forzare la loro installazione si può usare <prgn>dselect</prgn> o "
 "<tt>apt-get install</tt>."
 
 "altri. Per forzare la loro installazione si può usare <prgn>dselect</prgn> o "
 "<tt>apt-get install</tt>."
 

+#. type: <tag></tag>
+#: guide.sgml:131
+#, fuzzy
+msgid "install"
+msgstr "install"
+

 #. type: <p></p>
 #: guide.sgml:140
 #, fuzzy
 #. type: <p></p>
 #: guide.sgml:140
 #, fuzzy


@@ -7542,6 +6077,12 @@ msgstr ""
 "conferma se si devono modificare altri pacchetti che non siano quelli sulla "
 "linea di comando."
 
 "conferma se si devono modificare altri pacchetti che non siano quelli sulla "
 "linea di comando."
 

+#. type: <tag></tag>
+#: guide.sgml:140
+#, fuzzy
+msgid "dist-upgrade"
+msgstr "dist-upgrade"
+

 #. type: <p></p>
 #: guide.sgml:149
 #, fuzzy
 #. type: <p></p>
 #: guide.sgml:149
 #, fuzzy


@@ -7622,12 +6163,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 "
 "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 "
 "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 "
 "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 ""
 "Per abilitare il metodo APT dovete selezionare [A]ccess in <prgn>dselect</"
 "prgn> e scegliere il metodo APT; vi verrà chiesto un insieme di fonti "
 msgstr ""
 "Per abilitare il metodo APT dovete selezionare [A]ccess in <prgn>dselect</"
 "prgn> e scegliere il metodo APT; vi verrà chiesto un insieme di fonti "