* apt-pkg/indexcopy.cc:

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

diff --git a/doc/po/it.po b/doc/po/it.po
index 2722ca56252f04e6187abb31782b9c89e7eb7277..d204b64e601bad6733220f9787bf952bc0400767 100644 (file)
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -9,10 +9,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"

-"POT-Creation-Date: 2009-10-29 14:19+0100\n"
+"POT-Creation-Date: 2010-07-30 12:46+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"

+"Language: \n"

 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"


@@ -405,17 +406,6 @@ msgstr ""
 #: apt.ent:150
 #, no-wrap
 msgid ""
 #: apt.ent:150
 #, no-wrap
 msgid ""

-"<!ENTITY gnome-apt \"<citerefentry>\n"
-"    <refentrytitle><command>gnome-apt</command></refentrytitle>\n"
-"    <manvolnum>1</manvolnum>\n"
-"  </citerefentry>\"\n"
-">\n"
-msgstr ""
-
-#. type: Plain text
-#: apt.ent:156
-#, no-wrap
-msgid ""

 "<!ENTITY wajig \"<citerefentry>\n"
 "    <refentrytitle><command>wajig</command></refentrytitle>\n"
 "    <manvolnum>1</manvolnum>\n"
 "<!ENTITY wajig \"<citerefentry>\n"
 "    <refentrytitle><command>wajig</command></refentrytitle>\n"
 "    <manvolnum>1</manvolnum>\n"


@@ -424,7 +414,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

-#: apt.ent:168
+#: apt.ent:162

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


@@ -441,7 +431,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

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

 #, no-wrap
 msgid ""
 " </refentryinfo>\n"
 #, no-wrap
 msgid ""
 " </refentryinfo>\n"


@@ -449,7 +439,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

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

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


@@ -460,7 +450,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

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

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


@@ -473,7 +463,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

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

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


@@ -486,7 +476,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

-#: apt.ent:200
+#: apt.ent:194

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


@@ -498,7 +488,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

-#: apt.ent:204 apt.ent:215
+#: apt.ent:198 apt.ent:209

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


@@ -507,7 +497,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

-#: apt.ent:211
+#: apt.ent:205

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


@@ -519,7 +509,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

-#: apt.ent:221
+#: apt.ent:215

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


@@ -530,7 +520,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

-#: apt.ent:232
+#: apt.ent:226

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


@@ -546,7 +536,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

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

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


@@ -559,7 +549,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

-#: apt.ent:250
+#: apt.ent:244

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


@@ -574,7 +564,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

-#: apt.ent:258
+#: apt.ent:252

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


@@ -587,7 +577,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

-#: apt.ent:268
+#: apt.ent:264

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


@@ -595,14 +585,16 @@ msgid ""
 "      <term><option>--config-file</option></term>\n"
 "     <listitem><para>Configuration File; Specify a configuration file to use. \n"
 "     The program will read the default configuration file and then this \n"
 "      <term><option>--config-file</option></term>\n"
 "     <listitem><para>Configuration File; Specify a configuration file to use. \n"
 "     The program will read the default configuration file and then this \n"

-"     configuration file. See &apt-conf; for syntax information.     \n"
+"     configuration file. If configuration settings need to be set before the\n"
+"     default configuration files are parsed specify a file with the <envar>APT_CONFIG</envar>\n"
+"     environment variable. See &apt-conf; for syntax information.\n"

 "     </para>\n"
 "     </listitem>\n"
 "     </varlistentry>\n"
 msgstr ""
 
 #. type: Plain text
 "     </para>\n"
 "     </listitem>\n"
 "     </varlistentry>\n"
 msgstr ""
 
 #. type: Plain text

-#: apt.ent:280
+#: apt.ent:276

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


@@ -619,7 +611,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

-#: apt.ent:291
+#: apt.ent:287

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


@@ -635,7 +627,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

-#: apt.ent:297
+#: apt.ent:293

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


@@ -646,7 +638,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

-#: apt.ent:303
+#: apt.ent:299

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


@@ -657,7 +649,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

-#: apt.ent:309
+#: apt.ent:305

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


@@ -668,7 +660,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

-#: apt.ent:315
+#: apt.ent:311

 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"


@@ -679,7 +671,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

-#: apt.ent:325
+#: apt.ent:321

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


@@ -694,7 +686,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

-#: apt.ent:331
+#: apt.ent:327

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


@@ -705,7 +697,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

-#: apt.ent:337
+#: apt.ent:333

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


@@ -716,7 +708,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

-#: apt.ent:343
+#: apt.ent:339

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


@@ -727,7 +719,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

-#: apt.ent:350
+#: apt.ent:346

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


@@ -739,7 +731,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
 msgstr ""
 
 #. type: Plain text

-#: apt.ent:355
+#: apt.ent:352

 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"


@@ -749,10 +741,92 @@ msgid ""
 "\">\n"
 msgstr ""
 
 "\">\n"
 msgstr ""
 

+#. type: Plain text
+#: apt.ent:358
+#, no-wrap
+msgid ""
+"<!ENTITY file-trustedgpg \"\n"
+"     <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n"
+"     <listitem><para>Keyring of local trusted keys, new keys will be added here.\n"
+"     Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n"
+"     </varlistentry>\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:365
+#, no-wrap
+msgid ""
+"     <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
+"     <listitem><para>File fragments for the trusted keys, additional keyrings can\n"
+"     be stored here (by other packages or the administrator).\n"
+"     Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n"
+"     </varlistentry>\n"
+"\">\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:373
+#, no-wrap
+msgid ""
+"<!ENTITY file-extended_states \"\n"
+"      <varlistentry><term><filename>/var/lib/apt/extended_states</filename></term>\n"
+"      <listitem><para>Status list of auto-installed packages.\n"
+"      Configuration Item: <literal>Dir::State::extended_states</literal>.\n"
+"      </para></listitem>\n"
+"      </varlistentry>\n"
+"\">\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:377
+#, no-wrap
+msgid ""
+"<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
+"     to the other headers like NAME and DESCRIPTION and should therefore be uppercase. -->\n"
+"<!ENTITY translation-title \"TRANSLATION\">\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:386
+#, no-wrap
+msgid ""
+"<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
+"     to the translation in the past, who is responsible now and maybe further information\n"
+"     specially related to your translation. -->\n"
+"<!ENTITY translation-holder \"\n"
+"     The english translation was done by John Doe <email>john@doe.org</email> in 2009,\n"
+"     2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together with the\n"
+"     Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>.\n"
+"\">\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:397
+#, no-wrap
+msgid ""
+"<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
+"     in a shipped manpage newer/modified paragraphs will maybe appear in english in\n"
+"     the generated manpage. This sentence is therefore here to tell the reader that this\n"
+"     is not a mistake by the translator - obviously the target is that at least for stable\n"
+"     releases this sentence is not needed. :) -->\n"
+"<!ENTITY translation-english \"\n"
+"     Note that this translated document may contain untranslated parts.\n"
+"     This is done on purpose, to avoid losing content when the\n"
+"     translation is lagging behind the original content.\n"
+"\">\n"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:400
+msgid ""
+"<!ENTITY oldstable-codename \"etch\"> <!ENTITY stable-codename \"lenny\"> <!"
+"ENTITY testing-codename \"squeeze\">"
+msgstr ""
+

 #.  The last update date 
 #. type: Content of: <refentry><refentryinfo>
 #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13
 #.  The last update date 
 #. type: Content of: <refentry><refentryinfo>
 #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13

-#: apt-ftparchive.1.xml:13 apt-sortpkgs.1.xml:13 sources.list.5.xml:13
+#: apt-sortpkgs.1.xml:13 sources.list.5.xml:13

 msgid ""
 "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>29 "
 "February 2004</date>"
 msgid ""
 "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>29 "
 "February 2004</date>"


@@ -811,8 +885,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47

-#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125
-#: apt-key.8.xml:34 apt-mark.8.xml:52 apt-secure.8.xml:40
+#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:111
+#: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40

 #: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33
 #: sources.list.5.xml:33
 msgid "Description"
 #: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33
 #: sources.list.5.xml:33
 msgid "Description"


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

-#: apt-cache.8.xml:68 apt-get.8.xml:131
+#: apt-cache.8.xml:68 apt-get.8.xml:117

 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."


@@ -1202,8 +1276,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56

-#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89
-#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:456 apt.conf.5.xml:478
+#: apt-ftparchive.1.xml:519 apt-get.8.xml:305 apt-mark.8.xml:89
+#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:556 apt.conf.5.xml:578

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


@@ -1226,7 +1300,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-cache.8.xml:291 apt-ftparchive.1.xml:535 apt-get.8.xml:376
+#: apt-cache.8.xml:291 apt-ftparchive.1.xml:562 apt-get.8.xml:362

 #: apt-sortpkgs.1.xml:58
 msgid "<option>-s</option>"
 msgstr ""
 #: apt-sortpkgs.1.xml:58
 msgid "<option>-s</option>"
 msgstr ""


@@ -1247,12 +1321,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:536 apt-get.8.xml:352

 msgid "<option>-q</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid "<option>-q</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:536 apt-get.8.xml:352

 msgid "<option>--quiet</option>"
 msgstr ""
 
 msgid "<option>--quiet</option>"
 msgstr ""
 


@@ -1284,34 +1358,84 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-cache.8.xml:312 apt-cdrom.8.xml:121 apt-get.8.xml:333
+#: apt-cache.8.xml:312
+msgid "<option>--no-pre-depends</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:313
+msgid "<option>--no-depends</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:314
+msgid "<option>--no-recommends</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:315
+msgid "<option>--no-suggests</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:316
+msgid "<option>--no-conflicts</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:317
+msgid "<option>--no-breaks</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:318
+msgid "<option>--no-replaces</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:319
+msgid "<option>--no-enhances</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:320
+msgid ""
+"Per default the <literal>depends</literal> and <literal>rdepends</literal> "
+"print all dependencies. This can be twicked with these flags which will omit "
+"the specified dependency type.  Configuration Item: <literal>APT::Cache::"
+"Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
+"Cache::ShowRecommends</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-cache.8.xml:326 apt-cdrom.8.xml:121 apt-get.8.xml:319

 msgid "<option>-f</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid "<option>-f</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-cache.8.xml:312
+#: apt-cache.8.xml:326

 msgid "<option>--full</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<option>--full</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:313
+#: apt-cache.8.xml:327

 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 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:317 apt-cdrom.8.xml:131
+#: apt-cache.8.xml:331 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:574

 msgid "<option>-a</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid "<option>-a</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-cache.8.xml:317
+#: apt-cache.8.xml:331

 msgid "<option>--all-versions</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<option>--all-versions</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:318
+#: apt-cache.8.xml:332

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


@@ -1322,17 +1446,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-cache.8.xml:326
+#: apt-cache.8.xml:340

 msgid "<option>-g</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid "<option>-g</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-cache.8.xml:326
+#: apt-cache.8.xml:340

 msgid "<option>--generate</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<option>--generate</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:327
+#: apt-cache.8.xml:341

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


@@ -1340,29 +1464,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-cache.8.xml:332
+#: apt-cache.8.xml:346

 msgid "<option>--names-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid "<option>--names-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-cache.8.xml:332 apt-cdrom.8.xml:139
+#: apt-cache.8.xml:346 apt-cdrom.8.xml:139

 msgid "<option>-n</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<option>-n</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:333
+#: apt-cache.8.xml:347

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

 msgid "<option>--all-names</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<option>--all-names</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

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

 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: <literal>APT::Cache::"
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: <literal>APT::Cache::"


@@ -1370,12 +1494,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

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

 msgid "<option>--recurse</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<option>--recurse</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:344
+#: apt-cache.8.xml:358

 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "


@@ -1383,12 +1507,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-cache.8.xml:349
+#: apt-cache.8.xml:363

 msgid "<option>--installed</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<option>--installed</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

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

 msgid ""
 "Limit the output of <literal>depends</literal> and <literal>rdepends</"
 "literal> to packages which are currently installed.  Configuration Item: "
 msgid ""
 "Limit the output of <literal>depends</literal> and <literal>rdepends</"
 "literal> to packages which are currently installed.  Configuration Item: "


@@ -1396,46 +1520,46 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>

-#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
-#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:547 apt-get.8.xml:554
+#: apt-cache.8.xml:370 apt-cdrom.8.xml:150 apt-config.8.xml:98
+#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:602 apt-get.8.xml:547

 #: apt-sortpkgs.1.xml:64
 msgid "&apt-commonoptions;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-sortpkgs.1.xml:64
 msgid "&apt-commonoptions;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122
-#: apt.conf.5.xml:988 apt_preferences.5.xml:615
+#: apt-cache.8.xml:375 apt-get.8.xml:552 apt-key.8.xml:153 apt-mark.8.xml:122
+#: apt.conf.5.xml:1089 apt_preferences.5.xml:644

 msgid "Files"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
 msgid "Files"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>

-#: apt-cache.8.xml:363
+#: apt-cache.8.xml:377

 msgid "&file-sourceslist; &file-statelists;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 msgid "&file-sourceslist; &file-statelists;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
-#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 apt-get.8.xml:569
-#: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:994 apt_preferences.5.xml:622
+#: apt-cache.8.xml:382 apt-cdrom.8.xml:155 apt-config.8.xml:103
+#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:618 apt-get.8.xml:562
+#: apt-key.8.xml:174 apt-mark.8.xml:128 apt-secure.8.xml:181
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1095 apt_preferences.5.xml:651

 #: sources.list.5.xml:233
 msgid "See Also"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:233
 msgid "See Also"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-cache.8.xml:369
+#: apt-cache.8.xml:383

 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:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
-#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:567 apt-get.8.xml:575
-#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
+#: apt-cache.8.xml:387 apt-cdrom.8.xml:160 apt-config.8.xml:108
+#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:622 apt-get.8.xml:568
+#: apt-mark.8.xml:132 apt-sortpkgs.1.xml:73

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

-#: apt-cache.8.xml:374
+#: apt-cache.8.xml:388

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


@@ -1494,7 +1618,7 @@ msgstr ""
 #: apt-cdrom.8.xml:66
 msgid ""
 "<literal>add</literal> is used to add a new disc to the source list. It will "
 #: apt-cdrom.8.xml:66
 msgid ""
 "<literal>add</literal> is used to add a new disc to the source list. It will "

-"unmount the CDROM device, prompt for a disk to be inserted and then procceed "
+"unmount the CDROM device, prompt for a disk to be inserted and then proceed "

 "to scan it and copy the index files. If the disc does not have a proper "
 "<filename>disk</filename> directory you will be prompted for a descriptive "
 "title."
 "to scan it and copy the index files. If the disc does not have a proper "
 "<filename>disk</filename> directory you will be prompted for a descriptive "
 "title."


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

-#: apt-cdrom.8.xml:91
+#: apt-cdrom.8.xml:91 apt-key.8.xml:139

 msgid "Options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid "Options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:503 apt-get.8.xml:328
+#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:530 apt-get.8.xml:314

 msgid "<option>-d</option>"
 msgstr ""
 
 msgid "<option>-d</option>"
 msgstr ""
 


@@ -1570,7 +1694,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-cdrom.8.xml:113 apt-get.8.xml:347
+#: apt-cdrom.8.xml:113 apt-get.8.xml:333

 msgid "<option>-m</option>"
 msgstr ""
 
 msgid "<option>-m</option>"
 msgstr ""
 


@@ -1615,17 +1739,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-cdrom.8.xml:140 apt-get.8.xml:378
+#: apt-cdrom.8.xml:140 apt-get.8.xml:364

 msgid "<option>--just-print</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid "<option>--just-print</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-cdrom.8.xml:141 apt-get.8.xml:380
+#: apt-cdrom.8.xml:141 apt-get.8.xml:366

 msgid "<option>--recon</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid "<option>--recon</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-cdrom.8.xml:142 apt-get.8.xml:381
+#: apt-cdrom.8.xml:142 apt-get.8.xml:367

 msgid "<option>--no-act</option>"
 msgstr ""
 
 msgid "<option>--no-act</option>"
 msgstr ""
 


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

-#: apt-config.8.xml:53 apt-ftparchive.1.xml:71
+#: apt-config.8.xml:53 apt-ftparchive.1.xml:72

 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given "
 "one of the commands below must be present."
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given "
 "one of the commands below must be present."


@@ -1729,7 +1853,7 @@ msgid "Just show the contents of the configuration space."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:564
+#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:619

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


@@ -1790,7 +1914,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-extracttemplates.1.xml:60 apt-get.8.xml:488
+#: apt-extracttemplates.1.xml:60 apt-get.8.xml:481

 msgid "<option>-t</option>"
 msgstr ""
 
 msgid "<option>-t</option>"
 msgstr ""
 


@@ -1814,6 +1938,14 @@ msgid ""
 "decimal 100 on error."
 msgstr ""
 
 "decimal 100 on error."
 msgstr ""
 

+#.  The last update date 
+#. type: Content of: <refentry><refentryinfo>
+#: apt-ftparchive.1.xml:13
+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:22 apt-ftparchive.1.xml:29
 msgid "apt-ftparchive"
 #. type: Content of: <refentry><refnamediv><refname>
 #: apt-ftparchive.1.xml:22 apt-ftparchive.1.xml:29
 msgid "apt-ftparchive"


@@ -1830,6 +1962,7 @@ msgid ""
 "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
 "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
 "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
 "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
 "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
 "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"

+"arg> <arg><option>--arch <replaceable>architecture</replaceable></option></"

 "arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</"
 "replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></"
 "option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep="
 "arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</"
 "replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></"
 "option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep="


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

-#: apt-ftparchive.1.xml:56
+#: apt-ftparchive.1.xml:57

 msgid ""
 "<command>apt-ftparchive</command> is the command line tool that generates "
 "the index files that APT uses to access a distribution source. The index "
 msgid ""
 "<command>apt-ftparchive</command> is the command line tool that generates "
 "the index files that APT uses to access a distribution source. The index "


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

-#: apt-ftparchive.1.xml:60
+#: apt-ftparchive.1.xml:61

 msgid ""
 "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
 "program, incorporating its entire functionality via the <literal>packages</"
 msgid ""
 "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
 "program, incorporating its entire functionality via the <literal>packages</"


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

-#: apt-ftparchive.1.xml:66
+#: apt-ftparchive.1.xml:67

 msgid ""
 "Internally <command>apt-ftparchive</command> can make use of binary "
 "databases to cache the contents of a .deb file and it does not rely on any "
 msgid ""
 "Internally <command>apt-ftparchive</command> can make use of binary "
 "databases to cache the contents of a .deb file and it does not rely on any "


@@ -1876,12 +2009,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-ftparchive.1.xml:75
+#: apt-ftparchive.1.xml:76

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

-#: apt-ftparchive.1.xml:77
+#: apt-ftparchive.1.xml:78

 msgid ""
 "The packages command generates a package file from a directory tree. It "
 "takes the given directory and recursively searches it for .deb files, "
 msgid ""
 "The packages command generates a package file from a directory tree. It "
 "takes the given directory and recursively searches it for .deb files, "


@@ -1890,18 +2023,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:82 apt-ftparchive.1.xml:106
+#: apt-ftparchive.1.xml:83 apt-ftparchive.1.xml:107

 msgid ""
 "The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid ""
 "The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-ftparchive.1.xml:85
+#: apt-ftparchive.1.xml:86

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

-#: apt-ftparchive.1.xml:87
+#: apt-ftparchive.1.xml:88

 msgid ""
 "The <literal>sources</literal> command generates a source index file from a "
 "directory tree.  It takes the given directory and recursively searches it "
 msgid ""
 "The <literal>sources</literal> command generates a source index file from a "
 "directory tree.  It takes the given directory and recursively searches it "


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

-#: apt-ftparchive.1.xml:92
+#: apt-ftparchive.1.xml:93

 msgid ""
 "If an override file is specified then a source override file will be looked "
 "for with an extension of .src. The --source-override option can be used to "
 msgid ""
 "If an override file is specified then a source override file will be looked "
 "for with an extension of .src. The --source-override option can be used to "


@@ -1918,12 +2051,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-ftparchive.1.xml:97
+#: apt-ftparchive.1.xml:98

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

-#: apt-ftparchive.1.xml:99
+#: apt-ftparchive.1.xml:100

 msgid ""
 "The <literal>contents</literal> command generates a contents file from a "
 "directory tree. It takes the given directory and recursively searches it "
 msgid ""
 "The <literal>contents</literal> command generates a contents file from a "
 "directory tree. It takes the given directory and recursively searches it "


@@ -1934,12 +2067,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-ftparchive.1.xml:109
+#: apt-ftparchive.1.xml:110

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

-#: apt-ftparchive.1.xml:111
+#: apt-ftparchive.1.xml:112

 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for Packages, "
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for Packages, "


@@ -1949,25 +2082,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:118
+#: apt-ftparchive.1.xml:119

 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under <literal>APT::FTPArchive::Release</"
 "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>.  The "
 "supported fields are: <literal>Origin</literal>, <literal>Label</literal>, "
 "<literal>Suite</literal>, <literal>Version</literal>, <literal>Codename</"
 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under <literal>APT::FTPArchive::Release</"
 "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>.  The "
 "supported fields are: <literal>Origin</literal>, <literal>Label</literal>, "
 "<literal>Suite</literal>, <literal>Version</literal>, <literal>Codename</"

-"literal>, <literal>Date</literal>, <literal>Architectures</literal>, "
-"<literal>Components</literal>, <literal>Description</literal>."
+"literal>, <literal>Date</literal>, <literal>Valid-Until</literal>, "
+"<literal>Architectures</literal>, <literal>Components</literal>, "
+"<literal>Description</literal>."

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

-#: apt-ftparchive.1.xml:128
+#: apt-ftparchive.1.xml:130

 #, fuzzy
 msgid "generate"
 msgstr "Descrizione generale"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #, fuzzy
 msgid "generate"
 msgstr "Descrizione generale"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:130
+#: apt-ftparchive.1.xml:132

 msgid ""
 "The <literal>generate</literal> command is designed to be runnable from a "
 "cron script and builds indexes according to the given config file. The "
 msgid ""
 "The <literal>generate</literal> command is designed to be runnable from a "
 "cron script and builds indexes according to the given config file. The "


@@ -1977,24 +2111,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-ftparchive.1.xml:137 apt-get.8.xml:292
+#: apt-ftparchive.1.xml:139 apt-get.8.xml:278

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

-#: apt-ftparchive.1.xml:139
+#: apt-ftparchive.1.xml:141

 msgid ""
 "The <literal>clean</literal> command tidies the databases used by the given "
 "configuration file by removing any records that are no longer necessary."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 msgid ""
 "The <literal>clean</literal> command tidies the databases used by the given "
 "configuration file by removing any records that are no longer necessary."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt-ftparchive.1.xml:145
+#: apt-ftparchive.1.xml:147

 msgid "The Generate Configuration"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "The Generate Configuration"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-ftparchive.1.xml:147
+#: apt-ftparchive.1.xml:149

 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "


@@ -2005,18 +2139,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-ftparchive.1.xml:155
+#: apt-ftparchive.1.xml:157

 msgid ""
 "The generate configuration has 4 separate sections, each described below."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 msgid ""
 "The generate configuration has 4 separate sections, each described below."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt-ftparchive.1.xml:157
+#: apt-ftparchive.1.xml:159

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

-#: apt-ftparchive.1.xml:159
+#: apt-ftparchive.1.xml:161

 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "
 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "


@@ -2025,12 +2159,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>

-#: apt-ftparchive.1.xml:164
+#: apt-ftparchive.1.xml:166

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

-#: apt-ftparchive.1.xml:166
+#: apt-ftparchive.1.xml:168

 msgid ""
 "Specifies the root of the FTP archive, in a standard Debian configuration "
 "this is the directory that contains the <filename>ls-LR</filename> and dist "
 msgid ""
 "Specifies the root of the FTP archive, in a standard Debian configuration "
 "this is the directory that contains the <filename>ls-LR</filename> and dist "


@@ -2038,44 +2172,44 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>

-#: apt-ftparchive.1.xml:171
+#: apt-ftparchive.1.xml:173

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

-#: apt-ftparchive.1.xml:173
+#: apt-ftparchive.1.xml:175

 msgid "Specifies the location of the override files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 msgid "Specifies the location of the override files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>

-#: apt-ftparchive.1.xml:176
+#: apt-ftparchive.1.xml:178

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

-#: apt-ftparchive.1.xml:178
+#: apt-ftparchive.1.xml:180

 msgid "Specifies the location of the cache files"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 msgid "Specifies the location of the cache files"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>

-#: apt-ftparchive.1.xml:181
+#: apt-ftparchive.1.xml:183

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

-#: apt-ftparchive.1.xml:183
+#: apt-ftparchive.1.xml:185

 msgid ""
 "Specifies the location of the file list files, if the <literal>FileList</"
 "literal> setting is used below."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 msgid ""
 "Specifies the location of the file list files, if the <literal>FileList</"
 "literal> setting is used below."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt-ftparchive.1.xml:189
+#: apt-ftparchive.1.xml:191

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

-#: apt-ftparchive.1.xml:191
+#: apt-ftparchive.1.xml:193

 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "
 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "


@@ -2083,12 +2217,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>

-#: apt-ftparchive.1.xml:195
+#: apt-ftparchive.1.xml:197

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

-#: apt-ftparchive.1.xml:197
+#: apt-ftparchive.1.xml:199

 msgid ""
 "Sets the default compression schemes to use for the Package index files. It "
 "is a string that contains a space separated list of at least one of: '.' (no "
 msgid ""
 "Sets the default compression schemes to use for the Package index files. It "
 "is a string that contains a space separated list of at least one of: '.' (no "


@@ -2097,60 +2231,72 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>

-#: apt-ftparchive.1.xml:203
+#: apt-ftparchive.1.xml:205

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

-#: apt-ftparchive.1.xml:205
+#: apt-ftparchive.1.xml:207

 msgid ""
 "Sets the default list of file extensions that are package files.  This "
 "defaults to '.deb'."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 msgid ""
 "Sets the default list of file extensions that are package files.  This "
 "defaults to '.deb'."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>

-#: apt-ftparchive.1.xml:209
+#: apt-ftparchive.1.xml:211

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

-#: apt-ftparchive.1.xml:211
+#: apt-ftparchive.1.xml:213

 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Sources files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Sources files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>

-#: apt-ftparchive.1.xml:215
+#: apt-ftparchive.1.xml:217

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

-#: apt-ftparchive.1.xml:217
+#: apt-ftparchive.1.xml:219

 msgid ""
 "Sets the default list of file extensions that are source files.  This "
 "defaults to '.dsc'."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 msgid ""
 "Sets the default list of file extensions that are source files.  This "
 "defaults to '.dsc'."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>

-#: apt-ftparchive.1.xml:221
+#: apt-ftparchive.1.xml:223

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

-#: apt-ftparchive.1.xml:223
+#: apt-ftparchive.1.xml:225

 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Contents files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Contents files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>

-#: apt-ftparchive.1.xml:227
+#: apt-ftparchive.1.xml:229
+msgid "Translation::Compress"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:231
+msgid ""
+"This is similar to <literal>Packages::Compress</literal> except that it "
+"controls the compression for the Translation-en master file."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:235

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

-#: apt-ftparchive.1.xml:229
+#: apt-ftparchive.1.xml:237

 msgid ""
 "Specifies the number of kilobytes to delink (and replace with hard links) "
 "per run. This is used in conjunction with the per-section <literal>External-"
 msgid ""
 "Specifies the number of kilobytes to delink (and replace with hard links) "
 "per run. This is used in conjunction with the per-section <literal>External-"


@@ -2158,24 +2304,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>

-#: apt-ftparchive.1.xml:234
+#: apt-ftparchive.1.xml:242

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

-#: apt-ftparchive.1.xml:236
+#: apt-ftparchive.1.xml:244

 msgid ""
 "Specifies the mode of all created index files. It defaults to 0644. All "
 "index files are set to this mode with no regard to the umask."
 msgstr ""
 
 msgid ""
 "Specifies the mode of all created index files. It defaults to 0644. All "
 "index files are set to this mode with no regard to the umask."
 msgstr ""
 

+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:249 apt-ftparchive.1.xml:395
+msgid "LongDescription"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:251 apt-ftparchive.1.xml:397
+msgid ""
+"Sets if long descriptions should be included in the Packages file or split "
+"out into a master Translation-en file."
+msgstr ""
+

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

-#: apt-ftparchive.1.xml:243
+#: apt-ftparchive.1.xml:257

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

-#: apt-ftparchive.1.xml:245
+#: apt-ftparchive.1.xml:259

 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "


@@ -2183,12 +2341,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>

-#: apt-ftparchive.1.xml:250
+#: apt-ftparchive.1.xml:264

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

-#: apt-ftparchive.1.xml:252
+#: apt-ftparchive.1.xml:266

 msgid ""
 "Sets the number of kilobytes of contents files that are generated each day. "
 "The contents files are round-robined so that over several days they will all "
 msgid ""
 "Sets the number of kilobytes of contents files that are generated each day. "
 "The contents files are round-robined so that over several days they will all "


@@ -2196,12 +2354,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>

-#: apt-ftparchive.1.xml:257
+#: apt-ftparchive.1.xml:271

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

-#: apt-ftparchive.1.xml:259
+#: apt-ftparchive.1.xml:273

 msgid ""
 "Controls the number of days a contents file is allowed to be checked without "
 "changing. If this limit is passed the mtime of the contents file is updated. "
 msgid ""
 "Controls the number of days a contents file is allowed to be checked without "
 "changing. If this limit is passed the mtime of the contents file is updated. "


@@ -2212,60 +2370,73 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>

-#: apt-ftparchive.1.xml:268
+#: apt-ftparchive.1.xml:282

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

-#: apt-ftparchive.1.xml:270
+#: apt-ftparchive.1.xml:284

 msgid ""
 "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 msgid ""
 "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>

-#: apt-ftparchive.1.xml:274
+#: apt-ftparchive.1.xml:288

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

-#: apt-ftparchive.1.xml:276
+#: apt-ftparchive.1.xml:290

 msgid ""
 "Sets the top of the source package directory tree. Defaults to <filename>"
 "$(DIST)/$(SECTION)/source/</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 msgid ""
 "Sets the top of the source package directory tree. Defaults to <filename>"
 "$(DIST)/$(SECTION)/source/</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>

-#: apt-ftparchive.1.xml:280 apt-ftparchive.1.xml:406
+#: apt-ftparchive.1.xml:294 apt-ftparchive.1.xml:433

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

-#: apt-ftparchive.1.xml:282
+#: apt-ftparchive.1.xml:296

 msgid ""
 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "binary-$(ARCH)/Packages</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 msgid ""
 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "binary-$(ARCH)/Packages</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>

-#: apt-ftparchive.1.xml:286 apt-ftparchive.1.xml:411
+#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:438

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

-#: apt-ftparchive.1.xml:288
+#: apt-ftparchive.1.xml:302

 msgid ""
 msgid ""

-"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
+"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"

 "source/Sources</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 "source/Sources</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>

-#: apt-ftparchive.1.xml:292
+#: apt-ftparchive.1.xml:306
+msgid "Translation"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:308
+msgid ""
+"Set the output Translation-en master file with the long descriptions if they "
+"should be not included in the Packages file. Defaults to <filename>$(DIST)/"
+"$(SECTION)/i18n/Translation-en</filename>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:313

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

-#: apt-ftparchive.1.xml:294
+#: apt-ftparchive.1.xml:315

 msgid ""
 "Sets the path prefix that causes a symlink to be considered an internal link "
 "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
 msgid ""
 "Sets the path prefix that causes a symlink to be considered an internal link "
 "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"


@@ -2273,12 +2444,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>

-#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:417
+#: apt-ftparchive.1.xml:320 apt-ftparchive.1.xml:444

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

-#: apt-ftparchive.1.xml:301
+#: apt-ftparchive.1.xml:322

 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
 "</filename>. If this setting causes multiple Packages files to map onto a "
 msgid ""
 "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)"
 "</filename>. If this setting causes multiple Packages files to map onto a "


@@ -2287,34 +2458,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>

-#: apt-ftparchive.1.xml:308
+#: apt-ftparchive.1.xml:329

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

-#: apt-ftparchive.1.xml:310
+#: apt-ftparchive.1.xml:331

 msgid "Sets header file to prepend to the contents output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 msgid "Sets header file to prepend to the contents output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>

-#: apt-ftparchive.1.xml:313 apt-ftparchive.1.xml:442
+#: apt-ftparchive.1.xml:334 apt-ftparchive.1.xml:469

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

-#: apt-ftparchive.1.xml:315
+#: apt-ftparchive.1.xml:336

 msgid ""
 "Sets the binary cache database to use for this section. Multiple sections "
 "can share the same database."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 msgid ""
 "Sets the binary cache database to use for this section. Multiple sections "
 "can share the same database."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>

-#: apt-ftparchive.1.xml:319
+#: apt-ftparchive.1.xml:340

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

-#: apt-ftparchive.1.xml:321
+#: apt-ftparchive.1.xml:342

 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "


@@ -2322,12 +2493,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>

-#: apt-ftparchive.1.xml:326
+#: apt-ftparchive.1.xml:347

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

-#: apt-ftparchive.1.xml:328
+#: apt-ftparchive.1.xml:349

 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "
 msgid ""
 "Specifies that instead of walking the directory tree, <command>apt-"
 "ftparchive</command> should read the list of files from the given file. "


@@ -2336,12 +2507,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt-ftparchive.1.xml:336
+#: apt-ftparchive.1.xml:357

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

-#: apt-ftparchive.1.xml:338
+#: apt-ftparchive.1.xml:359

 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "
 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "


@@ -2351,45 +2522,47 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt-ftparchive.1.xml:343
+#: apt-ftparchive.1.xml:364

 msgid ""
 "The <literal>Tree</literal> section takes a scope tag which sets the "
 "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
 "path is prefixed by <literal>ArchiveDir</literal>).  Typically this is a "
 msgid ""
 "The <literal>Tree</literal> section takes a scope tag which sets the "
 "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
 "path is prefixed by <literal>ArchiveDir</literal>).  Typically this is a "

-"setting such as <filename>dists/woody</filename>."
+"setting such as <filename>dists/&stable-codename;</filename>."

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

-#: apt-ftparchive.1.xml:348
+#: apt-ftparchive.1.xml:369

 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
 "can be use in a <literal>Tree</literal> section as well as three new "
 "variables."
 msgstr ""
 
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
 "can be use in a <literal>Tree</literal> section as well as three new "
 "variables."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:351
-msgid ""
-"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
-"command> performs an operation similar to:"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting>
-#: apt-ftparchive.1.xml:354
+#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
+#: apt-ftparchive.1.xml:375

 #, no-wrap
 msgid ""
 "for i in Sections do \n"
 "   for j in Architectures do\n"
 "      Generate for DIST=scope SECTION=i ARCH=j\n"
 #, no-wrap
 msgid ""
 "for i in Sections do \n"
 "   for j in Architectures do\n"
 "      Generate for DIST=scope SECTION=i ARCH=j\n"

+"     "
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt-ftparchive.1.xml:372
+msgid ""
+"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
+"command> performs an operation similar to: <placeholder type=\"programlisting"
+"\" id=\"0\"/>"

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>

-#: apt-ftparchive.1.xml:360
+#: apt-ftparchive.1.xml:381

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

-#: apt-ftparchive.1.xml:362
+#: apt-ftparchive.1.xml:383

 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution, typically this is something like <literal>main contrib non-"
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution, typically this is something like <literal>main contrib non-"


@@ -2397,12 +2570,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>

-#: apt-ftparchive.1.xml:367
+#: apt-ftparchive.1.xml:388

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

-#: apt-ftparchive.1.xml:369
+#: apt-ftparchive.1.xml:390

 msgid ""
 "This is a space separated list of all the architectures that appear under "
 "search section. The special architecture 'source' is used to indicate that "
 msgid ""
 "This is a space separated list of all the architectures that appear under "
 "search section. The special architecture 'source' is used to indicate that "


@@ -2410,56 +2583,56 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>

-#: apt-ftparchive.1.xml:374 apt-ftparchive.1.xml:422
+#: apt-ftparchive.1.xml:401 apt-ftparchive.1.xml:449

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

-#: apt-ftparchive.1.xml:376
+#: apt-ftparchive.1.xml:403

 msgid ""
 "Sets the binary override file. The override file contains section, priority "
 "and maintainer address information."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 msgid ""
 "Sets the binary override file. The override file contains section, priority "
 "and maintainer address information."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>

-#: apt-ftparchive.1.xml:380 apt-ftparchive.1.xml:427
+#: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:454

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

-#: apt-ftparchive.1.xml:382
+#: apt-ftparchive.1.xml:409

 msgid ""
 "Sets the source override file. The override file contains section "
 "information."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 msgid ""
 "Sets the source override file. The override file contains section "
 "information."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>

-#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:432
+#: apt-ftparchive.1.xml:413 apt-ftparchive.1.xml:459

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

-#: apt-ftparchive.1.xml:388 apt-ftparchive.1.xml:434
+#: apt-ftparchive.1.xml:415 apt-ftparchive.1.xml:461

 msgid "Sets the binary extra override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 msgid "Sets the binary extra override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>

-#: apt-ftparchive.1.xml:391 apt-ftparchive.1.xml:437
+#: apt-ftparchive.1.xml:418 apt-ftparchive.1.xml:464

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

-#: apt-ftparchive.1.xml:393 apt-ftparchive.1.xml:439
+#: apt-ftparchive.1.xml:420 apt-ftparchive.1.xml:466

 msgid "Sets the source extra override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 msgid "Sets the source extra override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt-ftparchive.1.xml:398
+#: apt-ftparchive.1.xml:425

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

-#: apt-ftparchive.1.xml:400
+#: apt-ftparchive.1.xml:427

 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "
 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "


@@ -2469,64 +2642,64 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:408
+#: apt-ftparchive.1.xml:435

 msgid "Sets the Packages file output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 msgid "Sets the Packages file output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:413
+#: apt-ftparchive.1.xml:440

 msgid ""
 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
 "<literal>Sources</literal> is required."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 msgid ""
 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
 "<literal>Sources</literal> is required."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:419
+#: apt-ftparchive.1.xml:446

 msgid "Sets the Contents file output. (optional)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 msgid "Sets the Contents file output. (optional)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:424
+#: apt-ftparchive.1.xml:451

 msgid "Sets the binary override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 msgid "Sets the binary override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:429
+#: apt-ftparchive.1.xml:456

 msgid "Sets the source override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 msgid "Sets the source override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:444
+#: apt-ftparchive.1.xml:471

 msgid "Sets the cache DB."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 msgid "Sets the cache DB."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>

-#: apt-ftparchive.1.xml:447
+#: apt-ftparchive.1.xml:474

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

-#: apt-ftparchive.1.xml:449
+#: apt-ftparchive.1.xml:476

 msgid "Appends a path to all the output paths."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 msgid "Appends a path to all the output paths."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>

-#: apt-ftparchive.1.xml:452
+#: apt-ftparchive.1.xml:479

 msgid "FileList, SourceFileList"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 msgid "FileList, SourceFileList"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:454
+#: apt-ftparchive.1.xml:481

 msgid "Specifies the file list file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 msgid "Specifies the file list file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt-ftparchive.1.xml:461
+#: apt-ftparchive.1.xml:488

 msgid "The Binary Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "The Binary Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-ftparchive.1.xml:462
+#: apt-ftparchive.1.xml:489

 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
 "contains 4 fields separated by spaces. The first field is the package name, "
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
 "contains 4 fields separated by spaces. The first field is the package name, "


@@ -2536,19 +2709,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>

-#: apt-ftparchive.1.xml:468
+#: apt-ftparchive.1.xml:495

 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>

-#: apt-ftparchive.1.xml:470
+#: apt-ftparchive.1.xml:497

 #, no-wrap
 msgid "new"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #, no-wrap
 msgid "new"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-ftparchive.1.xml:467
+#: apt-ftparchive.1.xml:494

 msgid ""
 "The general form of the maintainer field is: <placeholder type="
 "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
 msgid ""
 "The general form of the maintainer field is: <placeholder type="
 "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "


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

-#: apt-ftparchive.1.xml:478
+#: apt-ftparchive.1.xml:505

 msgid "The Source Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "The Source Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-ftparchive.1.xml:480
+#: apt-ftparchive.1.xml:507

 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains 2 fields separated by spaces. The first fields is the source "
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains 2 fields separated by spaces. The first fields is the source "


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

-#: apt-ftparchive.1.xml:485
+#: apt-ftparchive.1.xml:512

 msgid "The Extra Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "The Extra Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-ftparchive.1.xml:487
+#: apt-ftparchive.1.xml:514

 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
 "the output. It has 3 columns, the first is the package, the second is the "
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
 "the output. It has 3 columns, the first is the package, the second is the "


@@ -2585,12 +2758,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-ftparchive.1.xml:496
+#: apt-ftparchive.1.xml:523

 msgid "<option>--md5</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<option>--md5</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:498
+#: apt-ftparchive.1.xml:525

 msgid ""
 "Generate MD5 sums. This defaults to on, when turned off the generated index "
 "files will not have MD5Sum fields where possible.  Configuration Item: "
 msgid ""
 "Generate MD5 sums. This defaults to on, when turned off the generated index "
 "files will not have MD5Sum fields where possible.  Configuration Item: "


@@ -2598,19 +2771,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-ftparchive.1.xml:503
+#: apt-ftparchive.1.xml:530

 msgid "<option>--db</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<option>--db</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:505
+#: apt-ftparchive.1.xml:532

 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:511
+#: apt-ftparchive.1.xml:538

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


@@ -2619,12 +2792,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-ftparchive.1.xml:517
+#: apt-ftparchive.1.xml:544

 msgid "<option>--delink</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<option>--delink</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:519
+#: apt-ftparchive.1.xml:546

 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "


@@ -2633,12 +2806,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-ftparchive.1.xml:525
+#: apt-ftparchive.1.xml:552

 msgid "<option>--contents</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<option>--contents</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:527
+#: apt-ftparchive.1.xml:554

 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "


@@ -2648,12 +2821,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-ftparchive.1.xml:535
+#: apt-ftparchive.1.xml:562

 msgid "<option>--source-override</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<option>--source-override</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:537
+#: apt-ftparchive.1.xml:564

 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"


@@ -2661,38 +2834,86 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-ftparchive.1.xml:541
+#: apt-ftparchive.1.xml:568

 msgid "<option>--readonly</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<option>--readonly</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:543
+#: apt-ftparchive.1.xml:570

 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
 msgstr ""
 
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
 msgstr ""
 

+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:574
+msgid "<option>--arch</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:575
+msgid ""
+"Accept in the <literal>packages</literal> and <literal>contents</literal> "
+"commands only package files matching <literal>*_arch.deb</literal> or "
+"<literal>*_all.deb</literal> instead of all package files in the given "
+"path.  Configuration Item: <literal>APT::FTPArchive::Architecture</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:581
+msgid "<option>APT::FTPArchive::AlwaysStat</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:583
+msgid ""
+"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
+"packages are recompiled and/or republished with the same version again, this "
+"will lead to problems as the now outdated cached metadata like size and "
+"checksums will be used. With this option enabled this will no longer happen "
+"as it will be checked if the file was changed.  Note that this option is set "
+"to \"<literal>false</literal>\" by default as it is not recommend to upload "
+"multiply versions/builds of a package with the same versionnumber, so in "
+"theory nobody will have these problems and therefore all these extra checks "
+"are useless."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-ftparchive.1.xml:593
+msgid "<option>APT::FTPArchive::LongDescription</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-ftparchive.1.xml:595
+msgid ""
+"This configuration option defaults to \"<literal>true</literal>\" and should "
+"only be set to <literal>\"false\"</literal> if the Archive generated with "
+"&apt-ftparchive; also provides <filename>Translation</filename> files. Note "
+"that the <filename>Translation-en</filename> master file can only be created "
+"in the generate command."
+msgstr ""
+

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

-#: apt-ftparchive.1.xml:552 apt.conf.5.xml:982 apt_preferences.5.xml:462
+#: apt-ftparchive.1.xml:607 apt.conf.5.xml:1083 apt_preferences.5.xml:491

 #: sources.list.5.xml:193
 msgid "Examples"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
 #: sources.list.5.xml:193
 msgid "Examples"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><programlisting>

-#: apt-ftparchive.1.xml:558
+#: apt-ftparchive.1.xml:613

 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-ftparchive.1.xml:554
+#: apt-ftparchive.1.xml:609

 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-ftparchive.1.xml:568
+#: apt-ftparchive.1.xml:623

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


@@ -2723,26 +2944,21 @@ msgid ""
 "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
 "<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
 "<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> "
 "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
 "<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
 "<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> "

-"<option>-t=</option> <group choice='req'> <arg choice='plain'> "
-"<replaceable>target_release_name</replaceable> </arg> <arg choice='plain'> "
-"<replaceable>target_release_number_expression</replaceable> </arg> <arg "
-"choice='plain'> <replaceable>target_release_codename</replaceable> </arg> </"
-"group> </arg> <group choice=\"req\"> <arg choice='plain'>update</arg> <arg "
-"choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> <arg "
-"choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group "
-"choice='req'> <arg choice='plain'> =<replaceable>pkg_version_number</"
-"replaceable> </arg> <arg choice='plain'> /<replaceable>target_release_name</"
-"replaceable> </arg> <arg choice='plain'> /"
-"<replaceable>target_release_codename</replaceable> </arg> </group> </arg> </"
-"arg> </arg> <arg choice='plain'>remove <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>purge <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-"<arg choice='plain'>source <arg choice=\"plain\" rep=\"repeat"
+"<option>-t=</option> <arg choice='plain'> <replaceable>target_release</"
+"replaceable> </arg> </arg> <group choice=\"req\"> <arg "
+"choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> <arg "
+"choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</arg> "
+"<arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"

 "\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
 "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> <arg "
 "\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
 "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> <arg "

-"choice='plain'> /<replaceable>target_release_name</replaceable> </arg> <arg "
-"choice='plain'> /<replaceable>target_release_codename</replaceable> </arg> </"
+"choice='plain'> /<replaceable>target_release</replaceable> </arg> </group> </"
+"arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain\" rep="
+"\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
+"choice='plain'>purge <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
+"replaceable></arg></arg> <arg choice='plain'>source <arg choice=\"plain\" "
+"rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> "
+"<arg choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
+"<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"

 "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=\"plain"
 "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
 "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
 "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=\"plain"
 "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
 "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "


@@ -2754,22 +2970,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-get.8.xml:126
+#: apt-get.8.xml:112

 msgid ""
 "<command>apt-get</command> is the command-line tool for handling packages, "
 "and may be considered the user's \"back-end\" to other tools using the APT "
 "library.  Several \"front-end\" interfaces exist, such as &dselect;, "
 msgid ""
 "<command>apt-get</command> is the command-line tool for handling packages, "
 "and may be considered the user's \"back-end\" to other tools using the APT "
 "library.  Several \"front-end\" interfaces exist, such as &dselect;, "

-"&aptitude;, &synaptic;, &gnome-apt; and &wajig;."
+"&aptitude;, &synaptic; and &wajig;."

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

-#: apt-get.8.xml:135 apt-key.8.xml:123
+#: apt-get.8.xml:121 apt-key.8.xml:124

 #, fuzzy
 msgid "update"
 msgstr "upgrade"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #, fuzzy
 msgid "update"
 msgstr "upgrade"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:136
+#: apt-get.8.xml:122

 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "


@@ -2783,13 +2999,13 @@ msgid ""
 msgstr ""
 
 #. type: <tag></tag>
 msgstr ""
 
 #. type: <tag></tag>

-#: apt-get.8.xml:147 guide.sgml:121
+#: apt-get.8.xml:133 guide.sgml:121

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

-#: apt-get.8.xml:148
+#: apt-get.8.xml:134

 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "


@@ -2804,13 +3020,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-get.8.xml:160
+#: apt-get.8.xml:146

 #, fuzzy
 msgid "dselect-upgrade"
 msgstr "dist-upgrade"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #, fuzzy
 msgid "dselect-upgrade"
 msgstr "dist-upgrade"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:161
+#: apt-get.8.xml:147

 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"


@@ -2821,13 +3037,13 @@ msgid ""
 msgstr ""
 
 #. type: <tag></tag>
 msgstr ""
 
 #. type: <tag></tag>

-#: apt-get.8.xml:170 guide.sgml:140
+#: apt-get.8.xml:156 guide.sgml:140

 #, fuzzy
 msgid "dist-upgrade"
 msgstr "dist-upgrade"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #, fuzzy
 msgid "dist-upgrade"
 msgstr "dist-upgrade"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:171
+#: apt-get.8.xml:157

 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "


@@ -2841,13 +3057,13 @@ msgid ""
 msgstr ""
 
 #. type: <tag></tag>
 msgstr ""
 
 #. type: <tag></tag>

-#: apt-get.8.xml:183 guide.sgml:131
+#: apt-get.8.xml:169 guide.sgml:131

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

-#: apt-get.8.xml:185
+#: apt-get.8.xml:171

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


@@ -2863,7 +3079,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:203
+#: apt-get.8.xml:189

 msgid ""
 "A specific version of a package can be selected for installation by "
 "following the package name with an equals and the version of the package to "
 msgid ""
 "A specific version of a package can be selected for installation by "
 "following the package name with an equals and the version of the package to "


@@ -2874,14 +3090,14 @@ 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:210
+#: apt-get.8.xml:196

 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:213
+#: apt-get.8.xml:199

 msgid ""
 "This is also the target to use if you want to upgrade one or more already-"
 "installed packages without upgrading every package you have on your system. "
 msgid ""
 "This is also the target to use if you want to upgrade one or more already-"
 "installed packages without upgrading every package you have on your system. "


@@ -2893,14 +3109,14 @@ 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:224
+#: apt-get.8.xml:210

 msgid ""
 "Finally, the &apt-preferences; mechanism allows you to create an alternative "
 "installation policy for individual packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid ""
 "Finally, the &apt-preferences; mechanism allows you to create an alternative "
 "installation policy for individual packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:228
+#: apt-get.8.xml:214

 msgid ""
 "If no package matches the given expression and the expression contains one "
 "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
 msgid ""
 "If no package matches the given expression and the expression contains one "
 "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "


@@ -2912,12 +3128,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-get.8.xml:237
+#: apt-get.8.xml:223

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

-#: apt-get.8.xml:238
+#: apt-get.8.xml:224

 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note the removing a package "
 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note the removing a package "


@@ -2927,12 +3143,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-get.8.xml:245
+#: apt-get.8.xml:231

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

-#: apt-get.8.xml:246
+#: apt-get.8.xml:232

 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "


@@ -2940,12 +3156,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-get.8.xml:250
+#: apt-get.8.xml:236

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

-#: apt-get.8.xml:251
+#: apt-get.8.xml:237

 msgid ""
 "<literal>source</literal> causes <command>apt-get</command> to fetch source "
 "packages. APT will examine the available packages to decide which source "
 msgid ""
 "<literal>source</literal> causes <command>apt-get</command> to fetch source "
 "packages. APT will examine the available packages to decide which source "


@@ -2957,7 +3173,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:259
+#: apt-get.8.xml:245

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


@@ -2967,7 +3183,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:266
+#: apt-get.8.xml:252

 msgid ""
 "If the <option>--compile</option> option is specified then the package will "
 "be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "
 msgid ""
 "If the <option>--compile</option> option is specified then the package will "
 "be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if "


@@ -2976,7 +3192,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:271
+#: apt-get.8.xml:257

 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 "


@@ -2986,7 +3202,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:277
+#: apt-get.8.xml:263

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


@@ -2994,31 +3210,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-get.8.xml:282
+#: apt-get.8.xml:268

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

-#: apt-get.8.xml:283
+#: apt-get.8.xml:269

 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
 "attempt to satisfy the build dependencies for a source package."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
 "attempt to satisfy the build dependencies for a source package."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-get.8.xml:287
+#: apt-get.8.xml:273

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

-#: apt-get.8.xml:288
+#: apt-get.8.xml:274

 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

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

 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 "


@@ -3030,12 +3246,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-get.8.xml:302
+#: apt-get.8.xml:288

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

-#: apt-get.8.xml:303
+#: apt-get.8.xml:289

 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 "


@@ -3047,12 +3263,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-get.8.xml:312
+#: apt-get.8.xml:298

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

-#: apt-get.8.xml:313
+#: apt-get.8.xml:299

 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for some package and that "
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for some package and that "


@@ -3060,62 +3276,62 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-get.8.xml:323 apt-get.8.xml:429
+#: apt-get.8.xml:309 apt-get.8.xml:415

 msgid "<option>--no-install-recommends</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<option>--no-install-recommends</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:324
+#: apt-get.8.xml:310

 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>
 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:328
+#: apt-get.8.xml:314

 msgid "<option>--download-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<option>--download-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:329
+#: apt-get.8.xml:315

 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>
 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:333
+#: apt-get.8.xml:319

 msgid "<option>--fix-broken</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<option>--fix-broken</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:334
+#: apt-get.8.xml:320

 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 "

-"to deduce a likely solution. Any Package that are specified must completely "
-"correct the problem. The option is sometimes necessary when running APT for "
-"the first time; APT itself does not allow broken package dependencies to "
-"exist on a system. It is possible that a system's dependency structure can "
-"be so corrupt as to require manual intervention (which usually means using "
-"&dselect; or <command>dpkg --remove</command> to eliminate some of the "
-"offending packages). Use of this option together with <option>-m</option> "
-"may produce an error in some situations.  Configuration Item: <literal>APT::"
-"Get::Fix-Broken</literal>."
+"to deduce a likely solution. If packages are specified, these have to "
+"completely correct the problem. The option is sometimes necessary when "
+"running APT for the first time; APT itself does not allow broken package "
+"dependencies to exist on a system. It is possible that a system's dependency "
+"structure can be so corrupt as to require manual intervention (which usually "
+"means using &dselect; or <command>dpkg --remove</command> to eliminate some "
+"of the offending packages). Use of this option together with <option>-m</"
+"option> may produce an error in some situations.  Configuration Item: "
+"<literal>APT::Get::Fix-Broken</literal>."

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

-#: apt-get.8.xml:347
+#: apt-get.8.xml:333

 msgid "<option>--ignore-missing</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid "<option>--ignore-missing</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-get.8.xml:348
+#: apt-get.8.xml:334

 msgid "<option>--fix-missing</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<option>--fix-missing</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:349
+#: apt-get.8.xml:335

 msgid ""
 "Ignore missing packages; If packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
 msgid ""
 "Ignore missing packages; If packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "


@@ -3127,12 +3343,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-get.8.xml:359
+#: apt-get.8.xml:345

 msgid "<option>--no-download</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<option>--no-download</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:360
+#: apt-get.8.xml:346

 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 "


@@ -3140,7 +3356,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:367
+#: apt-get.8.xml:353

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


@@ -3152,17 +3368,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-get.8.xml:377
+#: apt-get.8.xml:363

 msgid "<option>--simulate</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid "<option>--simulate</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-get.8.xml:379
+#: apt-get.8.xml:365

 msgid "<option>--dry-run</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<option>--dry-run</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:382
+#: apt-get.8.xml:368

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


@@ -3170,7 +3386,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:386
+#: apt-get.8.xml:372

 msgid ""
 "Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
 "literal>)  automatic. Also a notice will be displayed indicating that this "
 msgid ""
 "Simulation run as user will deactivate locking (<literal>Debug::NoLocking</"
 "literal>)  automatic. Also a notice will be displayed indicating that this "


@@ -3181,7 +3397,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:392
+#: apt-get.8.xml:378

 msgid ""
 "Simulate prints out a series of lines each one representing a dpkg "
 "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
 msgid ""
 "Simulate prints out a series of lines each one representing a dpkg "
 "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "


@@ -3190,22 +3406,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-get.8.xml:399
+#: apt-get.8.xml:385

 msgid "<option>-y</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid "<option>-y</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-get.8.xml:399
+#: apt-get.8.xml:385

 msgid "<option>--yes</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid "<option>--yes</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-get.8.xml:400
+#: apt-get.8.xml:386

 msgid "<option>--assume-yes</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<option>--assume-yes</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:401
+#: apt-get.8.xml:387

 msgid ""
 "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
 "non-interactively. If an undesirable situation, such as changing a held "
 msgid ""
 "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
 "non-interactively. If an undesirable situation, such as changing a held "


@@ -3215,83 +3431,83 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-get.8.xml:408
+#: apt-get.8.xml:394

 msgid "<option>-u</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid "<option>-u</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-get.8.xml:408
+#: apt-get.8.xml:394

 msgid "<option>--show-upgraded</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<option>--show-upgraded</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:409
+#: apt-get.8.xml:395

 msgid ""
 "Show upgraded packages; Print out a list of all packages that are to be "
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid ""
 "Show upgraded packages; Print out a list of all packages that are to be "
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-get.8.xml:414
+#: apt-get.8.xml:400

 msgid "<option>-V</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid "<option>-V</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-get.8.xml:414
+#: apt-get.8.xml:400

 msgid "<option>--verbose-versions</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<option>--verbose-versions</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:415
+#: apt-get.8.xml:401

 msgid ""
 "Show full versions for upgraded and installed packages.  Configuration Item: "
 "<literal>APT::Get::Show-Versions</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid ""
 "Show full versions for upgraded and installed packages.  Configuration Item: "
 "<literal>APT::Get::Show-Versions</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-get.8.xml:419
+#: apt-get.8.xml:405

 msgid "<option>-b</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid "<option>-b</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-get.8.xml:419
+#: apt-get.8.xml:405

 msgid "<option>--compile</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid "<option>--compile</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-get.8.xml:420
+#: apt-get.8.xml:406

 msgid "<option>--build</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<option>--build</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:421
+#: apt-get.8.xml:407

 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-get.8.xml:425
+#: apt-get.8.xml:411

 msgid "<option>--install-recommends</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<option>--install-recommends</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:426
+#: apt-get.8.xml:412

 msgid "Also install recommended packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "Also install recommended packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:430
+#: apt-get.8.xml:416

 msgid "Do not install recommended packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid "Do not install recommended packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-get.8.xml:433
+#: apt-get.8.xml:419

 msgid "<option>--ignore-hold</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<option>--ignore-hold</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:434
+#: apt-get.8.xml:420

 msgid ""
 "Ignore package Holds; This causes <command>apt-get</command> to ignore a "
 "hold placed on a package. This may be useful in conjunction with "
 msgid ""
 "Ignore package Holds; This causes <command>apt-get</command> to ignore a "
 "hold placed on a package. This may be useful in conjunction with "


@@ -3300,12 +3516,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-get.8.xml:440
+#: apt-get.8.xml:426

 msgid "<option>--no-upgrade</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<option>--no-upgrade</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:441
+#: apt-get.8.xml:427

 msgid ""
 "Do not upgrade packages; When used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "
 msgid ""
 "Do not upgrade packages; When used in conjunction with <literal>install</"
 "literal>, <literal>no-upgrade</literal> will prevent packages on the command "


@@ -3314,27 +3530,41 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-get.8.xml:447
-msgid "<option>--force-yes</option>"
+#: apt-get.8.xml:433
+msgid "<option>--only-upgrade</option>"

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

-#: apt-get.8.xml:448
+#: apt-get.8.xml:434

 msgid ""
 msgid ""

-"Force yes; This is a dangerous option that will cause apt to continue "
-"without prompting if it is doing something potentially harmful. It should "
-"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>."
+"Do not install new packages; When used in conjunction with <literal>install</"
+"literal>, <literal>only-upgrade</literal> will prevent packages on the "
+"command line from being upgraded if they are not already installed.  "
+"Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."

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

-#: apt-get.8.xml:455
+#: apt-get.8.xml:440
+msgid "<option>--force-yes</option>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:441
+msgid ""
+"Force yes; This is a dangerous option that will cause apt to continue "
+"without prompting if it is doing something potentially harmful. It should "
+"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:448

 msgid "<option>--print-uris</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<option>--print-uris</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:456
+#: apt-get.8.xml:449

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


@@ -3347,38 +3577,38 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

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

 msgid "<option>--purge</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<option>--purge</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:467
+#: apt-get.8.xml:460

 msgid ""
 "Use purge instead of remove for anything that would be removed.  An asterisk "
 "(\"*\") will be displayed next to packages which are scheduled to be purged. "
 msgid ""
 "Use purge instead of remove for anything that would be removed.  An asterisk "
 "(\"*\") will be displayed next to packages which are scheduled to be purged. "

-"<option>remove --purge</option> is equivalent for <option>purge</option> "
+"<option>remove --purge</option> is equivalent to the <option>purge</option> "

 "command.  Configuration Item: <literal>APT::Get::Purge</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 "command.  Configuration Item: <literal>APT::Get::Purge</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-get.8.xml:474
+#: apt-get.8.xml:467

 msgid "<option>--reinstall</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<option>--reinstall</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:475
+#: apt-get.8.xml:468

 msgid ""
 "Re-Install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid ""
 "Re-Install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

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

 msgid "<option>--list-cleanup</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<option>--list-cleanup</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

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

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


@@ -3389,17 +3619,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-get.8.xml:489
+#: apt-get.8.xml:482

 msgid "<option>--target-release</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid "<option>--target-release</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-get.8.xml:490
+#: apt-get.8.xml:483

 msgid "<option>--default-release</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<option>--default-release</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:491
+#: apt-get.8.xml:484

 msgid ""
 "This option controls the default input to the policy engine, it creates a "
 "default pin at priority 990 using the specified release string.  This "
 msgid ""
 "This option controls the default input to the policy engine, it creates a "
 "default pin at priority 990 using the specified release string.  This "


@@ -3413,12 +3643,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

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

 msgid "<option>--trivial-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<option>--trivial-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:506
+#: apt-get.8.xml:499

 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>, where <option>--assume-yes</"
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>, where <option>--assume-yes</"


@@ -3427,24 +3657,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-get.8.xml:512
+#: apt-get.8.xml:505

 msgid "<option>--no-remove</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<option>--no-remove</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:513
+#: apt-get.8.xml:506

 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>
 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:518
+#: apt-get.8.xml:511

 msgid "<option>--auto-remove</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<option>--auto-remove</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:519
+#: apt-get.8.xml:512

 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running <literal>autoremove</literal> "
 msgid ""
 "If the command is either <literal>install</literal> or <literal>remove</"
 "literal>, then this option acts like running <literal>autoremove</literal> "


@@ -3453,12 +3683,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-get.8.xml:525
+#: apt-get.8.xml:518

 msgid "<option>--only-source</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<option>--only-source</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:526
+#: apt-get.8.xml:519

 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 "


@@ -3470,22 +3700,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

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

 msgid "<option>--diff-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid "<option>--diff-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

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

 msgid "<option>--dsc-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid "<option>--dsc-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

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

 msgid "<option>--tar-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<option>--tar-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

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

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


@@ -3493,24 +3723,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

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

 msgid "<option>--arch-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<option>--arch-only</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

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

 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 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:547
+#: apt-get.8.xml:540

 msgid "<option>--allow-unauthenticated</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<option>--allow-unauthenticated</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:548
+#: apt-get.8.xml:541

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


@@ -3518,14 +3748,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>

-#: apt-get.8.xml:561
+#: apt-get.8.xml:554

 msgid ""
 "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
 "&file-statelists;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgid ""
 "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
 "&file-statelists;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-get.8.xml:570
+#: apt-get.8.xml:563

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


@@ -3533,29 +3763,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-get.8.xml:576
+#: apt-get.8.xml:569

 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 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:579
+#: apt-get.8.xml:572

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

-#: apt-get.8.xml:580
+#: apt-get.8.xml:573

 msgid "&apt-author.jgunthorpe;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 msgid "&apt-author.jgunthorpe;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt-get.8.xml:583
+#: apt-get.8.xml:576

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

-#: apt-get.8.xml:585
+#: apt-get.8.xml:578

 msgid "&apt-author.team;"
 msgstr ""
 
 msgid "&apt-author.team;"
 msgstr ""
 


@@ -3573,13 +3803,14 @@ msgstr ""
 #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
 #: apt-key.8.xml:28
 msgid ""
 #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
 #: apt-key.8.xml:28
 msgid ""

-"<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> "
+"<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
+"replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "

 "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></"
 "arg>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></"
 "arg>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-key.8.xml:36
+#: apt-key.8.xml:37

 msgid ""
 "<command>apt-key</command> is used to manage the list of keys used by apt to "
 "authenticate packages.  Packages which have been authenticated using these "
 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 "


@@ -3587,17 +3818,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt-key.8.xml:42
+#: apt-key.8.xml:43

 msgid "Commands"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid "Commands"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

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

 msgid "add <replaceable>filename</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "add <replaceable>filename</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-key.8.xml:48
+#: apt-key.8.xml:49

 msgid ""
 "Add a new key to the list of trusted keys.  The key is read from "
 "<replaceable>filename</replaceable>, or standard input if "
 msgid ""
 "Add a new key to the list of trusted keys.  The key is read from "
 "<replaceable>filename</replaceable>, or standard input if "


@@ -3605,117 +3836,135 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-key.8.xml:56
+#: apt-key.8.xml:57

 msgid "del <replaceable>keyid</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "del <replaceable>keyid</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-key.8.xml:60
+#: apt-key.8.xml:61

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

-#: apt-key.8.xml:67
+#: apt-key.8.xml:68

 msgid "export <replaceable>keyid</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "export <replaceable>keyid</replaceable>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-key.8.xml:71
+#: apt-key.8.xml:72

 msgid "Output the key <replaceable>keyid</replaceable> to standard output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid "Output the key <replaceable>keyid</replaceable> to standard output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-key.8.xml:78
+#: apt-key.8.xml:79

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

-#: apt-key.8.xml:82
+#: apt-key.8.xml:83

 msgid "Output all trusted keys to standard output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid "Output all trusted keys to standard output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-key.8.xml:89
+#: apt-key.8.xml:90

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

-#: apt-key.8.xml:93
+#: apt-key.8.xml:94

 msgid "List trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid "List trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-key.8.xml:100
+#: apt-key.8.xml:101

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

-#: apt-key.8.xml:104
+#: apt-key.8.xml:105

 msgid "List fingerprints of trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid "List fingerprints of trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-key.8.xml:111
+#: apt-key.8.xml:112

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

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

 msgid ""
 "Pass advanced options to gpg. With adv --recv-key you can download the "
 "public key."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid ""
 "Pass advanced options to gpg. With adv --recv-key you can download the "
 "public key."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-key.8.xml:127
+#: apt-key.8.xml:128

 msgid ""
 "Update the local keyring with the keyring of Debian archive keys and removes "
 "from the keyring the archive keys which are no longer valid."
 msgstr ""
 
 msgid ""
 "Update the local keyring with the keyring of Debian archive keys and removes "
 "from the keyring the archive keys which are no longer valid."
 msgstr ""
 

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

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

-msgid "<filename>/etc/apt/trusted.gpg</filename>"
+msgid ""
+"Note that options need to be defined before the commands described in the "
+"previous section."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-key.8.xml:142
+msgid "--keyring <replaceable>filename</replaceable>"

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

-#: apt-key.8.xml:141
-msgid "Keyring of local trusted keys, new keys will be added here."
+#: apt-key.8.xml:143
+msgid ""
+"With this option it is possible to specify a specific keyring file the "
+"command should operate on. The default is that a command is executed on the "
+"<filename>trusted.gpg</filename> file as well as on all parts in the "
+"<filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</"
+"filename> is the primary keyring which means that e.g. new keys are added to "
+"this one."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist>
+#: apt-key.8.xml:156
+msgid "&file-trustedgpg;"

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

-#: apt-key.8.xml:144
+#: apt-key.8.xml:158

 msgid "<filename>/etc/apt/trustdb.gpg</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<filename>/etc/apt/trustdb.gpg</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-key.8.xml:145
+#: apt-key.8.xml:159

 msgid "Local trust database of archive keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid "Local trust database of archive keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-key.8.xml:148
+#: apt-key.8.xml:162

 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-key.8.xml:149
+#: apt-key.8.xml:163

 msgid "Keyring of Debian archive trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid "Keyring of Debian archive trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-key.8.xml:152
+#: apt-key.8.xml:166

 msgid ""
 "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid ""
 "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-key.8.xml:153
+#: apt-key.8.xml:167

 msgid "Keyring of Debian archive removed trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "Keyring of Debian archive removed trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-key.8.xml:164
+#: apt-key.8.xml:176

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


@@ -3855,26 +4104,18 @@ msgstr ""
 msgid "Show the program version."
 msgstr ""
 
 msgid "Show the program version."
 msgstr ""
 

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

 #: apt-mark.8.xml:124
 #: apt-mark.8.xml:124

-msgid "<filename>/var/lib/apt/extended_states</filename>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:125
-msgid ""
-"Status list of auto-installed packages.  Configuration Item: <literal>Dir::"
-"State</literal> sets the path to the <filename>extended_states</filename> "
-"file."
+msgid "  &file-extended_states;"

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

-#: apt-mark.8.xml:134
+#: apt-mark.8.xml:129

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

-#: apt-mark.8.xml:138
+#: apt-mark.8.xml:133

 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."


@@ -4164,7 +4405,7 @@ msgid ""
 "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
 "firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
 "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; "
 "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
 "firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
 "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; "

-"&apt-product; <date>18 September 2009</date>"
+"&apt-product; <date>16 January 2010</date>"

 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refname>
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refname>


@@ -4186,18 +4427,54 @@ msgstr ""
 #: apt.conf.5.xml:40
 msgid ""
 "<filename>apt.conf</filename> is the main configuration file for the APT "
 #: apt.conf.5.xml:40
 msgid ""
 "<filename>apt.conf</filename> is the main configuration file for the APT "

-"suite of tools, all tools make use of the configuration file and a common "
-"command line parser to provide a uniform environment. When an APT tool "
-"starts up it will read the configuration specified by the <envar>APT_CONFIG</"
-"envar> environment variable (if any) and then read the files in "
-"<literal>Dir::Etc::Parts</literal> then read the main configuration file "
-"specified by <literal>Dir::Etc::main</literal> then finally apply the "
-"command line options to override the configuration directives, possibly "
-"loading even more config files."
+"suite of tools, but by far not the only place changes to options can be "
+"made. All tools therefore share the configuration files and also use a "
+"common command line parser to provide a uniform environment."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><para>
+#: apt.conf.5.xml:45
+msgid ""
+"When an APT tool starts up it will read the configuration files in the "
+"following order:"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:47
+msgid ""
+"the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
+"any)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:49
+msgid ""
+"all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
+"order which have no or \"<literal>conf</literal>\" as filename extension and "
+"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
+"characters - otherwise they will be silently ignored."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:54
+msgid ""
+"the main configuration file specified by <literal>Dir::Etc::main</literal>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml:56
+msgid ""
+"the command line options are applied to override the configuration "
+"directives or to load even more configuration files."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.conf.5.xml:60
+msgid "Syntax"

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

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

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


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

-#: apt.conf.5.xml:56
+#: apt.conf.5.xml:67

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


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

-#: apt.conf.5.xml:70
+#: apt.conf.5.xml:81

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


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

-#: apt.conf.5.xml:78
+#: apt.conf.5.xml:89

 msgid ""
 "with newlines placed to make it more readable. Lists can be created by "
 "opening a scope and including a single string enclosed in quotes followed by "
 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 "


@@ -4243,27 +4520,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>

-#: apt.conf.5.xml:83
+#: apt.conf.5.xml:94

 #, no-wrap
 msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #, no-wrap
 msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

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

 msgid ""
 "In general the sample configuration file in <filename>&docdir;examples/apt."
 "conf</filename> &configureindex; is a good guide for how it should look."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgid ""
 "In general the sample configuration file in <filename>&docdir;examples/apt."
 "conf</filename> &configureindex; is a good guide for how it should look."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:90
+#: apt.conf.5.xml:101

 msgid ""
 "The names of the configuration items are not case-sensitive. So in the "
 "previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgid ""
 "The names of the configuration items are not case-sensitive. So in the "
 "previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:93
+#: apt.conf.5.xml:104

 msgid ""
 "Names for the configuration items are optional if a list is defined as it "
 "can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. "
 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. "


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

-#: apt.conf.5.xml:98
+#: apt.conf.5.xml:109

 msgid ""
 "Two specials are allowed, <literal>#include</literal> (which is deprecated "
 "and not supported by alternative implementations) and <literal>#clear</"
 msgid ""
 "Two specials are allowed, <literal>#include</literal> (which is deprecated "
 "and not supported by alternative implementations) and <literal>#clear</"


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

-#: apt.conf.5.xml:106
+#: apt.conf.5.xml:117

 msgid ""
 "The #clear command is the only way to delete a list or a complete scope.  "
 "Reopening a scope or the ::-style described below will <emphasis>not</"
 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</"


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

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

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


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

-#: apt.conf.5.xml:118
+#: apt.conf.5.xml:129

 msgid ""
 "Note that you can use :: only for appending one item per line to a list and "
 "that you should not use it in combination with the scope syntax.  (The scope "
 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 "


@@ -4323,24 +4600,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt.conf.5.xml:130
+#: apt.conf.5.xml:141

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

-#: apt.conf.5.xml:131
+#: apt.conf.5.xml:142

 msgid ""
 "This group of options controls general APT behavior as well as holding the "
 "options for all of the tools."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid ""
 "This group of options controls general APT behavior as well as holding the "
 "options for all of the tools."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

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

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

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

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


@@ -4348,38 +4625,38 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

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

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

-#: apt.conf.5.xml:142
+#: apt.conf.5.xml:153

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

-"'testing', 'unstable', 'lenny', 'squeeze', '4.0', '5.0*'. See also &apt-"
-"preferences;."
+"'testing', 'unstable', '&stable-codename;', '&testing-codename;', '4.0', "
+"'5.0*'. See also &apt-preferences;."

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

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

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

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

 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>
 msgid ""
 "Ignore Held packages; This global option causes the problem resolver to "
 "ignore held packages in its decision making."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

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

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

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

 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 "


@@ -4388,12 +4665,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

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

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

-#: apt.conf.5.xml:159
+#: apt.conf.5.xml:171

 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 "


@@ -4409,13 +4686,13 @@ msgid ""
 "dependencies which can generate a problem if the dependencies e.g. form a "
 "circle as a dependency with the immediate flag is comparable with a Pre-"
 "Dependency. So in theory it is possible that APT encounters a situation in "
 "dependencies which can generate a problem if the dependencies e.g. form a "
 "circle as a dependency with the immediate flag is comparable with a Pre-"
 "Dependency. So in theory it is possible that APT encounters a situation in "

-"which it is unable to perform immediate configuration, error out and refers "
+"which it is unable to perform immediate configuration, errors out and refers "

 "to this option so the user can deactivate the immediate configuration "
 "to this option so the user can deactivate the immediate configuration "

-"temporary to be able to perform an install/upgrade again. Note the use of "
+"temporarily to be able to perform an install/upgrade again. Note the use of "

 "the word \"theory\" here as this problem was only encountered by now in real "
 "the word \"theory\" here as this problem was only encountered by now in real "

-"world a few times in non-stable distribution versions and caused by wrong "
-"dependencies of the package in question or by a system in an already broken "
-"state, so you should not blindly disable this option as the mentioned "
+"world a few times in non-stable distribution versions and was caused by "
+"wrong dependencies of the package in question or by a system in an already "
+"broken state, so you should not blindly disable this option as the mentioned "

 "scenario above is not the only problem immediate configuration can help to "
 "prevent in the first place.  Before a big operation like <literal>dist-"
 "upgrade</literal> is run with this option disabled it should be tried to "
 "scenario above is not the only problem immediate configuration can help to "
 "prevent in the first place.  Before a big operation like <literal>dist-"
 "upgrade</literal> is run with this option disabled it should be tried to "


@@ -4426,12 +4703,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt.conf.5.xml:181
+#: apt.conf.5.xml:193

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

-#: apt.conf.5.xml:182
+#: apt.conf.5.xml:194

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


@@ -4442,87 +4719,147 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt.conf.5.xml:190
-msgid "Cache-Limit"
+#: apt.conf.5.xml:202
+msgid "Cache-Start, Cache-Grow and Cache-Limit"

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

-#: apt.conf.5.xml:191
+#: apt.conf.5.xml:203

 msgid ""
 msgid ""

-"APT uses a fixed size memory mapped cache file to store the 'available' "
-"information. This sets the size of that cache (in bytes)."
+"APT uses since version 0.7.26 a resizable memory mapped cache file to store "
+"the 'available' information. <literal>Cache-Start</literal> acts as a hint "
+"to which size the Cache will grow and is therefore the amount of memory APT "
+"will request at startup. The default value is 20971520 bytes (~20 MB). Note "
+"that these amount of space need to be available for APT otherwise it will "
+"likely fail ungracefully, so for memory restricted devices these value "
+"should be lowered while on systems with a lot of configured sources this "
+"might be increased.  <literal>Cache-Grow</literal> defines in byte with the "
+"default of 1048576 (~1 MB) how much the Cache size will be increased in the "
+"event the space defined by <literal>Cache-Start</literal> is not enough. "
+"These value will be applied again and again until either the cache is big "
+"enough to store all information or the size of the cache reaches the "
+"<literal>Cache-Limit</literal>.  The default of <literal>Cache-Limit</"
+"literal> is 0 which stands for no limit.  If <literal>Cache-Grow</literal> "
+"is set to 0 the automatic grow of the cache is disabled."

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

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

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

-#: apt.conf.5.xml:196
+#: apt.conf.5.xml:219

 msgid "Defines which package(s) are considered essential build dependencies."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid "Defines which package(s) are considered essential build dependencies."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt.conf.5.xml:199
+#: apt.conf.5.xml:222

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

-#: apt.conf.5.xml:200
+#: apt.conf.5.xml:223

 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>
 msgid ""
 "The Get subsection controls the &apt-get; tool, please see its documentation "
 "for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt.conf.5.xml:204
+#: apt.conf.5.xml:227

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

-#: apt.conf.5.xml:205
+#: apt.conf.5.xml:228

 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>
 msgid ""
 "The Cache subsection controls the &apt-cache; tool, please see its "
 "documentation for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

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

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

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

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

 msgid "The Acquire Group"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 msgid "The Acquire Group"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>

-#: apt.conf.5.xml:221
+#: apt.conf.5.xml:244
+msgid "Check-Valid-Until"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:245
+msgid ""
+"Security related option defaulting to true as an expiring validation for a "
+"Release file prevents longtime replay attacks and can e.g. also help users "
+"to identify no longer updated mirrors - but the feature depends on the "
+"correctness of the time on the user system.  Archive maintainers are "
+"encouraged to create Release files with the <literal>Valid-Until</literal> "
+"header, but if they don't or a stricter value is volitional the following "
+"<literal>Max-ValidTime</literal> option can be used."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: apt.conf.5.xml:255
+msgid "Max-ValidTime"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:256
+msgid ""
+"Seconds the Release file should be considered valid after it was created. "
+"The default is \"for ever\" (0) if the Release file of the archive doesn't "
+"include a <literal>Valid-Until</literal> header.  If it does then this date "
+"is the default. The date from the Release file or the date specified by the "
+"creation time of the Release file (<literal>Date</literal> header) plus the "
+"seconds specified with this options are used to check if the validation of a "
+"file has expired by using the earlier date of the two. Archive specific "
+"settings can be made by appending the label of the archive to the option "
+"name."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: apt.conf.5.xml:268

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

-#: apt.conf.5.xml:222
+#: apt.conf.5.xml:269

 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for Packages or "
 "Sources files instead of downloading whole ones. True by default."
 msgstr ""
 
 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:272
+msgid ""
+"Two sub-options to limit the use of PDiffs are also available: With "
+"<literal>FileLimit</literal> can be specified how many PDiff files are "
+"downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
+"other hand is the maximum precentage of the size of all patches compared to "
+"the size of the targeted file. If one of these limits is exceeded the "
+"complete file is downloaded instead of the patches."
+msgstr ""
+

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

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

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

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

 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 "


@@ -4532,36 +4869,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>

-#: apt.conf.5.xml:235
+#: apt.conf.5.xml:289

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

-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:290

 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>
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>

-#: apt.conf.5.xml:240
+#: apt.conf.5.xml:294

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

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

 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>
 msgid ""
 "Use symlinks for source archives. If set to true then source archives will "
 "be symlinked when possible instead of copying. True is the default."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>

-#: apt.conf.5.xml:245 sources.list.5.xml:139
+#: apt.conf.5.xml:299 sources.list.5.xml:139

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

-#: apt.conf.5.xml:246
+#: apt.conf.5.xml:300

 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 "


@@ -4572,7 +4909,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:254
+#: apt.conf.5.xml:308

 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 "


@@ -4586,7 +4923,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:264 apt.conf.5.xml:321
+#: apt.conf.5.xml:318 apt.conf.5.xml:382

 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 "


@@ -4594,7 +4931,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:267
+#: apt.conf.5.xml:321

 msgid ""
 "One setting is provided to control the pipeline depth in cases where the "
 "remote server is not RFC conforming or buggy (such as Squid 2.0.2).  "
 msgid ""
 "One setting is provided to control the pipeline depth in cases where the "
 "remote server is not RFC conforming or buggy (such as Squid 2.0.2).  "


@@ -4606,7 +4943,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:275
+#: apt.conf.5.xml:329

 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 "


@@ -4615,21 +4952,31 @@ msgid ""
 "multiple servers at the same time.)"
 msgstr ""
 
 "multiple servers at the same time.)"
 msgstr ""
 

+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:334
+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>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>

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

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

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

 msgid ""
 msgid ""

-"HTTPS URIs. Cache-control and proxy options are the same as for "
-"<literal>http</literal> method.  <literal>Pipeline-Depth</literal> option is "
+"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
+"options are the same as for <literal>http</literal> method and will also "
+"default to the options from the <literal>http</literal> method if they are "
+"not explicitly set for https. <literal>Pipeline-Depth</literal> option is "

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

-#: apt.conf.5.xml:286
+#: apt.conf.5.xml:347

 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 "


@@ -4650,12 +4997,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>

-#: apt.conf.5.xml:304 sources.list.5.xml:150
+#: apt.conf.5.xml:365 sources.list.5.xml:150

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

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

 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 "


@@ -4674,7 +5021,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:324
+#: apt.conf.5.xml:385

 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 "


@@ -4684,7 +5031,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:331
+#: apt.conf.5.xml:392

 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 "


@@ -4693,7 +5040,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:336
+#: apt.conf.5.xml:397

 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 "


@@ -4703,18 +5050,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>

-#: apt.conf.5.xml:343 sources.list.5.xml:132
+#: apt.conf.5.xml:404 sources.list.5.xml:132

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

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

 #, 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:344
+#: apt.conf.5.xml:405

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


@@ -4727,12 +5074,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>

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

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

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

 msgid ""
 "GPGV URIs; the only option for GPGV URIs is the option to pass additional "
 "parameters to gpgv.  <literal>gpgv::Options</literal> Additional options "
 msgid ""
 "GPGV URIs; the only option for GPGV URIs is the option to pass additional "
 "parameters to gpgv.  <literal>gpgv::Options</literal> Additional options "


@@ -4740,18 +5087,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>

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

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

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

 #, 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:361
+#: apt.conf.5.xml:422

 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 "


@@ -4763,19 +5110,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:371
+#: apt.conf.5.xml:432

 #, 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:374
+#: apt.conf.5.xml:435

 #, 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:367
+#: apt.conf.5.xml:428

 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 "


@@ -4792,13 +5139,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:378
+#: apt.conf.5.xml:439

 #, 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:376
+#: apt.conf.5.xml:437

 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 "


@@ -4813,7 +5160,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:383
+#: apt.conf.5.xml:444

 msgid ""
 "While it is possible to add an empty compression type to the order list, but "
 "APT in its current version doesn't understand it correctly and will display "
 msgid ""
 "While it is possible to add an empty compression type to the order list, but "
 "APT in its current version doesn't understand it correctly and will display "


@@ -4822,20 +5169,81 @@ msgid ""
 "prefer uncompressed files to support the usage of local mirrors."
 msgstr ""
 
 "prefer uncompressed files to support the usage of local mirrors."
 msgstr ""
 

+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: apt.conf.5.xml:450
+msgid "GzipIndexes"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:452
+msgid ""
+"When downloading <literal>gzip</literal> compressed indexes (Packages, "
+"Sources, or Translations), keep them gzip compressed locally instead of "
+"unpacking them. This saves quite a lot of disk space at the expense of more "
+"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:459
+msgid "Languages"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:460
+msgid ""
+"The Languages subsection controls which <filename>Translation</filename> "
+"files are downloaded and in which order APT tries to display the Description-"
+"Translations. APT will try to display the first available Description in the "
+"Language which is listed at first. Languages can be defined with their short "
+"or long Languagecodes. Note that not all archives provide "
+"<filename>Translation</filename> files for every Language - especially the "
+"long Languagecodes are rare, so please inform you which ones are available "
+"before you set here impossible values."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
+#: apt.conf.5.xml:476
+#, 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:466
+msgid ""
+"The default list includes \"environment\" and \"en\". "
+"\"<literal>environment</literal>\" has a special meaning here: It will be "
+"replaced at runtime with the languagecodes extracted from the "
+"<literal>LC_MESSAGES</literal> environment variable.  It will also ensure "
+"that these codes are not included twice in the list. If "
+"<literal>LC_MESSAGES</literal> is set to \"C\" only the "
+"<filename>Translation-en</filename> file (if available) will be used.  To "
+"force apt to use no Translation file use the setting <literal>Acquire::"
+"Languages=none</literal>. \"<literal>none</literal>\" is another special "
+"meaning code which will stop the search for a fitting <filename>Translation</"
+"filename> file.  This can be used by the system administrator to let APT "
+"know that it should download also this files without actually use them if "
+"the environment doesn't specify this languages. So the following example "
+"configuration will result in the order \"en, de\" in an english and in \"de, "
+"en\" in a german localization. Note that \"fr\" is downloaded, but not used "
+"if APT is not used in a french localization, in such an environment the "
+"order would be \"fr, de, en\".  <placeholder type=\"programlisting\" id="
+"\"0\"/>"
+msgstr ""
+

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

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

 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>
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages and the URI handlers.  <placeholder type=\"variablelist\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>

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

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

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

 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 "


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

-#: apt.conf.5.xml:401
+#: apt.conf.5.xml:492

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


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

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

 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 "


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

-#: apt.conf.5.xml:416
+#: apt.conf.5.xml:507

 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 "


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

-#: apt.conf.5.xml:420
+#: apt.conf.5.xml:511

 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 "


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

-#: apt.conf.5.xml:428
+#: apt.conf.5.xml:519

 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 "


@@ -4901,14 +5309,25 @@ msgid ""
 "filename>."
 msgstr ""
 
 "filename>."
 msgstr ""
 

+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:532
+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 "
+"fragment directories. Per default a file which end with <literal>.disabled</"
+"literal>, <literal>~</literal>, <literal>.bak</literal> or <literal>.dpkg-[a-"
+"z]+</literal> is silently ignored. As seen in the last default value these "
+"patterns can use regular expression syntax."
+msgstr ""
+

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

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

 #, 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:443
+#: apt.conf.5.xml:543

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


@@ -4916,12 +5335,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt.conf.5.xml:447
+#: apt.conf.5.xml:547

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

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

 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 "


@@ -4932,50 +5351,50 @@ 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:457
+#: apt.conf.5.xml:557

 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>
 msgid ""
 "The contents of this variable is passed to &apt-get; as command line options "
 "when it is run for the install phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

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

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

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

 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>
 msgid ""
 "The contents of this variable is passed to &apt-get; as command line options "
 "when it is run for the update phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt.conf.5.xml:466
+#: apt.conf.5.xml:566

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

-#: apt.conf.5.xml:467
+#: apt.conf.5.xml:567

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

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

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

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


@@ -4983,17 +5402,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

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

 msgid "Pre-Invoke"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid "Pre-Invoke"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

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

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

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

 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 "


@@ -5002,12 +5421,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

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

 msgid "Pre-Install-Pkgs"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "Pre-Install-Pkgs"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

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

 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 "


@@ -5017,7 +5436,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:498
+#: apt.conf.5.xml:598

 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 "


@@ -5027,36 +5446,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt.conf.5.xml:505
+#: apt.conf.5.xml:605

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

-#: apt.conf.5.xml:506
+#: apt.conf.5.xml:606

 msgid ""
 "APT chdirs to this directory before invoking dpkg, the default is <filename>/"
 "</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid ""
 "APT chdirs to this directory before invoking dpkg, the default is <filename>/"
 "</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt.conf.5.xml:510
+#: apt.conf.5.xml:610

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

-#: apt.conf.5.xml:511
+#: apt.conf.5.xml:611

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

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

 msgid ""
 "APT can call dpkg in a way so it can make aggressive use of triggers over "
 "multiply calls of dpkg. Without further options dpkg will use triggers only "
 msgid ""
 "APT can call dpkg in a way so it can make aggressive use of triggers over "
 "multiply calls of dpkg. Without further options dpkg will use triggers only "


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

-#: apt.conf.5.xml:532
+#: apt.conf.5.xml:632

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


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

-#: apt.conf.5.xml:526
+#: apt.conf.5.xml:626

 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 "


@@ -5095,12 +5514,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>

-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:638

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

-#: apt.conf.5.xml:539
+#: apt.conf.5.xml:639

 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 "


@@ -5112,12 +5531,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>

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

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

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

 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 "


@@ -5133,12 +5552,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>

-#: apt.conf.5.xml:557
+#: apt.conf.5.xml:657

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

-#: apt.conf.5.xml:558
+#: apt.conf.5.xml:658

 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 "


@@ -5149,12 +5568,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>

-#: apt.conf.5.xml:564
+#: apt.conf.5.xml:664

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

-#: apt.conf.5.xml:565
+#: apt.conf.5.xml:665

 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 "


@@ -5164,12 +5583,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>

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

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

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

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


@@ -5181,12 +5600,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>

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

 msgid "OrderList::Score::Immediate"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
 msgid "OrderList::Score::Immediate"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>

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

 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"


@@ -5198,7 +5617,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:579
+#: apt.conf.5.xml:679

 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 "


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

-#: apt.conf.5.xml:599
+#: apt.conf.5.xml:699

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

 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 "


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

-#: apt.conf.5.xml:608
+#: apt.conf.5.xml:708

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

-#: apt.conf.5.xml:610
+#: apt.conf.5.xml:710

 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 "


@@ -5242,7 +5661,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:621
+#: apt.conf.5.xml:721

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


@@ -5250,7 +5669,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:629
+#: apt.conf.5.xml:729

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


@@ -5258,7 +5677,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:638
+#: apt.conf.5.xml:738

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


@@ -5268,111 +5687,111 @@ msgstr ""
 #.        motivating example, except I haven't a clue why you'd want
 #.        to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #.        motivating example, except I haven't a clue why you'd want
 #.        to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>

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

 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CDROM IDs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CDROM IDs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

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

 msgid "A full list of debugging options to apt follows."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid "A full list of debugging options to apt follows."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

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

 msgid "<literal>Debug::Acquire::cdrom</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<literal>Debug::Acquire::cdrom</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:665
+#: apt.conf.5.xml:765

 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt.conf.5.xml:672
+#: apt.conf.5.xml:772

 msgid "<literal>Debug::Acquire::ftp</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<literal>Debug::Acquire::ftp</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:676
+#: apt.conf.5.xml:776

 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt.conf.5.xml:683
+#: apt.conf.5.xml:783

 msgid "<literal>Debug::Acquire::http</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<literal>Debug::Acquire::http</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:687
+#: apt.conf.5.xml:787

 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt.conf.5.xml:694
+#: apt.conf.5.xml:794

 msgid "<literal>Debug::Acquire::https</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<literal>Debug::Acquire::https</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:698
+#: apt.conf.5.xml:798

 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt.conf.5.xml:705
+#: apt.conf.5.xml:805

 msgid "<literal>Debug::Acquire::gpgv</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<literal>Debug::Acquire::gpgv</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:709
+#: apt.conf.5.xml:809

 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt.conf.5.xml:716
+#: apt.conf.5.xml:816

 msgid "<literal>Debug::aptcdrom</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<literal>Debug::aptcdrom</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:720
+#: apt.conf.5.xml:820

 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt.conf.5.xml:727
+#: apt.conf.5.xml:827

 msgid "<literal>Debug::BuildDeps</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<literal>Debug::BuildDeps</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:730
+#: apt.conf.5.xml:830

 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt.conf.5.xml:737
+#: apt.conf.5.xml:837

 msgid "<literal>Debug::Hashes</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<literal>Debug::Hashes</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:740
+#: apt.conf.5.xml:840

 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt.conf.5.xml:747
+#: apt.conf.5.xml:847

 msgid "<literal>Debug::IdentCDROM</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<literal>Debug::IdentCDROM</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:750
+#: apt.conf.5.xml:850

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


@@ -5380,93 +5799,93 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:858

 msgid "<literal>Debug::NoLocking</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<literal>Debug::NoLocking</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:761
+#: apt.conf.5.xml:861

 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>
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt.conf.5.xml:769
+#: apt.conf.5.xml:869

 msgid "<literal>Debug::pkgAcquire</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<literal>Debug::pkgAcquire</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:773
+#: apt.conf.5.xml:873

 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt.conf.5.xml:780
+#: apt.conf.5.xml:880

 msgid "<literal>Debug::pkgAcquire::Auth</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<literal>Debug::pkgAcquire::Auth</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:783
+#: apt.conf.5.xml:883

 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>
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt.conf.5.xml:790
+#: apt.conf.5.xml:890

 msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:793
+#: apt.conf.5.xml:893

 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>
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:901

 msgid "<literal>Debug::pkgAcquire::RRed</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<literal>Debug::pkgAcquire::RRed</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:805
+#: apt.conf.5.xml:905

 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>
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt.conf.5.xml:812
+#: apt.conf.5.xml:912

 msgid "<literal>Debug::pkgAcquire::Worker</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<literal>Debug::pkgAcquire::Worker</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:816
+#: apt.conf.5.xml:916

 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt.conf.5.xml:823
+#: apt.conf.5.xml:923

 msgid "<literal>Debug::pkgAutoRemove</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<literal>Debug::pkgAutoRemove</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:827
+#: apt.conf.5.xml:927

 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>
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt.conf.5.xml:834
+#: apt.conf.5.xml:934

 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:837
+#: apt.conf.5.xml:937

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


@@ -5476,12 +5895,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt.conf.5.xml:848
+#: apt.conf.5.xml:948

 msgid "<literal>Debug::pkgDepCache::Marker</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<literal>Debug::pkgDepCache::Marker</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:851
+#: apt.conf.5.xml:951

 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 "


@@ -5498,91 +5917,91 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt.conf.5.xml:870
+#: apt.conf.5.xml:970

 msgid "<literal>Debug::pkgInitConfig</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<literal>Debug::pkgInitConfig</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:873
+#: apt.conf.5.xml:973

 msgid "Dump the default configuration to standard error on startup."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid "Dump the default configuration to standard error on startup."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt.conf.5.xml:880
+#: apt.conf.5.xml:980

 msgid "<literal>Debug::pkgDPkgPM</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<literal>Debug::pkgDPkgPM</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:883
+#: apt.conf.5.xml:983

 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>
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt.conf.5.xml:891
+#: apt.conf.5.xml:991

 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:894
+#: apt.conf.5.xml:994

 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>
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt.conf.5.xml:901
+#: apt.conf.5.xml:1001

 msgid "<literal>Debug::pkgOrderList</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<literal>Debug::pkgOrderList</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:905
+#: apt.conf.5.xml:1005

 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>
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt.conf.5.xml:913
+#: apt.conf.5.xml:1013

 msgid "<literal>Debug::pkgPackageManager</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<literal>Debug::pkgPackageManager</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:917
+#: apt.conf.5.xml:1017

 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt.conf.5.xml:924
+#: apt.conf.5.xml:1024

 msgid "<literal>Debug::pkgPolicy</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<literal>Debug::pkgPolicy</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:928
+#: apt.conf.5.xml:1028

 msgid "Output the priority of each package list on startup."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid "Output the priority of each package list on startup."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt.conf.5.xml:934
+#: apt.conf.5.xml:1034

 msgid "<literal>Debug::pkgProblemResolver</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<literal>Debug::pkgProblemResolver</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:938
+#: apt.conf.5.xml:1038

 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>
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt.conf.5.xml:946
+#: apt.conf.5.xml:1046

 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:949
+#: apt.conf.5.xml:1049

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


@@ -5590,39 +6009,40 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt.conf.5.xml:957
+#: apt.conf.5.xml:1057

 msgid "<literal>Debug::sourceList</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<literal>Debug::sourceList</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:961
+#: apt.conf.5.xml:1061

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

 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>

-#: apt.conf.5.xml:990
+#: apt.conf.5.xml:1091

 msgid "&file-aptconf;"
 msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
 msgid "&file-aptconf;"
 msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:995
+#: apt.conf.5.xml:1096

 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr ""
 
 #.  The last update date 
 #. type: Content of: <refentry><refentryinfo>
 #: apt_preferences.5.xml:13
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr ""
 
 #.  The last update date 
 #. type: Content of: <refentry><refentryinfo>
 #: apt_preferences.5.xml:13

-msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>"
+msgid ""
+"&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"

 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refname>
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refname>


@@ -5667,25 +6087,50 @@ msgid ""
 "choice of instance, only the choice of version."
 msgstr ""
 
 "choice of instance, only the choice of version."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><refsect2><title>
+#. type: Content of: <refentry><refsect1><para>

 #: apt_preferences.5.xml:56
 #: apt_preferences.5.xml:56

+msgid ""
+"Preferences are a strong power in the hands of a system administrator but "
+"they can become also their biggest nightmare if used without care! APT will "
+"not questioning the preferences so wrong settings will therefore lead to "
+"uninstallable packages or wrong decisions while upgrading packages.  Even "
+"more problems will arise if multiply distribution releases are mixed without "
+"a good understanding of the following paragraphs.  Packages included in a "
+"specific release aren't tested in and therefore doesn't always work as "
+"expected in older or newer releases or together with other packages from "
+"different releases.  You have been warned."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt_preferences.5.xml:67
+msgid ""
+"Note that the files in the <filename>/etc/apt/preferences.d</filename> "
+"directory are parsed in alphanumeric ascending order and need to obey the "
+"following naming convention: The files have no or \"<literal>pref</literal>"
+"\" as filename extension and which only contain alphanumeric, hyphen (-), "
+"underscore (_) and period (.) characters - otherwise they will be silently "
+"ignored."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt_preferences.5.xml:74

 msgid "APT's Default Priority Assignments"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 msgid "APT's Default Priority Assignments"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>

-#: apt_preferences.5.xml:71
+#: apt_preferences.5.xml:89

 #, no-wrap
 msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #, no-wrap
 msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>

-#: apt_preferences.5.xml:74
+#: apt_preferences.5.xml:92

 #, no-wrap
 msgid "APT::Default-Release \"stable\";\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #, no-wrap
 msgid "APT::Default-Release \"stable\";\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:58
+#: apt_preferences.5.xml:76

 msgid ""
 "If there is no preferences file or if there is no entry in the file that "
 "applies to a particular version then the priority assigned to that version "
 msgid ""
 "If there is no preferences file or if there is no entry in the file that "
 "applies to a particular version then the priority assigned to that version "


@@ -5701,40 +6146,53 @@ 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:83
+#: apt_preferences.5.xml:101
+msgid "priority 1"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
+#: apt_preferences.5.xml:102
+msgid ""
+"to the versions coming from archives which in their <filename>Release</"
+"filename> files are marked as \"NotAutomatic: yes\" like the debian "
+"experimental archive."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
+#: apt_preferences.5.xml:107

 msgid "priority 100"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "priority 100"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:84
+#: apt_preferences.5.xml:108

 msgid "to the version that is already installed (if any)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 msgid "to the version that is already installed (if any)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:88
+#: apt_preferences.5.xml:112

 msgid "priority 500"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "priority 500"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:89
+#: apt_preferences.5.xml:113

 msgid ""
 "to the versions that are not installed and do not belong to the target "
 "release."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 msgid ""
 "to the versions that are not installed and do not belong to the target "
 "release."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:93
+#: apt_preferences.5.xml:117

 msgid "priority 990"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "priority 990"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:94
+#: apt_preferences.5.xml:118

 msgid ""
 "to the versions that are not installed and belong to the target release."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgid ""
 "to the versions that are not installed and belong to the target release."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:78
+#: apt_preferences.5.xml:96

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


@@ -5742,22 +6200,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:99
+#: apt_preferences.5.xml:123

 msgid ""
 "If the target release has not been specified then APT simply assigns "
 "priority 100 to all installed package versions and priority 500 to all "
 msgid ""
 "If the target release has not been specified then APT simply assigns "
 "priority 100 to all installed package versions and priority 500 to all "

-"uninstalled package versions."
+"uninstalled package versions, expect versions coming from archives which in "
+"their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" "
+"- these versions get the priority 1."

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

-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml:129

 msgid ""
 "APT then applies the following rules, listed in order of precedence, to "
 "determine which version of a package to install."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 msgid ""
 "APT then applies the following rules, listed in order of precedence, to "
 "determine which version of a package to install."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>

-#: apt_preferences.5.xml:106
+#: apt_preferences.5.xml:132

 msgid ""
 "Never downgrade unless the priority of an available version exceeds 1000.  "
 "(\"Downgrading\" is installing a less recent version of a package in place "
 msgid ""
 "Never downgrade unless the priority of an available version exceeds 1000.  "
 "(\"Downgrading\" is installing a less recent version of a package in place "


@@ -5767,19 +6227,19 @@ 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:112
+#: apt_preferences.5.xml:138

 msgid "Install the highest priority version."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 msgid "Install the highest priority version."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>

-#: apt_preferences.5.xml:113
+#: apt_preferences.5.xml:139

 msgid ""
 "If two or more versions have the same priority, install the most recent one "
 "(that is, the one with the higher version number)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 msgid ""
 "If two or more versions have the same priority, install the most recent one "
 "(that is, the one with the higher version number)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>

-#: apt_preferences.5.xml:116
+#: apt_preferences.5.xml:142

 msgid ""
 "If two or more versions have the same priority and version number but either "
 "the packages differ in some of their metadata or the <literal>--reinstall</"
 msgid ""
 "If two or more versions have the same priority and version number but either "
 "the packages differ in some of their metadata or the <literal>--reinstall</"


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

-#: apt_preferences.5.xml:122
+#: apt_preferences.5.xml:148

 msgid ""
 "In a typical situation, the installed version of a package (priority 100)  "
 "is not as recent as one of the versions available from the sources listed in "
 msgid ""
 "In a typical situation, the installed version of a package (priority 100)  "
 "is not as recent as one of the versions available from the sources listed in "


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

-#: apt_preferences.5.xml:129
+#: apt_preferences.5.xml:155

 msgid ""
 "More rarely, the installed version of a package is <emphasis>more</emphasis> "
 "recent than any of the other available versions.  The package will not be "
 msgid ""
 "More rarely, the installed version of a package is <emphasis>more</emphasis> "
 "recent than any of the other available versions.  The package will not be "


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

-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml:160

 msgid ""
 "Sometimes the installed version of a package is more recent than the version "
 "belonging to the target release, but not as recent as a version belonging to "
 msgid ""
 "Sometimes the installed version of a package is more recent than the version "
 "belonging to the target release, but not as recent as a version belonging to "


@@ -5818,12 +6278,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt_preferences.5.xml:143
+#: apt_preferences.5.xml:169

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

-#: apt_preferences.5.xml:145
+#: apt_preferences.5.xml:171

 msgid ""
 "The APT preferences file allows the system administrator to control the "
 "assignment of priorities.  The file consists of one or more multi-line "
 msgid ""
 "The APT preferences file allows the system administrator to control the "
 "assignment of priorities.  The file consists of one or more multi-line "


@@ -5832,7 +6292,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:151
+#: apt_preferences.5.xml:177

 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages and specified version or version range.  For example, the "
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages and specified version or version range.  For example, the "


@@ -5842,7 +6302,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>

-#: apt_preferences.5.xml:158
+#: apt_preferences.5.xml:184

 #, no-wrap
 msgid ""
 "Package: perl\n"
 #, no-wrap
 msgid ""
 "Package: perl\n"


@@ -5851,7 +6311,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:164
+#: apt_preferences.5.xml:190

 msgid ""
 "The general form assigns a priority to all of the package versions in a "
 "given distribution (that is, to all the versions of packages that are listed "
 msgid ""
 "The general form assigns a priority to all of the package versions in a "
 "given distribution (that is, to all the versions of packages that are listed "


@@ -5861,7 +6321,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:170
+#: apt_preferences.5.xml:196

 msgid ""
 "This general-form entry in the APT preferences file applies only to groups "
 "of packages.  For example, the following record assigns a high priority to "
 msgid ""
 "This general-form entry in the APT preferences file applies only to groups "
 "of packages.  For example, the following record assigns a high priority to "


@@ -5869,7 +6329,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>

-#: apt_preferences.5.xml:175
+#: apt_preferences.5.xml:201

 #, no-wrap
 msgid ""
 "Package: *\n"
 #, no-wrap
 msgid ""
 "Package: *\n"


@@ -5878,17 +6338,35 @@ 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:180
+#: apt_preferences.5.xml:206

 msgid ""
 msgid ""

-"A note of caution: the keyword used here is \"<literal>origin</literal>\".  "
-"This should not be confused with the Origin of a distribution as specified "
-"in a <filename>Release</filename> file.  What follows the \"Origin:\" tag in "
-"a <filename>Release</filename> file is not an Internet address but an author "
-"or vendor name, such as \"Debian\" or \"Ximian\"."
+"A note of caution: the keyword used here is \"<literal>origin</literal>\" "
+"which can be used to match a hostname. The following record will assign a "
+"high priority to all versions available from the server identified by the "
+"hostname \"ftp.de.debian.org\""
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
+#: apt_preferences.5.xml:210
+#, no-wrap
+msgid ""
+"Package: *\n"
+"Pin: origin \"ftp.de.debian.org\"\n"
+"Pin-Priority: 999\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
+#: apt_preferences.5.xml:214
+msgid ""
+"This should <emphasis>not</emphasis> be confused with the Origin of a "
+"distribution as specified in a <filename>Release</filename> file.  What "
+"follows the \"Origin:\" tag in a <filename>Release</filename> file is not an "
+"Internet address but an author or vendor name, such as \"Debian\" or \"Ximian"
+"\"."

 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:186
+#: apt_preferences.5.xml:219

 msgid ""
 "The following record assigns a low priority to all package versions "
 "belonging to any distribution whose Archive name is \"<literal>unstable</"
 msgid ""
 "The following record assigns a low priority to all package versions "
 "belonging to any distribution whose Archive name is \"<literal>unstable</"


@@ -5896,7 +6374,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>

-#: apt_preferences.5.xml:190
+#: apt_preferences.5.xml:223

 #, no-wrap
 msgid ""
 "Package: *\n"
 #, no-wrap
 msgid ""
 "Package: *\n"


@@ -5905,24 +6383,24 @@ 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:195
+#: apt_preferences.5.xml:228

 msgid ""
 "The following record assigns a high priority to all package versions "
 msgid ""
 "The following record assigns a high priority to all package versions "

-"belonging to any distribution whose Codename is \"<literal>squeeze</literal>"
-"\"."
+"belonging to any distribution whose Codename is \"<literal>&testing-codename;"
+"</literal>\"."

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

-#: apt_preferences.5.xml:199
+#: apt_preferences.5.xml:232

 #, no-wrap
 msgid ""
 "Package: *\n"
 #, no-wrap
 msgid ""
 "Package: *\n"

-"Pin: release n=squeeze\n"
+"Pin: release n=&testing-codename;\n"

 "Pin-Priority: 900\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 "Pin-Priority: 900\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>

-#: apt_preferences.5.xml:204
+#: apt_preferences.5.xml:237

 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "


@@ -5930,7 +6408,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>

-#: apt_preferences.5.xml:209
+#: apt_preferences.5.xml:242

 #, no-wrap
 msgid ""
 "Package: *\n"
 #, no-wrap
 msgid ""
 "Package: *\n"


@@ -5939,82 +6417,82 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt_preferences.5.xml:220
+#: apt_preferences.5.xml:253

 msgid "How APT Interprets Priorities"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 msgid "How APT Interprets Priorities"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:228
+#: apt_preferences.5.xml:261

 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:229
+#: apt_preferences.5.xml:262

 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:233
+#: apt_preferences.5.xml:266

 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:234
+#: apt_preferences.5.xml:267

 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:239
+#: apt_preferences.5.xml:272

 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:240
+#: apt_preferences.5.xml:273

 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:245
+#: apt_preferences.5.xml:278

 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:246
+#: apt_preferences.5.xml:279

 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:251
+#: apt_preferences.5.xml:284

 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:252
+#: apt_preferences.5.xml:285

 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:256
+#: apt_preferences.5.xml:289

 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:257
+#: apt_preferences.5.xml:290

 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:223
+#: apt_preferences.5.xml:256

 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking): "
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking): "


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

-#: apt_preferences.5.xml:262
+#: apt_preferences.5.xml:295

 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 "


@@ -6031,14 +6509,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:268
+#: apt_preferences.5.xml:301

 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:272
+#: apt_preferences.5.xml:305

 #, no-wrap
 msgid ""
 "Package: perl\n"
 #, no-wrap
 msgid ""
 "Package: perl\n"


@@ -6055,12 +6533,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:285
+#: apt_preferences.5.xml:318

 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:287
+#: apt_preferences.5.xml:320

 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 "


@@ -6070,7 +6548,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:292
+#: apt_preferences.5.xml:325

 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 "


@@ -6078,7 +6556,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:296
+#: apt_preferences.5.xml:329

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


@@ -6087,12 +6565,12 @@ msgid ""
 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:339

 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:308
+#: apt_preferences.5.xml:341

 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "


@@ -6100,27 +6578,27 @@ 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:320
+#: apt_preferences.5.xml:353

 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:321
+#: apt_preferences.5.xml:354

 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:324 apt_preferences.5.xml:374
+#: apt_preferences.5.xml:357 apt_preferences.5.xml:407

 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:325
+#: apt_preferences.5.xml:358

 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:312
+#: apt_preferences.5.xml:345

 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable>/"
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable>/"


@@ -6133,12 +6611,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:341
+#: apt_preferences.5.xml:374

 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:342
+#: apt_preferences.5.xml:375

 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 "


@@ -6149,34 +6627,35 @@ 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:352
+#: apt_preferences.5.xml:385

 #, 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:358
+#: apt_preferences.5.xml:391

 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:359
+#: apt_preferences.5.xml:392

 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "

-"For example, the line \"Codename: squeeze\" specifies that all of the "
-"packages in the directory tree below the parent of the <filename>Release</"
-"filename> file belong to a version named <literal>squeeze</literal>.  "
-"Specifying this value in the APT preferences file would require the line:"
+"For example, the line \"Codename: &testing-codename;\" specifies that all of "
+"the packages in the directory tree below the parent of the "
+"<filename>Release</filename> file belong to a version named "
+"<literal>&testing-codename;</literal>.  Specifying this value in the APT "
+"preferences file would require the line:"

 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:368
+#: apt_preferences.5.xml:401

 #, no-wrap
 #, no-wrap

-msgid "Pin: release n=squeeze\n"
+msgid "Pin: release n=&testing-codename;\n"

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

-#: apt_preferences.5.xml:375
+#: apt_preferences.5.xml:408

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


@@ -6186,7 +6665,7 @@ 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:384
+#: apt_preferences.5.xml:417

 #, no-wrap
 msgid ""
 "Pin: release v=3.0\n"
 #, no-wrap
 msgid ""
 "Pin: release v=3.0\n"


@@ -6195,12 +6674,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:393
+#: apt_preferences.5.xml:426

 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:394
+#: apt_preferences.5.xml:427

 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 "


@@ -6211,18 +6690,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:403
+#: apt_preferences.5.xml:436

 #, 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:409
+#: apt_preferences.5.xml:442

 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:410
+#: apt_preferences.5.xml:443

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


@@ -6231,18 +6710,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:416
+#: apt_preferences.5.xml:449

 #, 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:422
+#: apt_preferences.5.xml:455

 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:423
+#: apt_preferences.5.xml:456

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


@@ -6251,26 +6730,27 @@ 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:429
+#: apt_preferences.5.xml:462

 #, 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:330
+#: apt_preferences.5.xml:363

 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>.../"
 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/woody/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\"/>"
+"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>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:436
+#: apt_preferences.5.xml:469

 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 "


@@ -6285,34 +6765,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt_preferences.5.xml:449
+#: apt_preferences.5.xml:482

 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:451
+#: apt_preferences.5.xml:484

 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
 "provides a place for comments."
 msgstr ""
 
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
 "provides a place for comments."
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:455
-msgid ""
-"The <literal>Pin-Priority:</literal> line in each APT preferences record is "
-"optional.  If omitted, APT assigns a priority of 1 less than the last value "
-"specified on a line beginning with <literal>Pin-Priority: release ...</"
-"literal>."
-msgstr ""
-

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

-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml:493

 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:472
+#: apt_preferences.5.xml:501

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


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

-#: apt_preferences.5.xml:466
+#: apt_preferences.5.xml:495

 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 "


@@ -6337,8 +6808,8 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>

-#: apt_preferences.5.xml:489 apt_preferences.5.xml:535
-#: apt_preferences.5.xml:593
+#: apt_preferences.5.xml:518 apt_preferences.5.xml:564
+#: apt_preferences.5.xml:622

 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"


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

-#: apt_preferences.5.xml:484
+#: apt_preferences.5.xml:513

 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 "


@@ -6356,13 +6827,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>

-#: apt_preferences.5.xml:501
+#: apt_preferences.5.xml:530

 #, 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:495
+#: apt_preferences.5.xml:524

 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 "


@@ -6371,12 +6842,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt_preferences.5.xml:507
+#: apt_preferences.5.xml:536

 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:516
+#: apt_preferences.5.xml:545

 #, no-wrap
 msgid ""
 "Package: *\n"
 #, no-wrap
 msgid ""
 "Package: *\n"


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

-#: apt_preferences.5.xml:509
+#: apt_preferences.5.xml:538

 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 "


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

-#: apt_preferences.5.xml:530
+#: apt_preferences.5.xml:559

 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 "


@@ -6413,13 +6884,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>

-#: apt_preferences.5.xml:550
+#: apt_preferences.5.xml:579

 #, 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:541
+#: apt_preferences.5.xml:570

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


@@ -6431,23 +6902,23 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml:586

 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:571
+#: apt_preferences.5.xml:600

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

-"Explanation: other than those in the distribution codenamed with squeeze or sid\n"
+"Explanation: other than those in the distribution codenamed with &testing-codename; or sid\n"

 "Package: *\n"
 "Package: *\n"

-"Pin: release n=squeeze\n"
+"Pin: release n=&testing-codename;\n"

 "Pin-Priority: 900\n"
 "\n"
 "Explanation: Debian unstable is always codenamed with sid\n"
 "Package: *\n"
 "Pin-Priority: 900\n"
 "\n"
 "Explanation: Debian unstable is always codenamed with sid\n"
 "Package: *\n"

-"Pin: release a=sid\n"
+"Pin: release n=sid\n"

 "Pin-Priority: 800\n"
 "\n"
 "Package: *\n"
 "Pin-Priority: 800\n"
 "\n"
 "Package: *\n"


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

-#: apt_preferences.5.xml:559
+#: apt_preferences.5.xml:588

 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 "


@@ -6471,39 +6942,39 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:588
+#: apt_preferences.5.xml:617

 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 "

-"the release codenamed with <literal>squeeze</literal>.  <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"the release codenamed with <literal>&testing-codename;</literal>.  "
+"<placeholder type=\"programlisting\" id=\"0\"/>"

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

-#: apt_preferences.5.xml:608
+#: apt_preferences.5.xml:637

 #, 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:599
+#: apt_preferences.5.xml:628

 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>sid</literal> distribution.  Thereafter, "
 "<command>apt-get upgrade</command> will upgrade the package to the most "
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>sid</literal> distribution.  Thereafter, "
 "<command>apt-get upgrade</command> will upgrade the package to the most "

-"recent <literal>squeeze</literal> version if that is more recent than the "
-"installed version, otherwise, to the most recent <literal>sid</literal> "
-"version if that is more recent than the installed version.  <placeholder "
-"type=\"programlisting\" id=\"0\"/>"
+"recent <literal>&testing-codename;</literal> version if that is more recent "
+"than the installed version, otherwise, to the most recent <literal>sid</"
+"literal> version if that is more recent than the installed version.  "
+"<placeholder type=\"programlisting\" id=\"0\"/>"

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

-#: apt_preferences.5.xml:617
+#: apt_preferences.5.xml:646

 msgid "&file-preferences;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "&file-preferences;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt_preferences.5.xml:623
+#: apt_preferences.5.xml:652

 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr ""
 
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr ""
 


@@ -6644,8 +7115,8 @@ msgstr ""
 #: sources.list.5.xml:114
 #, no-wrap
 msgid ""
 #: sources.list.5.xml:114
 #, no-wrap
 msgid ""

-"deb http://http.us.debian.org/debian stable main contrib non-free\n"
-"deb http://http.us.debian.org/debian dists/stable-updates/\n"
+"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
+"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"

 "   "
 msgstr ""
 
 "   "
 msgstr ""
 


@@ -6732,7 +7203,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 #: sources.list.5.xml:178
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 #: sources.list.5.xml:178

-msgid "more recongnizable URI types"
+msgid "more recognizable URI types"

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


@@ -6740,9 +7211,9 @@ msgstr ""
 msgid ""
 "APT can be extended with more methods shipped in other optional packages "
 "which should follow the nameing scheme <literal>apt-transport-"
 msgid ""
 "APT can be extended with more methods shipped in other optional packages "
 "which should follow the nameing scheme <literal>apt-transport-"

-"<replaceable>method</replaceable></literal>.  The APT team e.g. maintain "
+"<replaceable>method</replaceable></literal>.  The APT team e.g. maintains "

 "also the <literal>apt-transport-https</literal> package which provides "
 "also the <literal>apt-transport-https</literal> package which provides "

-"access methods for https-URIs with features similiar to the http method, but "
+"access methods for https-URIs with features similar to the http method, but "

 "other methods for using e.g. debtorrent are also available, see "
 "<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></"
 "refentrytitle> <manvolnum>1</manvolnum></citerefentry>."
 "other methods for using e.g. debtorrent are also available, see "
 "<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></"
 "refentrytitle> <manvolnum>1</manvolnum></citerefentry>."


@@ -6807,13 +7278,13 @@ msgstr ""
 #: sources.list.5.xml:208
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 #: sources.list.5.xml:208
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "

-"directory, and uses only the stable/contrib area."
+"directory, and uses only the &stable-codename;/contrib area."

 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml:210
 #, no-wrap
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml:210
 #, no-wrap

-msgid "deb ftp://ftp.debian.org/debian stable contrib"
+msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"

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


@@ -6995,7 +7466,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "For instance, mailcrypt is an emacs extension that aids in encrypting email "
 #, fuzzy
 msgid ""
 "For instance, mailcrypt is an emacs extension that aids in encrypting email "

-"with GPG. Without GPGP installed mail-crypt is useless, so mailcrypt has a "
+"with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "

 "simple dependency on GPG. Also, because it is an emacs extension it has a "
 "simple dependency on emacs, without emacs it is completely useless."
 msgstr ""
 "simple dependency on GPG. Also, because it is an emacs extension it has a "
 "simple dependency on emacs, without emacs it is completely useless."
 msgstr ""


@@ -7235,8 +7706,8 @@ msgstr ""
 #: guide.sgml:184
 #, fuzzy
 msgid ""
 #: guide.sgml:184
 #, fuzzy
 msgid ""

-"To enable the APT method you need to to select [A]ccess in <prgn>dselect</"
-"prgn> and then choose the APT method. You will be prompted for a set of "
+"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
+"and then choose the APT method. You will be prompted for a set of "

 "<em>Sources</em> which are places to fetch archives from. These can be "
 "remote Internet sites, local Debian mirrors or CDROMs. Each source can "
 "provide a fragment of the total Debian archive, APT will automatically "
 "<em>Sources</em> which are places to fetch archives from. These can be "
 "remote Internet sites, local Debian mirrors or CDROMs. Each source can "
 "provide a fragment of the total Debian archive, APT will automatically "


@@ -7376,7 +7847,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "Before starting to use <prgn>dselect</prgn> it is necessary to update the "
 #, fuzzy
 msgid ""
 "Before starting to use <prgn>dselect</prgn> it is necessary to update the "

-"available list by selecting [U]pdate from the menu. This is a super-set of "
+"available list by selecting [U]pdate from the menu. This is a superset of "

 "<tt>apt-get update</tt> that makes the fetched information available to "
 "<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
 "tt> has been run before."
 "<tt>apt-get update</tt> that makes the fetched information available to "
 "<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</"
 "tt> has been run before."


@@ -8089,7 +8560,7 @@ msgstr ""
 #: offline.sgml:57
 msgid ""
 "This is achieved by creatively manipulating the APT configuration file. The "
 #: offline.sgml:57
 msgid ""
 "This is achieved by creatively manipulating the APT configuration file. The "

-"essential premis to tell APT to look on a disc for it's archive files. Note "
+"essential premise to tell APT to look on a disc for it's archive files. Note "

 "that the disc should be formated with a filesystem that can handle long file "
 "names such as ext2, fat32 or vfat."
 msgstr ""
 "that the disc should be formated with a filesystem that can handle long file "
 "names such as ext2, fat32 or vfat."
 msgstr ""


@@ -8187,8 +8658,8 @@ msgid ""
 "On the target machine the first thing to do is mount the disc and copy <em>/"
 "var/lib/dpkg/status</em> to it. You will also need to create the directories "
 "outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
 "On the target machine the first thing to do is mount the disc and copy <em>/"
 "var/lib/dpkg/status</em> to it. You will also need to create the directories "
 "outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"

-"em> Then take the disc to the remote machine and configure the sources.list. "
-"On the remote machine execute the following:"
+"em>. Then take the disc to the remote machine and configure the sources."
+"list. On the remote machine execute the following:"

 msgstr ""
 
 #. type: <example></example>
 msgstr ""
 
 #. type: <example></example>


@@ -8205,9 +8676,9 @@ msgstr ""
 #. type: </example></p>
 #: offline.sgml:149
 msgid ""
 #. type: </example></p>
 #: offline.sgml:149
 msgid ""

-"The dist-upgrade command can be replaced with any-other standard APT "
+"The dist-upgrade command can be replaced with any other standard APT "

 "commands, particularly dselect-upgrade. You can even use an APT front end "
 "commands, particularly dselect-upgrade. You can even use an APT front end "

-"such as <em>dselect</em> However this presents a problem in communicating "
+"such as <em>dselect</em>. However this presents a problem in communicating "

 "your selections back to the local computer."
 msgstr ""
 
 "your selections back to the local computer."
 msgstr ""