Release 1.2.1

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

diff --git a/doc/po/de.po b/doc/po/de.po
index 46d6d629487c8677a342f749291606358172f7a0..2eabdaafe5e06e6206fa84c8a393b167f81b5b0d 100644 (file)
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -1,14 +1,14 @@
-# Translation of apt-doc to German
+# Translation of apt/doc to German

 # Copyright (C) 1997, 1998, 1999 Jason Gunthorpe and others.
 # Copyright (C) 1997, 1998, 1999 Jason Gunthorpe and others.

-# This file is distributed under the same license as the apt-doc package.
+# This file is distributed under the same license as the apt package.

 # Chris Leick <c.leick@vollbio.de>, 2009-2014.
 #
 msgid ""
 msgstr ""
 # Chris Leick <c.leick@vollbio.de>, 2009-2014.
 #
 msgid ""
 msgstr ""

-"Project-Id-Version: apt-doc 0.9.16\n"
+"Project-Id-Version: apt-doc 1.0.8\n"

 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"

-"POT-Creation-Date: 2014-04-01 14:24+0200\n"
-"PO-Revision-Date: 2014-04-01 14:00+0200\n"
+"POT-Creation-Date: 2016-01-25 18:05+0100\n"
+"PO-Revision-Date: 2014-09-14 14:46+0200\n"

 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
 "Language: de\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
 "Language: de\n"


@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text

-#: apt.ent:7
+#: apt.ent

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


@@ -35,7 +35,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
 "\">\n"
 
 #. type: Plain text

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

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


@@ -51,7 +51,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
 "\">\n"
 
 #. type: Plain text

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

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


@@ -77,7 +77,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
 "\">\n"
 
 #. type: Plain text

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

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


@@ -97,7 +97,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
 "\">\n"
 
 #. type: Plain text

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

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


@@ -121,7 +121,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
 "     </varlistentry>\n"
 
 #. type: Plain text

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

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


@@ -141,7 +141,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
 "     </varlistentry>\n"
 
 #. type: Plain text

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

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


@@ -170,7 +170,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
 "     </varlistentry>\n"
 
 #. type: Plain text

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

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


@@ -198,7 +198,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
 "\">\n"
 
 #. type: Plain text

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

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


@@ -224,7 +224,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
 "\">\n"
 
 #. type: Plain text

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

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


@@ -240,7 +240,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
 "     </varlistentry>\n"
 
 #. type: Plain text

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

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


@@ -256,7 +256,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
 "\">\n"
 
 #. type: Plain text

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

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


@@ -272,7 +272,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
 "     </varlistentry>\n"
 
 #. type: Plain text

-#: apt.ent:109
+#: apt.ent

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


@@ -288,7 +288,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
 "\">\n"
 
 #. type: Plain text

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

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


@@ -311,7 +311,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
 "     </varlistentry>\n"
 
 #. type: Plain text

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

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


@@ -327,7 +327,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
 "\">\n"
 
 #. type: Plain text

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

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


@@ -343,7 +343,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
 "     </varlistentry>\n"
 
 #. type: Plain text

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

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


@@ -359,7 +359,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
 "\">\n"
 
 #. type: Plain text

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

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


@@ -377,7 +377,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
 "     </varlistentry>\n"
 
 #. type: Plain text

-#: apt.ent:150
+#: apt.ent

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


@@ -393,7 +393,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
 "\">\n"
 
 #. type: Plain text

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

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


@@ -410,7 +410,7 @@ msgstr ""
 "     </varlistentry>\n"
 
 #. type: Plain text
 "     </varlistentry>\n"
 
 #. type: Plain text

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

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


@@ -429,7 +429,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
 "\">\n"
 
 #. type: Plain text

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

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


@@ -449,7 +449,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
 "\">\n"
 
 #. type: Plain text

-#: apt.ent:175
+#: apt.ent

 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"


@@ -458,7 +458,7 @@ msgid ""
 msgstr "<!ENTITY translation-title \"ÜBERSETZUNG\">\n"
 
 #. type: Plain text
 msgstr "<!ENTITY translation-title \"ÜBERSETZUNG\">\n"
 
 #. type: Plain text

-#: apt.ent:184
+#: apt.ent

 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"


@@ -478,7 +478,7 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
 "\">\n"
 
 #. type: Plain text

-#: apt.ent:195
+#: apt.ent

 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"


@@ -499,21 +499,21 @@ msgstr ""
 "\">\n"
 
 #. type: Plain text
 "\">\n"
 
 #. type: Plain text

-#: apt.ent:198
+#: apt.ent

 msgid ""
 "<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
 "pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
 msgstr "<!ENTITY synopsis-config-string \"Konfigurationszeichenkette\">"
 
 #. type: Plain text
 msgid ""
 "<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
 "pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
 msgstr "<!ENTITY synopsis-config-string \"Konfigurationszeichenkette\">"
 
 #. type: Plain text

-#: apt.ent:201
+#: apt.ent

 msgid ""
 "<!-- TRANSLATOR: used as in -c=config_file e.g. -c=./apt.conf --> <!ENTITY "
 "synopsis-config-file \"config_file\">"
 msgstr "<!ENTITY synopsis-config-file \"Konfigurationsdatei\">"
 
 #. type: Plain text
 msgid ""
 "<!-- TRANSLATOR: used as in -c=config_file e.g. -c=./apt.conf --> <!ENTITY "
 "synopsis-config-file \"config_file\">"
 msgstr "<!ENTITY synopsis-config-file \"Konfigurationsdatei\">"
 
 #. type: Plain text

-#: apt.ent:204
+#: apt.ent

 msgid ""
 "<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
 "t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
 msgid ""
 "<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
 "t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "


@@ -521,49 +521,49 @@ msgid ""
 msgstr "<!ENTITY synopsis-target-release \"Ziel-Release\">"
 
 #. type: Plain text
 msgstr "<!ENTITY synopsis-target-release \"Ziel-Release\">"
 
 #. type: Plain text

-#: apt.ent:207
+#: apt.ent

 msgid ""
 "<!-- TRANSLATOR: used as in -a=architecture e.g. -a=armel --> <!ENTITY "
 "synopsis-architecture \"architecture\">"
 msgstr "<!ENTITY synopsis-architecture \"Architektur\">"
 
 #. type: Plain text
 msgid ""
 "<!-- TRANSLATOR: used as in -a=architecture e.g. -a=armel --> <!ENTITY "
 "synopsis-architecture \"architecture\">"
 msgstr "<!ENTITY synopsis-architecture \"Architektur\">"
 
 #. type: Plain text

-#: apt.ent:210
+#: apt.ent

 msgid ""
 "<!-- TRANSLATOR: used as in apt-get install pkg e.g. apt-get install awesome "
 "--> <!ENTITY synopsis-pkg \"pkg\">"
 msgstr "<!ENTITY synopsis-pkg \"Paket\">"
 
 #. type: Plain text
 msgid ""
 "<!-- TRANSLATOR: used as in apt-get install pkg e.g. apt-get install awesome "
 "--> <!ENTITY synopsis-pkg \"pkg\">"
 msgstr "<!ENTITY synopsis-pkg \"Paket\">"
 
 #. type: Plain text

-#: apt.ent:213
+#: apt.ent

 msgid ""
 "<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> <!"
 "ENTITY synopsis-pkg-ver-number \"pkg_version_number\">"
 msgstr "<!ENTITY synopsis-pkg-ver-number \"Paketversionsnummer\">"
 
 #. type: Plain text
 msgid ""
 "<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> <!"
 "ENTITY synopsis-pkg-ver-number \"pkg_version_number\">"
 msgstr "<!ENTITY synopsis-pkg-ver-number \"Paketversionsnummer\">"
 
 #. type: Plain text

-#: apt.ent:216
+#: apt.ent

 msgid ""
 "<!-- TRANSLATOR: used as in apt-cache pkgnames prefix e.g. apt-cache "
 "pkgnames apt --> <!ENTITY synopsis-prefix \"prefix\">"
 msgstr "<!ENTITY synopsis-prefix \"Präfix\">"
 
 #. type: Plain text
 msgid ""
 "<!-- TRANSLATOR: used as in apt-cache pkgnames prefix e.g. apt-cache "
 "pkgnames apt --> <!ENTITY synopsis-prefix \"prefix\">"
 msgstr "<!ENTITY synopsis-prefix \"Präfix\">"
 
 #. type: Plain text

-#: apt.ent:219
+#: apt.ent

 msgid ""
 "<!-- TRANSLATOR: used as in apt-cache search regex e.g. apt-cache search "
 "awesome --> <!ENTITY synopsis-regex \"regex\">"
 msgstr "<!ENTITY synopsis-regex \"regulärer_Ausdruck\">"
 
 #. type: Plain text
 msgid ""
 "<!-- TRANSLATOR: used as in apt-cache search regex e.g. apt-cache search "
 "awesome --> <!ENTITY synopsis-regex \"regex\">"
 msgstr "<!ENTITY synopsis-regex \"regulärer_Ausdruck\">"
 
 #. type: Plain text

-#: apt.ent:222
+#: apt.ent

 msgid ""
 "<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
 "d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
 msgstr "<!ENTITY synopsis-cdrom-mount \"CD-ROM-Einhängepunkt\">"
 
 #. type: Plain text
 msgid ""
 "<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
 "d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
 msgstr "<!ENTITY synopsis-cdrom-mount \"CD-ROM-Einhängepunkt\">"
 
 #. type: Plain text

-#: apt.ent:225
+#: apt.ent

 msgid ""
 "<!-- TRANSLATOR: used as in apt-extracttemplates -t=temporary_directory e.g. "
 "apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "
 msgid ""
 "<!-- TRANSLATOR: used as in apt-extracttemplates -t=temporary_directory e.g. "
 "apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "


@@ -571,21 +571,21 @@ msgid ""
 msgstr "<!ENTITY synopsis-tmp-directory \"temporäres_Verzeichnis\">"
 
 #. type: Plain text
 msgstr "<!ENTITY synopsis-tmp-directory \"temporäres_Verzeichnis\">"
 
 #. type: Plain text

-#: apt.ent:228
+#: apt.ent

 msgid ""
 "<!-- TRANSLATOR: used as in apt-extracttemplates filename --> <!ENTITY "
 "synopsis-filename \"filename\">"
 msgstr "<!ENTITY synopsis-filename \"Dateiname\">"
 
 #. type: Plain text
 msgid ""
 "<!-- TRANSLATOR: used as in apt-extracttemplates filename --> <!ENTITY "
 "synopsis-filename \"filename\">"
 msgstr "<!ENTITY synopsis-filename \"Dateiname\">"
 
 #. type: Plain text

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

 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">"
 msgstr "<!ENTITY synopsis-path \"Pfad\">"
 
 #. type: Plain text
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">"
 msgstr "<!ENTITY synopsis-path \"Pfad\">"
 
 #. type: Plain text

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

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


@@ -593,7 +593,7 @@ msgid ""
 msgstr "<!ENTITY synopsis-override \"Überschreibungsdatei\">"
 
 #. type: Plain text
 msgstr "<!ENTITY synopsis-override \"Überschreibungsdatei\">"
 
 #. type: Plain text

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

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


@@ -601,103 +601,149 @@ msgid ""
 msgstr "<!ENTITY synopsis-pathprefix \"Pfadpräfix\">"
 
 #. type: Plain text
 msgstr "<!ENTITY synopsis-pathprefix \"Pfadpräfix\">"
 
 #. type: Plain text

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

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

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

 msgid ""
 "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
 "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
 msgstr "<!ENTITY synopsis-keyid \"Schlüsselkennung\">"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
 msgid ""
 "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
 "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
 msgstr "<!ENTITY synopsis-keyid \"Schlüsselkennung\">"
 
 #. type: Content of: <refentry><refmeta><manvolnum>

-#: apt.8.xml:25 apt-get.8.xml:28 apt-cache.8.xml:28 apt-key.8.xml:27
-#: apt-mark.8.xml:28 apt-secure.8.xml:27 apt-cdrom.8.xml:27
-#: apt-config.8.xml:28
+#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
+#: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml

 msgid "8"
 msgstr "8"
 
 #. type: Content of: <refentry><refmeta><refmiscinfo>
 msgid "8"
 msgstr "8"
 
 #. type: Content of: <refentry><refmeta><refmiscinfo>

-#: apt.8.xml:26 apt-get.8.xml:29 apt-cache.8.xml:29 apt-key.8.xml:28
-#: apt-mark.8.xml:29 apt-secure.8.xml:28 apt-cdrom.8.xml:28
-#: apt-config.8.xml:29 apt.conf.5.xml:34 apt_preferences.5.xml:28
-#: sources.list.5.xml:29 apt-extracttemplates.1.xml:29 apt-sortpkgs.1.xml:29
-#: apt-ftparchive.1.xml:29
+#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
+#: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml
+#: apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml

 msgid "APT"
 msgstr "APT"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 msgid "APT"
 msgstr "APT"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>

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

 msgid "command-line interface"
 msgid "command-line interface"

-msgstr ""
+msgstr "Befehlszeilenschnittstelle"

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

-#: apt.8.xml:37 apt-get.8.xml:40 apt-cache.8.xml:40 apt-key.8.xml:39
-#: apt-mark.8.xml:40 apt-secure.8.xml:52 apt-cdrom.8.xml:39
-#: apt-config.8.xml:40 apt.conf.5.xml:43 apt_preferences.5.xml:38
-#: sources.list.5.xml:38 apt-extracttemplates.1.xml:40 apt-sortpkgs.1.xml:40
-#: apt-ftparchive.1.xml:40
+#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
+#: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml
+#: apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml

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

-#: apt.8.xml:38
+#: apt.8.xml
+msgid ""
+"<command>apt</command> provides a high-level commandline interface for the "
+"package management system. It is intended as an end user interface and "
+"enables some options better suited for interactive usage by default compared "
+"to more specialized APT tools like &apt-get; and &apt-cache;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml

 msgid ""
 msgid ""

-"<command>apt</command> (Advanced Package Tool) is the command-line tool for "
-"handling packages. It provides a commandline interface for the package "
-"management of the system.  See also &apt-get; and &apt-cache; for more low-"
-"level command options."
+"Much like <command>apt</command> itself, its manpage is intended as an end "
+"user interface and as such only mentions the most used commands and options "
+"partly to not duplicate information in multiple places and partly to avoid "
+"overwhelming readers with a cornucopia of options and details."

 msgstr ""
 
 msgstr ""
 

+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+#, fuzzy
+#| msgid "apt-get"
+msgid "(&apt-get;)"
+msgstr "apt-get"
+

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

-#: apt.8.xml:47
+#: apt.8.xml

 msgid ""
 msgid ""

-"<literal>list</literal> is used to display a list of packages. It supports "
-"shell pattern for matching package names and the following options: "
-"<option>--installed</option>, <option>--upgradable</option>, <option>--all-"
-"versions</option> are supported."
+"<option>update</option> is used to download package information from all "
+"configured sources. Other commands operate on this data to e.g. perform "
+"package upgrades or search in and display details about all packages "
+"available for installation."

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

-#: apt.8.xml:58
+#: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>upgrade</literal> is used to install the newest versions of all "
+#| "packages currently installed on the system from the sources enumerated in "
+#| "<filename>/etc/apt/sources.list</filename>. New packages will be "
+#| "installed, but existing packages will never be removed."

 msgid ""
 msgid ""

-"<literal>search</literal> searches for the given term(s) and display "
-"matching packages."
+"<option>upgrade</option> is used to install available upgrades of all "
+"packages currently installed on the system from the sources configured via "
+"&sources-list;. New packages will be installed if required to statisfy "
+"dependencies, but existing packages will never be removed. If an upgrade for "
+"a package requires the remove of an installed package the upgrade for this "
+"package isn't performed."

 msgstr ""
 msgstr ""

+"<literal>upgrade</literal> wird verwendet, um die neuesten Versionen aller "
+"derzeit auf Ihrem System installierten Pakete von den in <filename>/etc/apt/"
+"sources.list</filename> aufgezählten Quellen zu installieren. Dabei werden "
+"neue Pakete installiert, existierende jedoch nicht entfernt."

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

-#: apt.8.xml:64
+#: apt.8.xml

 #, fuzzy
 #| msgid ""
 #, fuzzy
 #| msgid ""

-#| "<literal>rdepends</literal> shows a listing of each reverse dependency a "
-#| "package has."
+#| "<literal>full-upgrade</literal> performs the function of upgrade but may "
+#| "also remove installed packages if that is required in order to resolve a "
+#| "package conflict."

 msgid ""
 msgid ""

-"<literal>show</literal> shows the package information for the given "
-"package(s)."
+"<literal>full-upgrade</literal> performs the function of upgrade but will "
+"remove currently installed packages if this is needed to upgrade the system "
+"as a whole."
+msgstr ""
+"<literal>full-upgrade</literal> verrichtet die Funktion von »upgrade«, kann "
+"aber auch installierte Pakete entfernen, falls dies zum Auflösen eines "
+"Paketkonflikts nötig ist."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+msgid ","

 msgstr ""
 msgstr ""

-"<literal>rdepends</literal> zeigt eine Liste von jeder "
-"Rückwärtsabhängigkeit, die ein Paket hat."

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

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

 msgid ""
 msgid ""

-"<literal>install</literal> is followed by one or more package names desired "
-"for installation or upgrading."
+"Performs the requested action on one or more packages specified via &regex;, "
+"&glob; or exact match. The requested action can be overridden for specific "
+"packages by append a plus (+) to the package name to install this package or "
+"a minus (-) to remove it."

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

-#: apt.8.xml:75 apt-get.8.xml:118
+#: apt.8.xml
+#, fuzzy
+#| 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 select. This will cause that version to be located and selected for "
+#| "install. Alternatively a specific distribution can be selected by "
+#| "following the package name with a slash and the version of the "
+#| "distribution or the Archive name (stable, testing, unstable)."

 msgid ""
 "A specific version of a package can be selected for installation by "
 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 "
-"select. This will cause that version to be located and selected for install. "
-"Alternatively a specific distribution can be selected by following the "
-"package name with a slash and the version of the distribution or the Archive "
-"name (stable, testing, unstable)."
+"following the package name with an equals (=) and the version of the package "
+"to select. Alternatively the version from a specific release can be selected "
+"by following the package name with a forward slash (/) and codename (&debian-"
+"stable-codename;, &debian-testing-codename;, sid …) or suite name (stable, "
+"testing, unstable). This will also select versions from this release for "
+"dependencies of this package if needed to satisfy the request."

 msgstr ""
 "Eine bestimmte Version eines Paketes kann durch den Paketnamen gefolgt von "
 "einem Gleichheitszeichen und der Version des Paketes zur Installation "
 msgstr ""
 "Eine bestimmte Version eines Paketes kann durch den Paketnamen gefolgt von "
 "einem Gleichheitszeichen und der Version des Paketes zur Installation "


@@ -708,173 +754,189 @@ msgstr ""
 "ausgewählt werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "ausgewählt werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.8.xml:85 apt-get.8.xml:153
+#: apt.8.xml

 msgid ""
 msgid ""

-"<literal>remove</literal> is identical to <literal>install</literal> except "
-"that packages are removed instead of installed. Note that removing a package "
-"leaves its configuration files on the system. If a plus sign is appended to "
-"the package name (with no intervening space), the identified package will be "
-"installed instead of removed."
+"Removing a package removes all packaged data, but leaves usually small "
+"(modified) user configuration files behind, in case the remove was an "
+"accident. Just issuing an installation request for the accidentally removed "
+"package will restore its function as before in that case. On the other hand "
+"you can get rid of these leftovers by calling <command>purge</command> even "
+"on already removed packages. Note that this does not affect any data or "
+"configuration stored in your home directory."

 msgstr ""
 msgstr ""

-"<literal>remove</literal> ist identisch mit <literal>install</literal>, mit "
-"der Ausnahme, dass Pakte entfernt anstatt installiert werden. Beachten Sie, "
-"dass das Entfernen von Paketen deren Konfigurationsdateien im System "
-"belässt. Wenn ein Pluszeichen an den Paketnamen angehängt wird (ohne "
-"Leerzeichen dazwischen) wird das erkannte Paket installiert anstatt entfernt."

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

-#: apt.8.xml:93
+#: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>autoremove</literal> is used to remove packages that were "
+#| "automatically installed to satisfy dependencies for other packages and "
+#| "are now no longer needed."

 msgid ""
 msgid ""

-"<literal>edit-sources</literal> lets you edit your sources.list file and "
-"provides basic sanity checks."
+"<literal>autoremove</literal> is used to remove packages that were "
+"automatically installed to satisfy dependencies for other packages and are "
+"now no longer needed as dependencies changed or the package(s)  needing them "
+"were removed in the meantime."

 msgstr ""
 msgstr ""

+"<literal>autoremove</literal> wird benutzt, um Pakete zu entfernen, die "
+"automatisch installiert wurden, um Abhängigkeiten für andere Pakete zu "
+"erfüllen und die nicht mehr benötigt werden."

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

-#: apt.8.xml:99
-#, fuzzy
-#| msgid ""
-#| "<literal>showhold</literal> is used to print a list of packages on hold "
-#| "in the same way as for the other show commands."
+#: apt.8.xml

 msgid ""
 msgid ""

-"<literal>update</literal> is used to resynchronize the package index files "
-"from their sources."
+"You should check that the list does not include applications you have grown "
+"to like even though they were once installed just as a dependency of another "
+"package. You can mark such a package as manually installed by using &apt-"
+"mark;. Packages which you have installed explicitly via <command>install</"
+"command> are also never proposed for automatic removal."

 msgstr ""
 msgstr ""

-"<literal>showhold</literal> wird benutzt, um eine Liste auf »hold« gesetzter "
-"Pakete auf die gleiche Art wie für andere Anzeigebefehle auszugeben."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+#, fuzzy
+#| msgid "&apt-conf;"
+msgid "(&apt-cache;)"
+msgstr "&apt-conf;"

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

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

 msgid ""
 msgid ""

-"<literal>upgrade</literal> is used to install the newest versions of all "
-"packages currently installed on the system from the sources enumerated in "
-"<filename>/etc/apt/sources.list</filename>. New package will be installed, "
-"but existing package will never removed."
+"<option>search</option> can be used to search for the given &regex; term(s) "
+"in the list of available packages and display matches.  This can e.g. be "
+"useful if you are looking for packages having a specific feature.  If you "
+"are looking for a package including a specific file try &apt-file;."

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

-#: apt.8.xml:114
+#: apt.8.xml

 msgid ""
 msgid ""

-"<literal>full-upgrade</literal> performs the function of upgrade but may "
-"also remove installed packages if that is required in order to resolve a "
-"package conflict."
+"Show information about the given package(s) including its dependencies, "
+"installation and download size, sources the package is available from, the "
+"description of the packages content and much more. It can e.g. be helpful to "
+"look at this information before allowing &apt; to remove a package or while "
+"searching for new packages to install."

 msgstr ""
 
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:124 apt-get.8.xml:257 apt-cache.8.xml:250 apt-mark.8.xml:110
-#: apt-config.8.xml:86 apt-extracttemplates.1.xml:54 apt-sortpkgs.1.xml:50
-#: apt-ftparchive.1.xml:506
-msgid "options"
-msgstr "Optionen"
-
-#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:134
-msgid "Script usage"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml
+msgid "(work-in-progress)"

 msgstr ""
 
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:136
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>list</literal> is used to display a list of packages. It "
+#| "supports shell pattern for matching package names and the following "
+#| "options: <option>--installed</option>, <option>--upgradable</option>, "
+#| "<option>--upgradeable</option>, <option>--all-versions</option> are "
+#| "supported."
+msgid ""
+"<option>list</option> is somewhat similar to <command>dpkg-query --list</"
+"command> in that it can display a list of packages satisfying certain "
+"criteria.  It supports &glob; patterns for matching package names as well as "
+"options to list installed (<option>--installed</option>), upgradeable "
+"(<option>--upgradeable</option>) or all available (<option>--all-versions</"
+"option>) versions."
+msgstr ""
+"<literal>list</literal> wird benutzt, um eine Paketliste anzuzeigen. Es "
+"unterstützt Shell-Muster zur Beschränkung auf passende Paketnamen. Die "
+"folgenden Optionen werden unterstützt: <option>--installed</option>, "
+"<option>--upgradable</option>, <option>--upgradeable</option>, <option>--all-"
+"versions</option>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>edit-sources</literal> lets you edit your sources.list file and "
+#| "provides basic sanity checks."

 msgid ""
 msgid ""

-"The &apt; commandline is designed as a end-user tool and it may change the "
-"output between versions. While it tries to not break backward compatibility "
-"there is no guarantee for it either.  All features of &apt; are available in "
-"&apt-cache; and &apt-get; via APT options. Please prefer using these "
-"commands in your scripts."
+"<literal>edit-sources</literal> lets you edit your &sources-list; files in "
+"your preferred texteditor while also providing basic sanity checks."

 msgstr ""
 msgstr ""

+"<literal>edit-sources</literal> ermöglicht die Bearbeitung Ihrer »sources."
+"list«-Datei und stellt grundlegende Plausibilitätsprüfungen bereit."

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

-#: apt.8.xml:144
-msgid "Differences to &apt-get;"
+#: apt.8.xml
+msgid "Script Usage and Differences from Other APT Tools"

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

-#: apt.8.xml:145
-msgid ""
-"The <command>apt</command> command is meant to be pleasant for end users and "
-"does not need to be backward compatilbe like &apt-get;. Therefore some "
-"options are different:"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:151
+#: apt.8.xml

 #, fuzzy
 #, fuzzy

-#| msgid "the <literal>Package:</literal> line"
-msgid "The option <literal>DPkgPM::Progress-Fancy</literal> is enabled."
-msgstr "die <literal>Package:</literal>-Zeile"
-
-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:155
-#, fuzzy
-#| msgid "the <literal>Component:</literal> line"
-msgid "The option <literal>APT::Color</literal> is enabled."
-msgstr "die <literal>Component:</literal>-Zeile"
+#| msgid ""
+#| "The &apt; commandline is designed as a end-user tool and it may change "
+#| "the output between versions. While it tries to not break backward "
+#| "compatibility there is no guarantee for it either.  All features of &apt; "
+#| "are available in &apt-cache; and &apt-get; via APT options. Please prefer "
+#| "using these commands in your scripts."
+msgid ""
+"The &apt; commandline is designed as an end-user tool and it may change "
+"behavior between versions. While it tries not to break backward "
+"compatibility this is not guaranteed either if a change seems beneficial for "
+"interactive use."
+msgstr ""
+"Die &apt;-Befehlszeile wurde als Endanwenderwerkzeug entworfen und kann bei "
+"Versionswechseln die Ausgabe ändern. Obwohl es versucht, nicht die "
+"Abwärtskompatibilität zu unterbrechen, kann sie nicht garantiert werden. "
+"Alle Funktionalitäten von &apt; sind in &apt-cache; und &apt-get; über APT-"
+"Optionen verfügbar. Bitte benutzen Sie vorzugsweise diese Befehle in Ihren "
+"Skripten."

 
 

-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:159
+#. type: Content of: <refentry><refsect1><para>
+#: apt.8.xml

 msgid ""
 msgid ""

-"A new <literal>list</literal> command is available similar to <literal>dpkg "
-"--list</literal>."
+"All features of &apt; are available in dedicated APT tools like &apt-get; "
+"and &apt-cache; as well.  &apt; just changes the default value of some "
+"options (see &apt-conf; and specifically the Binary scope). So you should "
+"prefer using these commands (potentially with some additional options "
+"enabled) in your scripts as they keep backward compatibility as much as "
+"possible."

 msgstr ""
 
 msgstr ""
 

-#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:164
-#, fuzzy
-#| msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
-msgid ""
-"The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
-"enabled by default."
-msgstr "die <literal>Archive:</literal>- oder <literal>Suite:</literal>-Zeile"
-

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

-#: apt.8.xml:174 apt-get.8.xml:558 apt-cache.8.xml:352 apt-key.8.xml:197
-#: apt-mark.8.xml:133 apt-secure.8.xml:193 apt-cdrom.8.xml:154
-#: apt-config.8.xml:111 apt.conf.5.xml:1227 apt_preferences.5.xml:707
-#: sources.list.5.xml:280 apt-extracttemplates.1.xml:72 apt-sortpkgs.1.xml:65
-#: apt-ftparchive.1.xml:609
+#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
+#: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml
+#: apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml

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

-#: apt.8.xml:175
-#, fuzzy
-#| msgid ""
-#| "&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-"
-#| "config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
-#| "preferences;, the APT Howto."
+#: apt.8.xml

 msgid ""
 "&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, The APT "
 "User's guide in &guidesdir;, &apt-preferences;, the APT Howto."
 msgstr ""
 msgid ""
 "&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, The APT "
 "User's guide in &guidesdir;, &apt-preferences;, the APT Howto."
 msgstr ""

-"&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, "
-"&apt-secure;, die APT-Benutzeranleitung in &guidesdir;, &apt-preferences;, "
-"das APT-Howto."
+"&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, die APT-"
+"Benutzeranleitung in &guidesdir;, &apt-preferences;, das APT-Howto."

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

-#: apt.8.xml:180 apt-get.8.xml:564 apt-cache.8.xml:357 apt-mark.8.xml:137
-#: apt-cdrom.8.xml:159 apt-config.8.xml:116 apt-extracttemplates.1.xml:76
-#: apt-sortpkgs.1.xml:69 apt-ftparchive.1.xml:613
+#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-cdrom.8.xml
+#: apt-config.8.xml apt-extracttemplates.1.xml apt-sortpkgs.1.xml
+#: apt-ftparchive.1.xml

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

-#: apt.8.xml:181
-#, fuzzy
-#| msgid ""
-#| "<command>apt-get</command> returns zero on normal operation, decimal 100 "
-#| "on error."
+#: apt.8.xml

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

-"<command>apt-get</command> gibt bei normalen Operationen 0 zurück, dezimal "
-"100 bei Fehlern."
+"<command>apt</command> gibt bei normalen Operationen 0 zurück, dezimal 100 "
+"bei Fehlern."

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

-#: apt-get.8.xml:35
+#: apt-get.8.xml

 msgid "APT package handling utility -- command-line interface"
 msgstr "APT-Werkzeug für den Umgang mit Paketen -- Befehlszeilenschnittstelle"
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "APT package handling utility -- command-line interface"
 msgstr "APT-Werkzeug für den Umgang mit Paketen -- Befehlszeilenschnittstelle"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-get.8.xml:41
+#: apt-get.8.xml

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


@@ -887,8 +949,8 @@ msgstr ""
 "Oberflächenschnittstellen, wie &aptitude;, &synaptic; und &wajig;."
 
 #. type: Content of: <refentry><refsect1><para>
 "Oberflächenschnittstellen, wie &aptitude;, &synaptic; und &wajig;."
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-get.8.xml:46 apt-cache.8.xml:46 apt-cdrom.8.xml:53 apt-config.8.xml:46
-#: apt-ftparchive.1.xml:56
+#: apt-get.8.xml apt-cache.8.xml apt-cdrom.8.xml apt-config.8.xml
+#: apt-ftparchive.1.xml

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


@@ -897,7 +959,7 @@ msgstr ""
 "angegeben ist, muss einer der unten aufgeführten Befehle vorkommen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "angegeben ist, muss einer der unten aufgeführten Befehle vorkommen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:51
+#: apt-get.8.xml

 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 "


@@ -921,7 +983,7 @@ msgstr ""
 "Größe der Pakete nicht im voraus bekannt ist."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Größe der Pakete nicht im voraus bekannt ist."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:63
+#: apt-get.8.xml

 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 "


@@ -947,7 +1009,7 @@ msgstr ""
 "get</command> die neuen Versionen der verfügbaren Pakete kennt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "get</command> die neuen Versionen der verfügbaren Pakete kennt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:76
+#: apt-get.8.xml

 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 "


@@ -972,7 +1034,7 @@ msgstr ""
 "überschreiben der allgemeinen Einstellungen für einzelne Pakete."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "überschreiben der allgemeinen Einstellungen für einzelne Pakete."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:89
+#: apt-get.8.xml

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


@@ -989,7 +1051,7 @@ msgstr ""
 "Installieren von neuen Paketen)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Installieren von neuen Paketen)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:100
+#: apt-get.8.xml

 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 "


@@ -1020,7 +1082,25 @@ msgstr ""
 "get getroffen wurden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "get getroffen wurden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:125
+#: apt-get.8.xml
+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 "
+"select. This will cause that version to be located and selected for install. "
+"Alternatively a specific distribution can be selected by following the "
+"package name with a slash and the version of the distribution or the Archive "
+"name (stable, testing, unstable)."
+msgstr ""
+"Eine bestimmte Version eines Paketes kann durch den Paketnamen gefolgt von "
+"einem Gleichheitszeichen und der Version des Paketes zur Installation "
+"ausgewählt werden. Dies bewirkt, dass diese Version gesucht und zum "
+"Installieren ausgewählt wird. Alternativ kann eine bestimmte Distribution "
+"durch den Paketnamen gefolgt von einem Schrägstrich und der Version der "
+"Distribution oder des Archivnamens (»stable«, »testing«, »unstable«) "
+"ausgewählt werden."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml

 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."


@@ -1029,7 +1109,7 @@ msgstr ""
 "durchführen und müssen mit Vorsicht gehandhabt werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "durchführen und müssen mit Vorsicht gehandhabt werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:128
+#: apt-get.8.xml

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


@@ -1039,7 +1119,7 @@ msgid ""
 "you wish to upgrade, and if a newer version is available, it (and its "
 "dependencies, as described above) will be downloaded and installed."
 msgstr ""
 "you wish to upgrade, and if a newer version is available, it (and its "
 "dependencies, as described above) will be downloaded and installed."
 msgstr ""

-"Dies ist außerdem die bevorzugt zu benutzende Art, wenn Sie Sie ein Upgrade "
+"Dies ist außerdem die bevorzugt zu benutzende Art, wenn Sie ein Upgrade "

 "eines oder mehrerer bereits installierter Pakete durchführen möchten, ohne "
 "ein Upgrade aller Pakete, die Sie auf Ihrem System haben, durchzuführen. "
 "Anders als das Ziel von »upgrade«, das die neusten Versionen aller aktuell "
 "eines oder mehrerer bereits installierter Pakete durchführen möchten, ohne "
 "ein Upgrade aller Pakete, die Sie auf Ihrem System haben, durchzuführen. "
 "Anders als das Ziel von »upgrade«, das die neusten Versionen aller aktuell "


@@ -1050,7 +1130,7 @@ msgstr ""
 "heruntergeladen und installiert."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "heruntergeladen und installiert."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:139
+#: apt-get.8.xml

 msgid ""
 "Finally, the &apt-preferences; mechanism allows you to create an alternative "
 "installation policy for individual packages."
 msgid ""
 "Finally, the &apt-preferences; mechanism allows you to create an alternative "
 "installation policy for individual packages."


@@ -1059,7 +1139,7 @@ msgstr ""
 "alternative Installationsrichtlinie für eigene Pakete zu erzeugen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "alternative Installationsrichtlinie für eigene Pakete zu erzeugen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:143
+#: apt-get.8.xml

 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 "


@@ -1079,7 +1159,22 @@ msgstr ""
 "Zeichen, um genauere reguläre Ausdruck zu erstellen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Zeichen, um genauere reguläre Ausdruck zu erstellen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:161
+#: apt-get.8.xml
+msgid ""
+"<literal>remove</literal> is identical to <literal>install</literal> except "
+"that packages are removed instead of installed. Note that removing a package "
+"leaves its configuration files on the system. If a plus sign is appended to "
+"the package name (with no intervening space), the identified package will be "
+"installed instead of removed."
+msgstr ""
+"<literal>remove</literal> ist identisch mit <literal>install</literal>, mit "
+"der Ausnahme, dass Pakete entfernt anstatt installiert werden. Beachten Sie, "
+"dass das Entfernen von Paketen deren Konfigurationsdateien im System "
+"belässt. Wenn ein Pluszeichen an den Paketnamen angehängt wird (ohne "
+"Leerzeichen dazwischen) wird das erkannte Paket installiert anstatt entfernt."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml

 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 "


@@ -1090,7 +1185,7 @@ msgstr ""
 "Konfigurationsdateien werden mitgelöscht)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Konfigurationsdateien werden mitgelöscht)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:166
+#: apt-get.8.xml

 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 "


@@ -1110,7 +1205,7 @@ msgstr ""
 "wurde, wenn möglich."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "wurde, wenn möglich."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:174
+#: apt-get.8.xml

 msgid ""
 "Source packages are tracked separately from binary packages via <literal>deb-"
 "src</literal> lines in the &sources-list; file. This means that you will "
 msgid ""
 "Source packages are tracked separately from binary packages via <literal>deb-"
 "src</literal> lines in the &sources-list; file. This means that you will "


@@ -1125,7 +1220,7 @@ msgstr ""
 "Versionen (zu alte/zu neue) oder überhaupt keine Quellpakete erhalten."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Versionen (zu alte/zu neue) oder überhaupt keine Quellpakete erhalten."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:180
+#: apt-get.8.xml

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


@@ -1140,7 +1235,7 @@ msgstr ""
 "angegeben ist, wird das Quellpaket nicht entpackt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "angegeben ist, wird das Quellpaket nicht entpackt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:187
+#: apt-get.8.xml

 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 "


@@ -1156,7 +1251,7 @@ msgstr ""
 "literal>-Option."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "literal>-Option."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:193
+#: apt-get.8.xml

 msgid ""
 "Note that source packages are not installed and tracked in the "
 "<command>dpkg</command> database like binary packages; they are simply "
 msgid ""
 "Note that source packages are not installed and tracked in the "
 "<command>dpkg</command> database like binary packages; they are simply "


@@ -1168,7 +1263,7 @@ msgstr ""
 "heruntergeladen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "heruntergeladen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

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

 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
 "attempt to satisfy the build dependencies for a source package. By default "
 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
 "attempt to satisfy the build dependencies for a source package. By default "


@@ -1184,7 +1279,7 @@ msgstr ""
 "angegeben werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "angegeben werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:206
+#: apt-get.8.xml

 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."
 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."


@@ -1193,7 +1288,7 @@ msgstr ""
 "Paketzwischenspeicher und prüft, ob beschädigte Abhängigkeiten vorliegen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Paketzwischenspeicher und prüft, ob beschädigte Abhängigkeiten vorliegen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:211
+#: apt-get.8.xml

 msgid ""
 "<literal>download</literal> will download the given binary package into the "
 "current directory."
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
 "current directory."


@@ -1202,7 +1297,7 @@ msgstr ""
 "Verzeichnis herunterladen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Verzeichnis herunterladen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:217
+#: apt-get.8.xml

 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 "


@@ -1214,8 +1309,18 @@ msgstr ""
 "<filename>&cachedir;/archives/</filename> und <filename>&cachedir;/archives/"
 "partial/</filename>."
 
 "<filename>&cachedir;/archives/</filename> und <filename>&cachedir;/archives/"
 "partial/</filename>."
 

+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml
+msgid "(and the"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt-get.8.xml
+msgid "alias since 1.1)"
+msgstr ""
+

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

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

 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 "


@@ -1235,7 +1340,7 @@ msgstr ""
 "sie auf »off« gesetzt ist."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "sie auf »off« gesetzt ist."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:234
+#: apt-get.8.xml

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


@@ -1246,17 +1351,23 @@ msgstr ""
 "erfüllen und die nicht mehr benötigt werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "erfüllen und die nicht mehr benötigt werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:239
-msgid ""
-"<literal>changelog</literal> downloads a package changelog and displays it "
-"through <command>sensible-pager</command>. The server name and base "
-"directory is defined in the <literal>APT::Changelogs::Server</literal> "
-"variable (e.g. <ulink url=\"http://packages.debian.org/changelogs\">packages."
-"debian.org/changelogs</ulink> for Debian or <ulink url=\"http://changelogs."
-"ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> for "
-"Ubuntu).  By default it displays the changelog for the version that is "
-"installed.  However, you can specify the same options as for the "
-"<option>install</option> command."
+#: apt-get.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>changelog</literal> downloads a package changelog and displays "
+#| "it through <command>sensible-pager</command>. The server name and base "
+#| "directory is defined in the <literal>APT::Changelogs::Server</literal> "
+#| "variable (e.g. <ulink url=\"http://packages.debian.org/changelogs"
+#| "\">packages.debian.org/changelogs</ulink> for Debian or <ulink url="
+#| "\"http://changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/"
+#| "changelogs</ulink> for Ubuntu).  By default it displays the changelog for "
+#| "the version that is installed.  However, you can specify the same options "
+#| "as for the <option>install</option> command."
+msgid ""
+"<literal>changelog</literal> tries to download the changelog of a package "
+"and displays it through <command>sensible-pager</command>.  By default it "
+"displays the changelog for the version that is installed.  However, you can "
+"specify the same options as for the <option>install</option> command."

 msgstr ""
 "<literal>changelog</literal> lädt ein Changelog eines Pakets herunter und "
 "zeigt es mit <command>sensible-pager</command> an. Der Servername und das "
 msgstr ""
 "<literal>changelog</literal> lädt ein Changelog eines Pakets herunter und "
 "zeigt es mit <command>sensible-pager</command> an. Der Servername und das "


@@ -1269,7 +1380,27 @@ msgstr ""
 "Befehl <option>install</option> angeben."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Befehl <option>install</option> angeben."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:262
+#: apt-get.8.xml
+msgid ""
+"Displays by default a deb822 formatted listing of information about all data "
+"files (aka index targets) <command>apt-get update</command> would download. "
+"Supports a <option>--format</option> option to modify the output format as "
+"well as accepts lines of the default output to filter the records by. The "
+"command is mainly used as an interface for external tools working with APT "
+"to get information as well as filenames for downloaded files so they can use "
+"them as well instead of downloading them again on their own. Detailed "
+"documentation is omitted here and can instead be found in the source tree in "
+"<literal><filename>doc/acquire-additional-files.txt</filename></literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-get.8.xml apt-cache.8.xml apt-config.8.xml apt-extracttemplates.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
+msgid "options"
+msgstr "Optionen"
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml

 msgid ""
 "Do not consider recommended packages as a dependency for installing.  "
 "Configuration Item: <literal>APT::Install-Recommends</literal>."
 msgid ""
 "Do not consider recommended packages as a dependency for installing.  "
 "Configuration Item: <literal>APT::Install-Recommends</literal>."


@@ -1278,7 +1409,7 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Install-Recommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Konfigurationselement: <literal>APT::Install-Recommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:267
+#: apt-get.8.xml

 msgid ""
 "Consider suggested packages as a dependency for installing.  Configuration "
 "Item: <literal>APT::Install-Suggests</literal>."
 msgid ""
 "Consider suggested packages as a dependency for installing.  Configuration "
 "Item: <literal>APT::Install-Suggests</literal>."


@@ -1287,7 +1418,7 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Install-Suggests</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Konfigurationselement: <literal>APT::Install-Suggests</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:272
+#: apt-get.8.xml

 msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
 msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."


@@ -1297,7 +1428,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:277
+#: apt-get.8.xml

 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 "


@@ -1326,7 +1457,7 @@ msgstr ""
 "<literal>APT::Get::Fix-Broken</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "<literal>APT::Get::Fix-Broken</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:292
+#: apt-get.8.xml

 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 "


@@ -1347,7 +1478,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

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

 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 "


@@ -1359,7 +1490,7 @@ msgstr ""
 "<literal>APT::Get::Download</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "<literal>APT::Get::Download</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

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

 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 "


@@ -1379,38 +1510,21 @@ msgstr ""
 "Konfigurationselement: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Konfigurationselement: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:325
+#: apt-get.8.xml

 msgid ""
 msgid ""

-"No action; perform a simulation of events that would occur but do not "
-"actually change the system.  Configuration Item: <literal>APT::Get::"
-"Simulate</literal>."
-msgstr ""
-"keine Aktion; führt eine Simulation von Ereignissen aus, die eintreten "
-"würden, aber das aktuelle System nicht verändern. Konfigurationselement: "
-"<literal>APT::Get::Simulate</literal>."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:329
-msgid ""
-"Simulated runs performed as a user will automatically deactivate locking "
-"(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::Get::"
-"Show-User-Simulation-Note</literal> is set (as it is by default) a notice "
-"will also be displayed indicating that this is only a simulation. Runs "
-"performed as root do not trigger either NoLocking or the notice - superusers "
-"should know what they are doing without further warnings from <literal>apt-"
-"get</literal>."
+"No action; perform a simulation of events that would occur based on the "
+"current system state but do not actually change the system. Locking will be "
+"disabled (<option>Debug::NoLocking</option>)  so the system state could "
+"change while <command>apt-get</command> is running. Simulations can also be "
+"executed by non-root users which might not have read access to all apt "
+"configuration distorting the simulation.  A notice expressing this warning "
+"is also shown by default for non-root users (<option>APT::Get::Show-User-"
+"Simulation-Note</option>).  Configuration Item: <literal>APT::Get::Simulate</"
+"literal>."

 msgstr ""
 msgstr ""

-"Simulierte Durchläufe als Benutzer werden automatisch das Sperren "
-"deaktivieren (<literal>Debug::NoLocking</literal>) und falls die Option "
-"<literal>APT::Get::Show-User-Simulation-Note</literal> gesetzt ist (was "
-"standardmäßig der Fall ist), wird außerdem eine Benachrichtigung angezeigt, "
-"die angibt, dass es sich hierbei nur um eine Simulation handelt. Simulierte "
-"Durchläufe als Root lösen weder NoLocking noch die Benachrichtigung aus – "
-"Superuser sollten ohne vorherige Warnung von <literal>apt-get</literal> "
-"wissen, was sie tun."

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

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

 msgid ""
 "Simulated runs print out a series of lines, each representing a "
 "<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
 msgid ""
 "Simulated runs print out a series of lines, each representing a "
 "<command>dpkg</command> operation: configure (<literal>Conf</literal>), "


@@ -1425,7 +1539,7 @@ msgstr ""
 "eckiger Klammern bedeutet Unterbrechungen, die keine Folgen haben (selten)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "eckiger Klammern bedeutet Unterbrechungen, die keine Folgen haben (selten)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

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

 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 "


@@ -1441,7 +1555,7 @@ msgstr ""
 "Get::Assume-Yes</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Get::Assume-Yes</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:353
+#: apt-get.8.xml

 msgid ""
 "Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
 "Assume-No</literal>."
 msgid ""
 "Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
 "Assume-No</literal>."


@@ -1450,7 +1564,7 @@ msgstr ""
 "Get::Assume-No</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Get::Assume-No</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:358
+#: apt-get.8.xml

 msgid ""
 "Show upgraded packages; print out a list of all packages that are to be "
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
 msgid ""
 "Show upgraded packages; print out a list of all packages that are to be "
 "upgraded.  Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."


@@ -1460,7 +1574,7 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Get::Show-Upgraded</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Konfigurationselement: <literal>APT::Get::Show-Upgraded</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:364
+#: apt-get.8.xml

 msgid ""
 "Show full versions for upgraded and installed packages.  Configuration Item: "
 "<literal>APT::Get::Show-Versions</literal>."
 msgid ""
 "Show full versions for upgraded and installed packages.  Configuration Item: "
 "<literal>APT::Get::Show-Versions</literal>."


@@ -1470,7 +1584,7 @@ msgstr ""
 "Versions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Versions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:370
+#: apt-get.8.xml

 msgid ""
 "This option controls the architecture packages are built for by <command>apt-"
 "get source --compile</command> and how cross-builddependencies are "
 msgid ""
 "This option controls the architecture packages are built for by <command>apt-"
 "get source --compile</command> and how cross-builddependencies are "


@@ -1487,7 +1601,7 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Get::Host-Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Konfigurationselement: <literal>APT::Get::Host-Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:380
+#: apt-get.8.xml

 msgid ""
 "This option controls the activated build profiles for which a source package "
 "is built by <command>apt-get source --compile</command> and how build "
 msgid ""
 "This option controls the activated build profiles for which a source package "
 "is built by <command>apt-get source --compile</command> and how build "


@@ -1503,7 +1617,7 @@ msgstr ""
 "Build-Profiles</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Build-Profiles</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:391
+#: apt-get.8.xml

 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."


@@ -1512,7 +1626,7 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Get::Compile</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Konfigurationselement: <literal>APT::Get::Compile</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:396
+#: apt-get.8.xml

 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 "


@@ -1526,7 +1640,7 @@ msgstr ""
 "<literal>APT::Ignore-Hold</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "<literal>APT::Ignore-Hold</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:403
+#: apt-get.8.xml

 msgid ""
 "Allow installing new packages when used in conjunction with "
 "<literal>upgrade</literal>.  This is useful if the update of a installed "
 msgid ""
 "Allow installing new packages when used in conjunction with "
 "<literal>upgrade</literal>.  This is useful if the update of a installed "


@@ -1546,7 +1660,7 @@ msgstr ""
 "wird.Konfigurationselement: <literal>APT::Get::Upgrade-Allow-New</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "wird.Konfigurationselement: <literal>APT::Get::Upgrade-Allow-New</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

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

 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 "


@@ -1560,7 +1674,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:422
+#: apt-get.8.xml

 msgid ""
 "Do not install new packages; when used in conjunction with <literal>install</"
 "literal>, <literal>only-upgrade</literal> will install upgrades for already "
 msgid ""
 "Do not install new packages; when used in conjunction with <literal>install</"
 "literal>, <literal>only-upgrade</literal> will install upgrades for already "


@@ -1574,13 +1688,87 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:430
+#: apt-get.8.xml
+#, fuzzy
+#| 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>."
+msgid ""
+"This is a dangerous option that will cause apt to continue without prompting "
+"if it is doing downgrades. It should not be used except in very special "
+"situations. Using it can potentially destroy your system! Configuration "
+"Item: <literal>APT::Get::allow-downgrades</literal>. Introduced in APT 1.1."
+msgstr ""
+"erzwingt »Ja«; Dies ist eine gefährliche Option, die APT veranlasst, ohne "
+"Nachfrage fortzufahren, wenn es etwas möglicherweise schädliches tut. Es "
+"sollte nicht benutzt werden, außer in ganz besonderen Situationen. "
+"<literal>force-yes</literal> zu benutzen, kann möglicherweise ihr System "
+"zerstören! Konfigurationselement: <literal>APT::Get::force-yes</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+#, fuzzy
+#| 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>."
+msgid ""
+"Force yes; this is a dangerous option that will cause apt to continue "
+"without prompting if it is removing essentials. It should not be used except "
+"in very special situations. Using it can potentially destroy your system! "
+"Configuration Item: <literal>APT::Get::allow-remove-essential</literal>. "
+"Introduced in APT 1.1."
+msgstr ""
+"erzwingt »Ja«; Dies ist eine gefährliche Option, die APT veranlasst, ohne "
+"Nachfrage fortzufahren, wenn es etwas möglicherweise schädliches tut. Es "
+"sollte nicht benutzt werden, außer in ganz besonderen Situationen. "
+"<literal>force-yes</literal> zu benutzen, kann möglicherweise ihr System "
+"zerstören! Konfigurationselement: <literal>APT::Get::force-yes</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+#, fuzzy
+#| 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>."
+msgid ""
+"Force yes; this is a dangerous option that will cause apt to continue "
+"without prompting if it is changing held packages. It should not be used "
+"except in very special situations. Using it can potentially destroy your "
+"system! Configuration Item: <literal>APT::Get::allow-change-held-packages</"
+"literal>. Introduced in APT 1.1."
+msgstr ""
+"erzwingt »Ja«; Dies ist eine gefährliche Option, die APT veranlasst, ohne "
+"Nachfrage fortzufahren, wenn es etwas möglicherweise schädliches tut. Es "
+"sollte nicht benutzt werden, außer in ganz besonderen Situationen. "
+"<literal>force-yes</literal> zu benutzen, kann möglicherweise ihr System "
+"zerstören! Konfigurationselement: <literal>APT::Get::force-yes</literal>."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+#, fuzzy
+#| 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>."

 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: "
 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>."
+"<literal>APT::Get::force-yes</literal>. This is deprecated and replaced by "
+"<option>--allow-downgrades</option>, <option>--allow-remove-essential</"
+"option>, <option>--allow-change-held-packages</option> in 1.1."

 msgstr ""
 "erzwingt »Ja«; Dies ist eine gefährliche Option, die APT veranlasst, ohne "
 "Nachfrage fortzufahren, wenn es etwas möglicherweise schädliches tut. Es "
 msgstr ""
 "erzwingt »Ja«; Dies ist eine gefährliche Option, die APT veranlasst, ohne "
 "Nachfrage fortzufahren, wenn es etwas möglicherweise schädliches tut. Es "


@@ -1589,7 +1777,7 @@ msgstr ""
 "zerstören! Konfigurationselement: <literal>APT::Get::force-yes</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "zerstören! Konfigurationselement: <literal>APT::Get::force-yes</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:438
+#: apt-get.8.xml

 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 "


@@ -1611,7 +1799,7 @@ msgstr ""
 "Get::Print-URIs</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Get::Print-URIs</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

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

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


@@ -1624,7 +1812,7 @@ msgstr ""
 "option>. Konfigurationselement: <literal>APT::Get::Purge</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "option>. Konfigurationselement: <literal>APT::Get::Purge</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:457
+#: apt-get.8.xml

 msgid ""
 "Re-install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
 msgid ""
 "Re-install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."


@@ -1633,7 +1821,7 @@ msgstr ""
 "Version haben. Konfigurationselement: <literal>APT::Get::ReInstall</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Version haben. Konfigurationselement: <literal>APT::Get::ReInstall</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:462
+#: apt-get.8.xml

 msgid ""
 "This option is on by default; use <literal>--no-list-cleanup</literal> to "
 "turn it off. When it is on, <command>apt-get</command> will automatically "
 msgid ""
 "This option is on by default; use <literal>--no-list-cleanup</literal> to "
 "turn it off. When it is on, <command>apt-get</command> will automatically "


@@ -1651,7 +1839,7 @@ msgstr ""
 "Get::List-Cleanup</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Get::List-Cleanup</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

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

 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 "


@@ -1676,7 +1864,7 @@ msgstr ""
 "auch die &apt-preferences;-Handbuchseite."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "auch die &apt-preferences;-Handbuchseite."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:487
+#: apt-get.8.xml

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


@@ -1690,7 +1878,7 @@ msgstr ""
 "Trivial-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Trivial-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:494
+#: apt-get.8.xml

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


@@ -1699,7 +1887,7 @@ msgstr ""
 "Nachfrage ab. Konfigurationselement: <literal>APT::Get::Remove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Nachfrage ab. Konfigurationselement: <literal>APT::Get::Remove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:500
+#: apt-get.8.xml

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


@@ -1713,7 +1901,7 @@ msgstr ""
 "AutomaticRemove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "AutomaticRemove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

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

 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 "


@@ -1732,7 +1920,7 @@ msgstr ""
 "Get::Only-Source</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Get::Only-Source</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

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

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


@@ -1744,7 +1932,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-get.8.xml:524
+#: apt-get.8.xml

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


@@ -1753,41 +1941,50 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Get::Arch-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Konfigurationselement: <literal>APT::Get::Arch-Only</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

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

 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "

-"is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
-"AllowUnauthenticated</literal>."
-msgstr ""
-"Ignoriert, wenn Pakete nicht authentifiziert werden können und nicht danach "
-"fragen. Dies ist für Werkzeuge wie pbuilder nützlich. Konfigurationselement: "
+"can be useful while working with local repositories, but is a huge security "
+"risk if data authenticity isn't ensured in another way by the user itself.  "
+"The usage of the <option>Trusted</option> option for &sources-list; entries "
+"should usually be preferred over this global override.  Configuration Item: "

 "<literal>APT::Get::AllowUnauthenticated</literal>."
 "<literal>APT::Get::AllowUnauthenticated</literal>."

+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml
+msgid ""
+"Forbid the update command to acquire unverifiable data from configured "
+"sources. Apt will fail at the update command for repositories without valid "
+"cryptographically signatures.  Configuration Item: <literal>Acquire::"
+"AllowInsecureRepositories</literal>."
+msgstr ""

 
 # FIXME s/Item/Items/
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 
 # FIXME s/Item/Items/
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

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

 msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
 "data see README.progress-reporting in the apt doc directory.  Configuration "
 msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
 "data see README.progress-reporting in the apt doc directory.  Configuration "

-"Item: <literal>DpkgPM::Progress</literal> and <literal>Dpkg::Progress-Fancy</"
+"Item: <literal>Dpkg::Progress</literal> and <literal>Dpkg::Progress-Fancy</"

 "literal>."
 msgstr ""
 "zeigt benutzerfreundliche Fortschrittsinformationen im Terminalfenster, wenn "
 "Pakete installiert beziehungsweise entfernt werden oder ein Upgrade "
 "durchgeführt wird. Informationen über eine maschinell auswertbare Version "
 "literal>."
 msgstr ""
 "zeigt benutzerfreundliche Fortschrittsinformationen im Terminalfenster, wenn "
 "Pakete installiert beziehungsweise entfernt werden oder ein Upgrade "
 "durchgeführt wird. Informationen über eine maschinell auswertbare Version "

-"dieser Daten finden Sie in README.progress-reporting im Apt-doc-Verzeichnis. "
-"Konfigurationselemente: <literal>DpkgPM::Progress</literal> und "
-"<literal>Dpkg::Progress-Fancy</literal>."
+"dieser Daten finden Sie in README.progress-reporting im Verzeichnis apt/doc. "
+"Konfigurationselemente: <literal>Dpkg::Progress</literal> und <literal>Dpkg::"
+"Progress-Fancy</literal>."

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

-#: apt-get.8.xml:548 apt-cache.8.xml:345 apt-key.8.xml:176 apt-mark.8.xml:127
-#: apt.conf.5.xml:1221 apt_preferences.5.xml:700
+#: apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml apt.conf.5.xml
+#: apt_preferences.5.xml

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

-#: apt-get.8.xml:559
+#: apt-get.8.xml

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


@@ -1798,7 +1995,7 @@ msgstr ""
 "das APT-Howto."
 
 #. type: Content of: <refentry><refsect1><para>
 "das APT-Howto."
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-get.8.xml:565
+#: apt-get.8.xml

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


@@ -1807,17 +2004,27 @@ msgstr ""
 "100 bei Fehlern."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 "100 bei Fehlern."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>

-#: apt-cache.8.xml:35
+#: apt-cache.8.xml

 msgid "query the APT cache"
 msgstr "den APT-Zwischenspeicher abfragen"
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "query the APT cache"
 msgstr "den APT-Zwischenspeicher abfragen"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-cache.8.xml:41
+#: apt-cache.8.xml
+#, fuzzy
+#| msgid ""
+#| "<command>apt-cache</command> performs a variety of operations on APT's "
+#| "package cache. <command>apt-cache</command> does not manipulate the state "
+#| "of the system but does provide operations to search and generate "
+#| "interesting output from the package metadata."

 msgid ""
 "<command>apt-cache</command> performs a variety of operations on APT's "
 "package cache. <command>apt-cache</command> does not manipulate the state of "
 "the system but does provide operations to search and generate interesting "
 msgid ""
 "<command>apt-cache</command> performs a variety of operations on APT's "
 "package cache. <command>apt-cache</command> does not manipulate the state of "
 "the system but does provide operations to search and generate interesting "

-"output from the package metadata."
+"output from the package metadata. The metadata is acquired and updated via "
+"the 'update' command of e.g. <command>apt-get</command>, so that it can be "
+"outdated if the last update is too long ago, but in exchange <command>apt-"
+"cache</command> works independently of the availability of the configured "
+"sources (e.g. offline)."

 msgstr ""
 "<command>apt-cache</command> führt eine Vielzahl von Operationen auf dem "
 "Paketzwischenspeicher von APT durch. <command>apt-cache</command> "
 msgstr ""
 "<command>apt-cache</command> führt eine Vielzahl von Operationen auf dem "
 "Paketzwischenspeicher von APT durch. <command>apt-cache</command> "


@@ -1825,7 +2032,7 @@ msgstr ""
 "und Generieren von interessanten Ausgaben der Paket-Metadaten bereit."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "und Generieren von interessanten Ausgaben der Paket-Metadaten bereit."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:51
+#: apt-cache.8.xml

 msgid ""
 "<literal>gencaches</literal> creates APT's package cache. This is done "
 "implicitly by all commands needing this cache if it is missing or outdated."
 msgid ""
 "<literal>gencaches</literal> creates APT's package cache. This is done "
 "implicitly by all commands needing this cache if it is missing or outdated."


@@ -1835,14 +2042,12 @@ msgstr ""
 "benötigen, falls er fehlt oder veraltet ist."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
 "benötigen, falls er fehlt oder veraltet ist."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>

-#: apt-cache.8.xml:55 apt-cache.8.xml:144 apt-cache.8.xml:165
-#: apt-cache.8.xml:187 apt-cache.8.xml:192 apt-cache.8.xml:208
-#: apt-cache.8.xml:226 apt-cache.8.xml:238
+#: apt-cache.8.xml

 msgid "&synopsis-pkg;"
 msgstr "&synopsis-pkg;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "&synopsis-pkg;"
 msgstr "&synopsis-pkg;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:56
+#: apt-cache.8.xml

 msgid ""
 "<literal>showpkg</literal> displays information about the packages listed on "
 "the command line. Remaining arguments are package names. The available "
 msgid ""
 "<literal>showpkg</literal> displays information about the packages listed on "
 "the command line. Remaining arguments are package names. The available "


@@ -1866,7 +2071,7 @@ msgstr ""
 "Ausgabe ähnlich der folgenden erzeugen:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
 "Ausgabe ähnlich der folgenden erzeugen:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>

-#: apt-cache.8.xml:68
+#: apt-cache.8.xml

 #, no-wrap
 msgid ""
 "Package: libreadline2\n"
 #, no-wrap
 msgid ""
 "Package: libreadline2\n"


@@ -1892,7 +2097,7 @@ msgstr ""
 "Reverse Provides: \n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Reverse Provides: \n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:80
+#: apt-cache.8.xml

 msgid ""
 "Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and "
 "ncurses3.0 which must be installed for libreadline2 to work.  In turn, "
 msgid ""
 "Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and "
 "ncurses3.0 which must be installed for libreadline2 to work.  In turn, "


@@ -1910,7 +2115,7 @@ msgstr ""
 "restlichen Ausgabe ist es am besten, den apt-Quelltext zu konsultieren."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "restlichen Ausgabe ist es am besten, den apt-Quelltext zu konsultieren."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:89
+#: apt-cache.8.xml

 msgid ""
 "<literal>stats</literal> displays some statistics about the cache.  No "
 "further arguments are expected. Statistics reported are:"
 msgid ""
 "<literal>stats</literal> displays some statistics about the cache.  No "
 "further arguments are expected. Statistics reported are:"


@@ -1919,7 +2124,7 @@ msgstr ""
 "Es werden keine weiteren Argumente erwartet. Berichtete Statistiken sind:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
 "Es werden keine weiteren Argumente erwartet. Berichtete Statistiken sind:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>

-#: apt-cache.8.xml:92
+#: apt-cache.8.xml

 msgid ""
 "<literal>Total package names</literal> is the number of package names found "
 "in the cache."
 msgid ""
 "<literal>Total package names</literal> is the number of package names found "
 "in the cache."


@@ -1928,7 +2133,7 @@ msgstr ""
 "Zwischenspeicher gefundenen Pakete."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
 "Zwischenspeicher gefundenen Pakete."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>

-#: apt-cache.8.xml:96
+#: apt-cache.8.xml

 msgid ""
 "<literal>Normal packages</literal> is the number of regular, ordinary "
 "package names; these are packages that bear a one-to-one correspondence "
 msgid ""
 "<literal>Normal packages</literal> is the number of regular, ordinary "
 "package names; these are packages that bear a one-to-one correspondence "


@@ -1942,7 +2147,7 @@ msgstr ""
 "Kategorie."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
 "Kategorie."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>

-#: apt-cache.8.xml:102
+#: apt-cache.8.xml

 msgid ""
 "<literal>Pure virtual packages</literal> is the number of packages that "
 "exist only as a virtual package name; that is, packages only \"provide\" the "
 msgid ""
 "<literal>Pure virtual packages</literal> is the number of packages that "
 "exist only as a virtual package name; that is, packages only \"provide\" the "


@@ -1959,7 +2164,7 @@ msgstr ""
 "bereit, aber es gibt kein Paket mit dem Namen »mail-transport-agent«."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
 "bereit, aber es gibt kein Paket mit dem Namen »mail-transport-agent«."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>

-#: apt-cache.8.xml:110
+#: apt-cache.8.xml

 msgid ""
 "<literal>Single virtual packages</literal> is the number of packages with "
 "only one package providing a particular virtual package. For example, in the "
 msgid ""
 "<literal>Single virtual packages</literal> is the number of packages with "
 "only one package providing a particular virtual package. For example, in the "


@@ -1972,7 +2177,7 @@ msgstr ""
 "aber nur ein Paket, xless, stellt »X11-text-viewer« bereit."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
 "aber nur ein Paket, xless, stellt »X11-text-viewer« bereit."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>

-#: apt-cache.8.xml:116
+#: apt-cache.8.xml

 msgid ""
 "<literal>Mixed virtual packages</literal> is the number of packages that "
 "either provide a particular virtual package or have the virtual package name "
 msgid ""
 "<literal>Mixed virtual packages</literal> is the number of packages that "
 "either provide a particular virtual package or have the virtual package name "


@@ -1985,7 +2190,7 @@ msgstr ""
 "tatsächliches Paket, wird aber auch vom Paket debconf-tiny bereitgestellt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
 "tatsächliches Paket, wird aber auch vom Paket debconf-tiny bereitgestellt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>

-#: apt-cache.8.xml:123
+#: apt-cache.8.xml

 msgid ""
 "<literal>Missing</literal> is the number of package names that were "
 "referenced in a dependency but were not provided by any package. Missing "
 msgid ""
 "<literal>Missing</literal> is the number of package names that were "
 "referenced in a dependency but were not provided by any package. Missing "


@@ -2001,11 +2206,17 @@ msgstr ""
 "Breaks-Angaben Bezug genommen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
 "Breaks-Angaben Bezug genommen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>

-#: apt-cache.8.xml:130
+#: apt-cache.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>Total distinct</literal> versions is the number of package "
+#| "versions found in the cache; this value is therefore at least equal to "
+#| "the number of total package names. If more than one distribution is being "
+#| "accessed (for instance, \"stable\" and \"unstable\"), this value can be "
+#| "considerably larger than the number of total package names."

 msgid ""
 "<literal>Total distinct</literal> versions is the number of package versions "
 msgid ""
 "<literal>Total distinct</literal> versions is the number of package versions "

-"found in the cache; this value is therefore at least equal to the number of "
-"total package names. If more than one distribution is being accessed (for "
+"found in the cache. If more than one distribution is being accessed (for "

 "instance, \"stable\" and \"unstable\"), this value can be considerably "
 "larger than the number of total package names."
 msgstr ""
 "instance, \"stable\" and \"unstable\"), this value can be considerably "
 "larger than the number of total package names."
 msgstr ""


@@ -2017,7 +2228,7 @@ msgstr ""
 "Paketnamen sein."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
 "Paketnamen sein."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>

-#: apt-cache.8.xml:137
+#: apt-cache.8.xml

 msgid ""
 "<literal>Total dependencies</literal> is the number of dependency "
 "relationships claimed by all of the packages in the cache."
 msgid ""
 "<literal>Total dependencies</literal> is the number of dependency "
 "relationships claimed by all of the packages in the cache."


@@ -2026,18 +2237,24 @@ msgstr ""
 "Abhängigkeitsbeziehungen, den alle Pakete im Zwischenspeicher beanspruchen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Abhängigkeitsbeziehungen, den alle Pakete im Zwischenspeicher beanspruchen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:145
+#: apt-cache.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>showsrc</literal> displays all the source package records that "
+#| "match the given package names. All versions are shown, as well as all "
+#| "records that declare the name to be a binary package."

 msgid ""
 "<literal>showsrc</literal> displays all the source package records that "
 "match the given package names. All versions are shown, as well as all "
 msgid ""
 "<literal>showsrc</literal> displays all the source package records that "
 "match the given package names. All versions are shown, as well as all "

-"records that declare the name to be a binary package."
+"records that declare the name to be a binary package. Use <option>--only-"
+"source</option> to display only source package names."

 msgstr ""
 "<literal>showsrc</literal> zeigt alle Quellpaketdatensätze, die den "
 "angegebenen Paketnamen entsprechen. Alle Versionen werden ebenso angezeigt, "
 "wie alle Datensätze, die den Namen für ein Binärpaket deklarieren."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgstr ""
 "<literal>showsrc</literal> zeigt alle Quellpaketdatensätze, die den "
 "angegebenen Paketnamen entsprechen. Alle Versionen werden ebenso angezeigt, "
 "wie alle Datensätze, die den Namen für ein Binärpaket deklarieren."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:151
+#: apt-cache.8.xml

 msgid ""
 "<literal>dump</literal> shows a short listing of every package in the cache. "
 "It is primarily for debugging."
 msgid ""
 "<literal>dump</literal> shows a short listing of every package in the cache. "
 "It is primarily for debugging."


@@ -2046,7 +2263,7 @@ msgstr ""
 "im Zwischenspeicher. Es dient in erster Linie der Fehlersuche."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "im Zwischenspeicher. Es dient in erster Linie der Fehlersuche."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:156
+#: apt-cache.8.xml

 msgid ""
 "<literal>dumpavail</literal> prints out an available list to stdout. This is "
 "suitable for use with &dpkg; and is used by the &dselect; method."
 msgid ""
 "<literal>dumpavail</literal> prints out an available list to stdout. This is "
 "suitable for use with &dpkg; and is used by the &dselect; method."


@@ -2056,7 +2273,7 @@ msgstr ""
 "benutzt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "benutzt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:161
+#: apt-cache.8.xml

 msgid ""
 "<literal>unmet</literal> displays a summary of all unmet dependencies in the "
 "package cache."
 msgid ""
 "<literal>unmet</literal> displays a summary of all unmet dependencies in the "
 "package cache."


@@ -2065,7 +2282,7 @@ msgstr ""
 "Abhängigkeiten im Paketzwischenspeicher."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Abhängigkeiten im Paketzwischenspeicher."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:166
+#: apt-cache.8.xml

 msgid ""
 "<literal>show</literal> performs a function similar to <command>dpkg --print-"
 "avail</command>; it displays the package records for the named packages."
 msgid ""
 "<literal>show</literal> performs a function similar to <command>dpkg --print-"
 "avail</command>; it displays the package records for the named packages."


@@ -2075,12 +2292,22 @@ msgstr ""
 "Pakete."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
 "Pakete."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>

-#: apt-cache.8.xml:171
+#: apt-cache.8.xml

 msgid "&synopsis-regex;"
 msgstr "&synopsis-regex;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "&synopsis-regex;"
 msgstr "&synopsis-regex;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:172
+#: apt-cache.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>search</literal> performs a full text search on all available "
+#| "package lists for the POSIX regex pattern given, see &regex;.  It "
+#| "searches the package names and the descriptions for an occurrence of the "
+#| "regular expression and prints out the package name and the short "
+#| "description, including virtual package names.  If <option>--full</option> "
+#| "is given then output identical to <literal>show</literal> is produced for "
+#| "each matched package, and if <option>--names-only</option> is given then "
+#| "the long description is not searched, only the package name is."

 msgid ""
 "<literal>search</literal> performs a full text search on all available "
 "package lists for the POSIX regex pattern given, see &regex;.  It searches "
 msgid ""
 "<literal>search</literal> performs a full text search on all available "
 "package lists for the POSIX regex pattern given, see &regex;.  It searches "


@@ -2089,7 +2316,7 @@ msgid ""
 "including virtual package names.  If <option>--full</option> is given then "
 "output identical to <literal>show</literal> is produced for each matched "
 "package, and if <option>--names-only</option> is given then the long "
 "including virtual package names.  If <option>--full</option> is given then "
 "output identical to <literal>show</literal> is produced for each matched "
 "package, and if <option>--names-only</option> is given then the long "

-"description is not searched, only the package name is."
+"description is not searched, only the package name and provided packages are."

 msgstr ""
 "<literal>search</literal> führt eine Volltextsuche in der Liste aller "
 "verfügbaren Pakete für das gegebene POSIX-regex-Muster durch, siehe &regex;. "
 msgstr ""
 "<literal>search</literal> führt eine Volltextsuche in der Liste aller "
 "verfügbaren Pakete für das gegebene POSIX-regex-Muster durch, siehe &regex;. "


@@ -2101,7 +2328,7 @@ msgstr ""
 "wird die lange Beschreibung nicht durchsucht, sondern nur der Paketname."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "wird die lange Beschreibung nicht durchsucht, sondern nur der Paketname."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

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

 msgid ""
 "Separate arguments can be used to specify multiple search patterns that are "
 "and'ed together."
 msgid ""
 "Separate arguments can be used to specify multiple search patterns that are "
 "and'ed together."


@@ -2110,7 +2337,7 @@ msgstr ""
 "die »und«-verknüpft werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "die »und«-verknüpft werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:188
+#: apt-cache.8.xml

 msgid ""
 "<literal>depends</literal> shows a listing of each dependency a package has "
 "and all the possible other packages that can fulfill that dependency."
 msgid ""
 "<literal>depends</literal> shows a listing of each dependency a package has "
 "and all the possible other packages that can fulfill that dependency."


@@ -2120,7 +2347,7 @@ msgstr ""
 "können."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "können."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:193
+#: apt-cache.8.xml

 msgid ""
 "<literal>rdepends</literal> shows a listing of each reverse dependency a "
 "package has."
 msgid ""
 "<literal>rdepends</literal> shows a listing of each reverse dependency a "
 "package has."


@@ -2129,12 +2356,12 @@ msgstr ""
 "Rückwärtsabhängigkeit, die ein Paket hat."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 "Rückwärtsabhängigkeit, die ein Paket hat."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-cache.8.xml:197
+#: apt-cache.8.xml

 msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 msgstr "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 msgstr "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:198
+#: apt-cache.8.xml

 msgid ""
 "This command prints the name of each package APT knows. The optional "
 "argument is a prefix match to filter the name list. The output is suitable "
 msgid ""
 "This command prints the name of each package APT knows. The optional "
 "argument is a prefix match to filter the name list. The output is suitable "


@@ -2149,7 +2376,7 @@ msgstr ""
 "besten mit der <option>--generate</option>-Option benutzt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "besten mit der <option>--generate</option>-Option benutzt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:203
+#: apt-cache.8.xml

 msgid ""
 "Note that a package which APT knows of is not necessarily available to "
 "download, installable or installed, e.g. virtual packages are also listed in "
 msgid ""
 "Note that a package which APT knows of is not necessarily available to "
 "download, installable or installed, e.g. virtual packages are also listed in "


@@ -2160,7 +2387,7 @@ msgstr ""
 "Pakete sind z.B. auch in der generierten Liste aufgeführt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Pakete sind z.B. auch in der generierten Liste aufgeführt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:209
+#: apt-cache.8.xml

 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
 "generates output suitable for use by dotty from the <ulink url=\"http://www."
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
 "generates output suitable for use by dotty from the <ulink url=\"http://www."


@@ -2182,7 +2409,7 @@ msgstr ""
 "GivenOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "GivenOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

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

 msgid ""
 "The resulting nodes will have several shapes; normal packages are boxes, "
 "pure virtual packages are triangles, mixed virtual packages are diamonds, "
 msgid ""
 "The resulting nodes will have several shapes; normal packages are boxes, "
 "pure virtual packages are triangles, mixed virtual packages are diamonds, "


@@ -2196,14 +2423,14 @@ msgstr ""
 "depends, grüne Linien sind Konflikte."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "depends, grüne Linien sind Konflikte."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

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

 msgid "Caution, dotty cannot graph larger sets of packages."
 msgstr ""
 "Vorsicht, dotty kann keine größeren Zusammenstellungen von Paketen grafisch "
 "darstellen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "Caution, dotty cannot graph larger sets of packages."
 msgstr ""
 "Vorsicht, dotty kann keine größeren Zusammenstellungen von Paketen grafisch "
 "darstellen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:227
+#: apt-cache.8.xml

 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
 "\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
 "\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."


@@ -2213,12 +2440,12 @@ msgstr ""
 "ulink>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 "ulink>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-cache.8.xml:231
+#: apt-cache.8.xml

 msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 msgstr "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 msgstr "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:232
+#: apt-cache.8.xml

 msgid ""
 "<literal>policy</literal> is meant to help debug issues relating to the "
 "preferences file. With no arguments it will print out the priorities of each "
 msgid ""
 "<literal>policy</literal> is meant to help debug issues relating to the "
 "preferences file. With no arguments it will print out the priorities of each "


@@ -2231,7 +2458,7 @@ msgstr ""
 "Informationen über die Prioritätenauswahl der genannten Pakete aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Informationen über die Prioritätenauswahl der genannten Pakete aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:239
+#: apt-cache.8.xml

 msgid ""
 "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
 "to mimic the output format and a subset of the functionality of the Debian "
 msgid ""
 "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
 "to mimic the output format and a subset of the functionality of the Debian "


@@ -2250,7 +2477,7 @@ msgstr ""
 "(<literal>APT::Architecture</literal>)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "(<literal>APT::Architecture</literal>)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:255
+#: apt-cache.8.xml

 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
 "cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
 "cache used by all operations.  Configuration Item: <literal>Dir::Cache::"


@@ -2262,7 +2489,7 @@ msgstr ""
 "pkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "pkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:261
+#: apt-cache.8.xml

 msgid ""
 "Select the file to store the source cache. The source is used only by "
 "<literal>gencaches</literal> and it stores a parsed version of the package "
 msgid ""
 "Select the file to store the source cache. The source is used only by "
 "<literal>gencaches</literal> and it stores a parsed version of the package "


@@ -2279,7 +2506,7 @@ msgstr ""
 "srcpkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "srcpkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:269
+#: apt-cache.8.xml

 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quietness up to a maximum of 2. You can also use "
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quietness up to a maximum of 2. You can also use "


@@ -2293,7 +2520,7 @@ msgstr ""
 "Konfigurationselement: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Konfigurationselement: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

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

 msgid ""
 "Print only important dependencies; for use with <literal>unmet</literal> and "
 "<literal>depends</literal>. Causes only Depends and Pre-Depends relations to "
 msgid ""
 "Print only important dependencies; for use with <literal>unmet</literal> and "
 "<literal>depends</literal>. Causes only Depends and Pre-Depends relations to "


@@ -2305,9 +2532,16 @@ msgstr ""
 "<literal>APT::Cache::Important</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "<literal>APT::Cache::Important</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:290
+#: apt-cache.8.xml
+#, fuzzy
+#| msgid ""
+#| "Per default the <literal>depends</literal> and <literal>rdepends</"
+#| "literal> print all dependencies. This can be tweaked with these flags "
+#| "which will omit the specified dependency type.  Configuration Item: "
+#| "<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></"
+#| "literal> e.g. <literal>APT::Cache::ShowRecommends</literal>."

 msgid ""
 msgid ""

-"Per default the <literal>depends</literal> and <literal>rdepends</literal> "
+"Per default the <command>depends</command> and <command>rdepends</command> "

 "print all dependencies. This can be tweaked with these flags which will omit "
 "the specified dependency type.  Configuration Item: <literal>APT::Cache::"
 "Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
 "print all dependencies. This can be tweaked with these flags which will omit "
 "the specified dependency type.  Configuration Item: <literal>APT::Cache::"
 "Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"


@@ -2321,7 +2555,19 @@ msgstr ""
 "Cache::ShowRecommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Cache::ShowRecommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:297
+#: apt-cache.8.xml
+msgid ""
+"Per default <command>depends</command> and <command>rdepends</command> print "
+"only dependencies explicitly expressed in the metadata. With this flag it "
+"will also show dependencies implicitely added based on the encountered "
+"data.  A <literal>Conflicts: foo</literal> e.g. expresses implicitely that "
+"this package also conflicts with the package foo from any other "
+"architecture.  Configuration Item: <literal>APT::Cache::ShowImplicit</"
+"literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml

 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."


@@ -2330,7 +2576,7 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Cache::ShowFull</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Konfigurationselement: <literal>APT::Cache::ShowFull</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:302
+#: apt-cache.8.xml

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


@@ -2347,7 +2593,7 @@ msgstr ""
 "anwendbar. Konfigurationselement: <literal>APT::Cache::AllVersions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "anwendbar. Konfigurationselement: <literal>APT::Cache::AllVersions</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:311
+#: apt-cache.8.xml

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


@@ -2359,16 +2605,20 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Cache::Generate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Konfigurationselement: <literal>APT::Cache::Generate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:317
+#: apt-cache.8.xml
+#, fuzzy
+#| msgid ""
+#| "Only search on the package names, not the long descriptions.  "
+#| "Configuration Item: <literal>APT::Cache::NamesOnly</literal>."

 msgid ""
 msgid ""

-"Only search on the package names, not the long descriptions.  Configuration "
-"Item: <literal>APT::Cache::NamesOnly</literal>."
+"Only search on the package and provided package names, not the long "
+"descriptions.  Configuration Item: <literal>APT::Cache::NamesOnly</literal>."

 msgstr ""
 "durchsucht nur die Paketnamen, nicht die Langbeschreibungen. "
 "Konfigurationselement: <literal>APT::Cache::NamesOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgstr ""
 "durchsucht nur die Paketnamen, nicht die Langbeschreibungen. "
 "Konfigurationselement: <literal>APT::Cache::NamesOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:322
+#: apt-cache.8.xml

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


@@ -2379,7 +2629,7 @@ msgstr ""
 "<literal>APT::Cache::AllNames</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "<literal>APT::Cache::AllNames</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:328
+#: apt-cache.8.xml

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


@@ -2390,7 +2640,7 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Cache::RecurseDepends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Konfigurationselement: <literal>APT::Cache::RecurseDepends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cache.8.xml:335
+#: apt-cache.8.xml

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


@@ -2401,12 +2651,12 @@ msgstr ""
 "<literal>APT::Cache::Installed</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
 "<literal>APT::Cache::Installed</literal>."
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-cache.8.xml:353
+#: apt-cache.8.xml

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

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

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


@@ -2415,12 +2665,12 @@ msgstr ""
 "100 bei Fehlern."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 "100 bei Fehlern."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>

-#: apt-key.8.xml:34
+#: apt-key.8.xml

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

-#: apt-key.8.xml:41
+#: apt-key.8.xml

 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 "


@@ -2432,12 +2682,12 @@ msgstr ""
 "vertrauenswürdig betrachtet."
 
 #. type: Content of: <refentry><refsect1><title>
 "vertrauenswürdig betrachtet."
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt-key.8.xml:47
+#: apt-key.8.xml

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

-#: apt-key.8.xml:52
+#: apt-key.8.xml

 msgid ""
 "Add a new key to the list of trusted keys.  The key is read from the "
 "filename given with the parameter &synopsis-param-filename; or if the "
 msgid ""
 "Add a new key to the list of trusted keys.  The key is read from the "
 "filename given with the parameter &synopsis-param-filename; or if the "


@@ -2448,42 +2698,50 @@ msgstr ""
 "Dateiname <literal>-</literal> ist, von der Standardeingabe."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Dateiname <literal>-</literal> ist, von der Standardeingabe."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-key.8.xml:65
+#: apt-key.8.xml
+msgid ""
+"It is critical that keys added manually via <command>apt-key</command> are "
+"verified to belong to the owner of the repositories they claim to be for "
+"otherwise the &apt-secure; infrastructure is completely undermined."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-key.8.xml

 msgid "Remove a key from the list of trusted keys."
 msgstr ""
 "entfernt einen Schlüssel von der Liste der vertrauenswürdigen Schlüssel."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "Remove a key from the list of trusted keys."
 msgstr ""
 "entfernt einen Schlüssel von der Liste der vertrauenswürdigen Schlüssel."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-key.8.xml:76
+#: apt-key.8.xml

 msgid "Output the key &synopsis-param-keyid; to standard output."
 msgstr "gibt den Schlüssel &synopsis-param-keyid; auf der Standardausgabe aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "Output the key &synopsis-param-keyid; to standard output."
 msgstr "gibt den Schlüssel &synopsis-param-keyid; auf der Standardausgabe aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-key.8.xml:87
+#: apt-key.8.xml

 msgid "Output all trusted keys to standard output."
 msgstr "gibt alle vertrauenswürdigen Schlüssel auf der Standardausgabe aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "Output all trusted keys to standard output."
 msgstr "gibt alle vertrauenswürdigen Schlüssel auf der Standardausgabe aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-key.8.xml:98
+#: apt-key.8.xml

 msgid "List trusted keys."
 msgstr "listet vertrauenswürdige Schlüssel auf."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "List trusted keys."
 msgstr "listet vertrauenswürdige Schlüssel auf."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-key.8.xml:109
+#: apt-key.8.xml

 msgid "List fingerprints of trusted keys."
 msgstr "listet Fingerabdrücke vertrauenswürdiger Schlüssel auf."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "List fingerprints of trusted keys."
 msgstr "listet Fingerabdrücke vertrauenswürdiger Schlüssel auf."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-key.8.xml:120
+#: apt-key.8.xml

 msgid ""
 msgid ""

-"Pass advanced options to gpg. With adv --recv-key you can download the "
-"public key."
+"Pass advanced options to gpg. With <command>adv --recv-key</command> you can "
+"e.g. download key from keyservers directly into the the trusted set of keys. "
+"Note that there are <emphasis>no</emphasis> checks performed, so it is easy "
+"to completely undermine the &apt-secure; infrastructure if used without care."

 msgstr ""
 msgstr ""

-"leitet erweitere Optionen an gpg weiter. Mit adv --recv-key können Sie den "
-"öffentlichen Schlüssel herunterladen."

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

-#: apt-key.8.xml:132
+#: apt-key.8.xml

 msgid ""
 "Update the local keyring with the archive keyring and remove from the local "
 "keyring the archive keys which are no longer valid.  The archive keyring is "
 msgid ""
 "Update the local keyring with the archive keyring and remove from the local "
 "keyring the archive keys which are no longer valid.  The archive keyring is "


@@ -2497,7 +2755,7 @@ msgstr ""
 "package; in &keyring-distro;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "package; in &keyring-distro;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-key.8.xml:146
+#: apt-key.8.xml

 msgid ""
 "Perform an update working similarly to the <command>update</command> command "
 "above, but get the archive keyring from a URI instead and validate it "
 msgid ""
 "Perform an update working similarly to the <command>update</command> command "
 "above, but get the archive keyring from a URI instead and validate it "


@@ -2515,12 +2773,12 @@ msgstr ""
 "Ubuntu funktioniert dies aber."
 
 #. type: Content of: <refentry><refsect1><title>
 "Ubuntu funktioniert dies aber."
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt-key.8.xml:162 apt-cdrom.8.xml:82
+#: apt-key.8.xml apt-mark.8.xml apt-cdrom.8.xml

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

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

 msgid ""
 "Note that options need to be defined before the commands described in the "
 "previous section."
 msgid ""
 "Note that options need to be defined before the commands described in the "
 "previous section."


@@ -2529,7 +2787,7 @@ msgstr ""
 "Befehlen definiert sein müssen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Befehlen definiert sein müssen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

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

 msgid ""
 "With this option it is possible to specify a particular keyring file the "
 "command should operate on. The default is that a command is executed on the "
 msgid ""
 "With this option it is possible to specify a particular keyring file the "
 "command should operate on. The default is that a command is executed on the "


@@ -2546,67 +2804,82 @@ msgstr ""
 "Schlüssel werden zu diesem hinzugefügt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 "Schlüssel werden zu diesem hinzugefügt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-key.8.xml:181
+#: apt-key.8.xml

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

-#: apt-key.8.xml:182
+#: apt-key.8.xml

 msgid "Local trust database of archive keys."
 msgstr "lokale Datenbank vertrauenswürdiger Archivschlüssel"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid "Local trust database of archive keys."
 msgstr "lokale Datenbank vertrauenswürdiger Archivschlüssel"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-key.8.xml:185
+#: apt-key.8.xml

 msgid "&keyring-filename;"
 msgstr "&keyring-filename;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "&keyring-filename;"
 msgstr "&keyring-filename;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-key.8.xml:186
+#: apt-key.8.xml

 msgid "Keyring of &keyring-distro; archive trusted keys."
 msgstr ""
 "Schlüsselbund vertrauenswürdiger Schlüssel des &keyring-distro;-Archivs"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 msgid "Keyring of &keyring-distro; archive trusted keys."
 msgstr ""
 "Schlüsselbund vertrauenswürdiger Schlüssel des &keyring-distro;-Archivs"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>

-#: apt-key.8.xml:189
+#: apt-key.8.xml

 msgid "&keyring-removed-filename;"
 msgstr "&keyring-removed-filename;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "&keyring-removed-filename;"
 msgstr "&keyring-removed-filename;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-key.8.xml:190
+#: apt-key.8.xml

 msgid "Keyring of &keyring-distro; archive removed trusted keys."
 msgstr ""
 "Schlüsselbund entfernter vertrauenswürdiger Schlüssel des &keyring-distro;-"
 "Archivs"
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "Keyring of &keyring-distro; archive removed trusted keys."
 msgstr ""
 "Schlüsselbund entfernter vertrauenswürdiger Schlüssel des &keyring-distro;-"
 "Archivs"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-key.8.xml:199
+#: apt-key.8.xml

 msgid "&apt-get;, &apt-secure;"
 msgstr "&apt-get;, &apt-secure;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 msgid "&apt-get;, &apt-secure;"
 msgstr "&apt-get;, &apt-secure;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>

-#: apt-mark.8.xml:35
-msgid "mark/unmark a package as being automatically-installed"
+#: apt-mark.8.xml
+msgid "show, set and unset various settings for a package"

 msgstr ""
 msgstr ""

-"ein Paket als automatisch installiert markieren oder diese Markierung "
-"entfernen"

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

-#: apt-mark.8.xml:41
+#: apt-mark.8.xml

 msgid ""
 msgid ""

-"<command>apt-mark</command> will change whether a package has been marked as "
-"being automatically installed."
+"<command>apt-mark</command> can be used as a unified front-end to set "
+"various settings for a package, such as marking a package as being "
+"automatically/manually installed or changing <command>dpkg</command> "
+"selections such as hold, install, deinstall and purge which are respected e."
+"g. by <command>apt-get dselect-upgrade</command> or <command>aptitude</"
+"command>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Automatically and Manually Installed Packages"

 msgstr ""
 msgstr ""

-"<command>apt-mark</command> wird ändern, ob ein Paket als automatisch "
-"installiert markiert ist."

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

-#: apt-mark.8.xml:45
+#: apt-mark.8.xml
+#, fuzzy
+#| msgid ""
+#| "When you request that a package is installed, and as a result other "
+#| "packages are installed to satisfy its dependencies, the dependencies are "
+#| "marked as being automatically installed.  Once these automatically "
+#| "installed packages are no longer depended on by any manually installed "
+#| "packages, they will be removed by e.g.  <command>apt-get</command> or "
+#| "<command>aptitude</command>."

 msgid ""
 "When you request that a package is installed, and as a result other packages "
 "are installed to satisfy its dependencies, the dependencies are marked as "
 msgid ""
 "When you request that a package is installed, and as a result other packages "
 "are installed to satisfy its dependencies, the dependencies are marked as "

-"being automatically installed.  Once these automatically installed packages "
-"are no longer depended on by any manually installed packages, they will be "
-"removed by e.g.  <command>apt-get</command> or <command>aptitude</command>."
+"being automatically installed, while the package you installed explicitly is "
+"marked as manually installed.  Once an automatically installed package is no "
+"longer depended on by any manually installed package it is considered no "
+"longer needed and e.g. <command>apt-get</command> or <command>aptitude</"
+"command> will at least suggest removing them."

 msgstr ""
 "Wenn Sie die Installation eines Paketes anfordern und andere Pakete "
 "installiert werden, um dessen Abhängigkeiten zu erfüllen, werden die "
 msgstr ""
 "Wenn Sie die Installation eines Paketes anfordern und andere Pakete "
 "installiert werden, um dessen Abhängigkeiten zu erfüllen, werden die "


@@ -2616,7 +2889,7 @@ msgstr ""
 "<command>aptitude</command> entfernt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "<command>aptitude</command> entfernt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-mark.8.xml:54
+#: apt-mark.8.xml

 msgid ""
 "<literal>auto</literal> is used to mark a package as being automatically "
 "installed, which will cause the package to be removed when no more manually "
 msgid ""
 "<literal>auto</literal> is used to mark a package as being automatically "
 "installed, which will cause the package to be removed when no more manually "


@@ -2627,7 +2900,7 @@ msgstr ""
 "keine manuell installierten Pakete von ihm abhängen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "keine manuell installierten Pakete von ihm abhängen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-mark.8.xml:62
+#: apt-mark.8.xml

 msgid ""
 "<literal>manual</literal> is used to mark a package as being manually "
 "installed, which will prevent the package from being automatically removed "
 msgid ""
 "<literal>manual</literal> is used to mark a package as being manually "
 "installed, which will prevent the package from being automatically removed "


@@ -2638,32 +2911,7 @@ msgstr ""
 "kein anderes Paket von ihm abhängt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "kein anderes Paket von ihm abhängt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-mark.8.xml:70
-msgid ""
-"<literal>hold</literal> is used to mark a package as held back, which will "
-"prevent the package from being automatically installed, upgraded or "
-"removed.  The command is only a wrapper around <command>dpkg --set-"
-"selections</command> and the state is therefore maintained by &dpkg; and not "
-"affected by the <option>--file</option> option."
-msgstr ""
-"<literal>hold</literal> wird benutzt, um ein Paket als zurückgehalten zu "
-"markieren, was verhindert, dass das Paket automatisch installiert, ein "
-"Upgrade davon durchgeführt oder es entfernt wird. Der Befehl ist nur ein "
-"Wrapper um <command>dpkg --set-selections</command> und der Status wird "
-"daher durch &dpkg; verwaltet und nicht durch die Option <option>--file</"
-"option>."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:80
-msgid ""
-"<literal>unhold</literal> is used to cancel a previously set hold on a "
-"package to allow all actions again."
-msgstr ""
-"<literal>unhold</literal> wird benutzt, um ein vorher gesetztes »hold« auf "
-"ein Paket aufzuheben, um alle Aktionen wieder zu erlauben."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:86
+#: apt-mark.8.xml

 msgid ""
 "<literal>showauto</literal> is used to print a list of automatically "
 "installed packages with each package on a new line.  All automatically "
 msgid ""
 "<literal>showauto</literal> is used to print a list of automatically "
 "installed packages with each package on a new line.  All automatically "


@@ -2677,7 +2925,7 @@ msgstr ""
 "die automatisch installiert wurden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "die automatisch installiert wurden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-mark.8.xml:94
+#: apt-mark.8.xml

 msgid ""
 "<literal>showmanual</literal> can be used in the same way as "
 "<literal>showauto</literal> except that it will print a list of manually "
 msgid ""
 "<literal>showmanual</literal> can be used in the same way as "
 "<literal>showauto</literal> except that it will print a list of manually "


@@ -2687,17 +2935,8 @@ msgstr ""
 "<literal>showauto</literal> benutzt werden, mit der Ausnahme, dass es "
 "stattdessen eine Liste manuell installierter Pakete ausgibt."
 
 "<literal>showauto</literal> benutzt werden, mit der Ausnahme, dass es "
 "stattdessen eine Liste manuell installierter Pakete ausgibt."
 

-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:101
-msgid ""
-"<literal>showhold</literal> is used to print a list of packages on hold in "
-"the same way as for the other show commands."
-msgstr ""
-"<literal>showhold</literal> wird benutzt, um eine Liste auf »hold« gesetzter "
-"Pakete auf die gleiche Art wie für andere Anzeigebefehle auszugeben."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:117
+#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml

 msgid ""
 "Read/Write package stats from the filename given with the parameter "
 "&synopsis-param-filename; instead of from the default location, which is "
 msgid ""
 "Read/Write package stats from the filename given with the parameter "
 "&synopsis-param-filename; instead of from the default location, which is "


@@ -2709,8 +2948,64 @@ msgstr ""
 "<filename>extended_status</filename> im von Konfigurationselement "
 "<literal>Dir::State</literal> definierten Verzeichnis, ist."
 
 "<filename>extended_status</filename> im von Konfigurationselement "
 "<literal>Dir::State</literal> definierten Verzeichnis, ist."
 

+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Prevent Changes for a Package"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>manual</literal> is used to mark a package as being manually "
+#| "installed, which will prevent the package from being automatically "
+#| "removed if no other packages depend on it."
+msgid ""
+"<literal>hold</literal> is used to mark a package as held back, which will "
+"prevent the package from being automatically installed, upgraded or removed."
+msgstr ""
+"<literal>manual</literal> wird benutzt, um ein Paket als manuell installiert "
+"zu markieren, was verhindert, dass das Paket automatisch entfernt wird, wenn "
+"kein anderes Paket von ihm abhängt."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+msgid ""
+"<literal>unhold</literal> is used to cancel a previously set hold on a "
+"package to allow all actions again."
+msgstr ""
+"<literal>unhold</literal> wird benutzt, um ein vorher gesetztes »hold« auf "
+"ein Paket aufzuheben, um alle Aktionen wieder zu erlauben."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-mark.8.xml
+msgid ""
+"<literal>showhold</literal> is used to print a list of packages on hold in "
+"the same way as for the other show commands."
+msgstr ""
+"<literal>showhold</literal> wird benutzt, um eine Liste auf »hold« gesetzter "
+"Pakete auf die gleiche Art wie für andere Anzeigebefehle auszugeben."
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt-mark.8.xml
+msgid "Schedule Packages for Install, Remove and Purge"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-mark.8.xml
+msgid ""
+"Some front-ends like <command>apt-get dselect-upgrade</command> can be used "
+"to apply previously scheduled changes to the install state of packages. Such "
+"changes can be scheduled with the <option>install</option>, <option>remove</"
+"option> (also known as <option>deinstall</option>) and <option>purge</"
+"option> commands.  Packages with a specific selection can be displayed with "
+"<option>showinstall</option>, <option>showremove</option> and "
+"<option>showpurge</option> respectively.  More information about these so "
+"called dpkg selections can be found in &dpkg;."
+msgstr ""
+

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

-#: apt-mark.8.xml:138
+#: apt-mark.8.xml

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


@@ -2719,17 +3014,23 @@ msgstr ""
 "Fehlern nicht Null."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 "Fehlern nicht Null."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>

-#: apt-secure.8.xml:49
+#: apt-secure.8.xml

 msgid "Archive authentication support for APT"
 msgstr "Archivauthentifizierungsunterstützung für APT"
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "Archive authentication support for APT"
 msgstr "Archivauthentifizierungsunterstützung für APT"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-secure.8.xml:54
+#: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "Starting with version 0.6, <command>apt</command> contains code that does "
+#| "signature checking of the Release file for all archives. This ensures "
+#| "that packages in the archive can't be modified by people who have no "
+#| "access to the Release file signing key."

 msgid ""
 msgid ""

-"Starting with version 0.6, <command>apt</command> contains code that does "
-"signature checking of the Release file for all archives. This ensures that "
-"packages in the archive can't be modified by people who have no access to "
-"the Release file signing key."
+"Starting with version 0.6, <command>APT</command> contains code that does "
+"signature checking of the Release file for all repositories. This ensures "
+"that data like packages in the archive can't be modified by people who have "
+"no access to the Release file signing key."

 msgstr ""
 "Beginnend mit Version 0.6 enthält <command>apt</command> Code, der die "
 "Signatur der Release-Datei für alle Archive prüft. Dies stellt sicher, dass "
 msgstr ""
 "Beginnend mit Version 0.6 enthält <command>apt</command> Code, der die "
 "Signatur der Release-Datei für alle Archive prüft. Dies stellt sicher, dass "


@@ -2737,39 +3038,58 @@ msgstr ""
 "auf den Signierschlüssel der Release-Datei haben."
 
 #. type: Content of: <refentry><refsect1><para>
 "auf den Signierschlüssel der Release-Datei haben."
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-secure.8.xml:62
+#: apt-secure.8.xml
+msgid ""
+"If an archive has an unsigned Release file or no Release file at all current "
+"APT versions will raise a warning in <command>update</command> operations "
+"and front-ends like <command>apt-get</command> will require explicit "
+"confirmation if an installation request includes a package from such an "
+"unauthenticated archive."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-secure.8.xml

 msgid ""
 msgid ""

-"If a package comes from a archive without a signature, or with a signature "
-"that apt does not have a key for, that package is considered untrusted, and "
-"installing it will result in a big warning. <command>apt-get</command> will "
-"currently only warn for unsigned archives; future releases might force all "
-"sources to be verified before downloading packages from them."
+"In the future APT will refuse to work with unauthenticated repositories by "
+"default until support for them is removed entirely. Users have the option to "
+"opt-in to this behavior already by setting the configuration option "
+"<option>Acquire::AllowInsecureRepositories</option> to <literal>false</"
+"literal>."

 msgstr ""
 msgstr ""

-"Wenn ein Paket aus einem Archiv ohne Signatur stammt oder einem mit "
-"Signatur, für das APT keinen Schlüssel hat, wird dieses Paket als nicht "
-"vertrauenswürdig angesehen und es zu installieren, führt zu einer großen "
-"Warnung. <command>apt-get</command> wird aktuell nur bei nicht signierten "
-"Archiven warnen, zukünftige Releases könnten die Prüfung aller Quellen vor "
-"dem Herunterladen von Paketen von dort erzwingen."

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

-#: apt-secure.8.xml:71
+#: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "The package front-ends &apt-get;, &aptitude; and &synaptic; support this "
+#| "new authentication feature."

 msgid ""
 msgid ""

-"The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
-"authentication feature."
+"Note: All APT-based package management front-ends like &apt-get;, &aptitude; "
+"and &synaptic; support this authentication feature, so this manpage uses "
+"<literal>APT</literal> to refer to them all for simplicity only."

 msgstr ""
 "Die Paketoberflächen &apt-get;, &aptitude; und &synaptic; unterstützen diese "
 "neue Authentifizierungsfunktion."
 
 #. type: Content of: <refentry><refsect1><title>
 msgstr ""
 "Die Paketoberflächen &apt-get;, &aptitude; und &synaptic; unterstützen diese "
 "neue Authentifizierungsfunktion."
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt-secure.8.xml:76
-msgid "Trusted archives"
+#: apt-secure.8.xml
+#, fuzzy
+#| msgid "Trusted archives"
+msgid "Trusted Repositories"

 msgstr "Vertrauenswürdige Archive"
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr "Vertrauenswürdige Archive"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-secure.8.xml:79
-msgid ""
-"The chain of trust from an apt archive to the end user is made up of several "
+#: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "The chain of trust from an apt archive to the end user is made up of "
+#| "several steps. <command>apt-secure</command> is the last step in this "
+#| "chain; trusting an archive does not mean that you trust its packages not "
+#| "to contain malicious code, but means that you trust the archive "
+#| "maintainer. It's the archive maintainer's responsibility to ensure that "
+#| "the archive's integrity is preserved."
+msgid ""
+"The chain of trust from an APT archive to the end user is made up of several "

 "steps. <command>apt-secure</command> is the last step in this chain; "
 "trusting an archive does not mean that you trust its packages not to contain "
 "malicious code, but means that you trust the archive maintainer. It's the "
 "steps. <command>apt-secure</command> is the last step in this chain; "
 "trusting an archive does not mean that you trust its packages not to contain "
 "malicious code, but means that you trust the archive maintainer. It's the "


@@ -2785,7 +3105,7 @@ msgstr ""
 "sicherstellt."
 
 #. type: Content of: <refentry><refsect1><para>
 "sicherstellt."
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-secure.8.xml:87
+#: apt-secure.8.xml

 msgid ""
 "apt-secure does not review signatures at a package level. If you require "
 "tools to do this you should look at <command>debsig-verify</command> and "
 msgid ""
 "apt-secure does not review signatures at a package level. If you require "
 "tools to do this you should look at <command>debsig-verify</command> and "


@@ -2798,14 +3118,23 @@ msgstr ""
 "(bereitgestellt von den Paketen debsig-verify beziehungsweise devscripts)."
 
 #. type: Content of: <refentry><refsect1><para>
 "(bereitgestellt von den Paketen debsig-verify beziehungsweise devscripts)."
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-secure.8.xml:94
-msgid ""
-"The chain of trust in Debian starts when a maintainer uploads a new package "
-"or a new version of a package to the Debian archive. In order to become "
-"effective, this upload needs to be signed by a key contained in the Debian "
-"Maintainers keyring (available in the debian-keyring package). Maintainers' "
-"keys are signed by other maintainers following pre-established procedures to "
-"ensure the identity of the key holder."
+#: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "The chain of trust in Debian starts when a maintainer uploads a new "
+#| "package or a new version of a package to the Debian archive. In order to "
+#| "become effective, this upload needs to be signed by a key contained in "
+#| "the Debian Maintainers keyring (available in the debian-keyring package). "
+#| "Maintainers' keys are signed by other maintainers following pre-"
+#| "established procedures to ensure the identity of the key holder."
+msgid ""
+"The chain of trust in Debian starts (e.g.) when a maintainer uploads a new "
+"package or a new version of a package to the Debian archive. In order to "
+"become effective, this upload needs to be signed by a key contained in one "
+"of the Debian package maintainer keyrings (available in the debian-keyring "
+"package). Maintainers' keys are signed by other maintainers following pre-"
+"established procedures to ensure the identity of the key holder. Similar "
+"procedures exist in all Debian-based distributions."

 msgstr ""
 "Die Kette des Vertrauens in Debian beginnt, wenn eine Betreuer ein neues "
 "Paket oder eine neue Version eines Pakets in das Debian-Archiv hochlädt. "
 msgstr ""
 "Die Kette des Vertrauens in Debian beginnt, wenn eine Betreuer ein neues "
 "Paket oder eine neue Version eines Pakets in das Debian-Archiv hochlädt. "


@@ -2816,7 +3145,7 @@ msgstr ""
 "sicherzustellen."
 
 #. type: Content of: <refentry><refsect1><para>
 "sicherzustellen."
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-secure.8.xml:104
+#: apt-secure.8.xml

 msgid ""
 "Once the uploaded package is verified and included in the archive, the "
 "maintainer signature is stripped off, and checksums of the package are "
 msgid ""
 "Once the uploaded package is verified and included in the archive, the "
 "maintainer signature is stripped off, and checksums of the package are "


@@ -2837,7 +3166,7 @@ msgstr ""
 "Archivschlüsselbund im Paket &keyring-package; verfügbar."
 
 #. type: Content of: <refentry><refsect1><para>
 "Archivschlüsselbund im Paket &keyring-package; verfügbar."
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-secure.8.xml:115
+#: apt-secure.8.xml

 msgid ""
 "End users can check the signature of the Release file, extract a checksum of "
 "a package from it and compare it with the checksum of the package they "
 msgid ""
 "End users can check the signature of the Release file, extract a checksum of "
 "a package from it and compare it with the checksum of the package they "


@@ -2849,7 +3178,7 @@ msgstr ""
 "dies automatisch tut."
 
 #. type: Content of: <refentry><refsect1><para>
 "dies automatisch tut."
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-secure.8.xml:120
+#: apt-secure.8.xml

 msgid ""
 "Notice that this is distinct from checking signatures on a per package "
 "basis. It is designed to prevent two possible attacks:"
 msgid ""
 "Notice that this is distinct from checking signatures on a per package "
 "basis. It is designed to prevent two possible attacks:"


@@ -2858,7 +3187,7 @@ msgstr ""
 "ist. Es wurde entworfen, um zwei mögliche Angriffe zu verhindern:"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 "ist. Es wurde entworfen, um zwei mögliche Angriffe zu verhindern:"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>

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

 msgid ""
 "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
 "checking, malicious agents can introduce themselves into the package "
 msgid ""
 "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
 "checking, malicious agents can introduce themselves into the package "


@@ -2874,7 +3203,7 @@ msgstr ""
 "oder DNS-Manipulationsangriffe) erfolgen."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 "oder DNS-Manipulationsangriffe) erfolgen."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>

-#: apt-secure.8.xml:133
+#: apt-secure.8.xml

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


@@ -2887,12 +3216,18 @@ msgstr ""
 "Pakete von diesem Rechner herunterladen."
 
 #. type: Content of: <refentry><refsect1><para>
 "Pakete von diesem Rechner herunterladen."
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-secure.8.xml:140
+#: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "However, it does not defend against a compromise of the Debian master "
+#| "server itself (which signs the packages) or against a compromise of the "
+#| "key used to sign the Release files. In any case, this mechanism can "
+#| "complement a per-package signature."

 msgid ""
 msgid ""

-"However, it does not defend against a compromise of the Debian master server "
-"itself (which signs the packages) or against a compromise of the key used to "
-"sign the Release files. In any case, this mechanism can complement a per-"
-"package signature."
+"However, it does not defend against a compromise of the master server itself "
+"(which signs the packages) or against a compromise of the key used to sign "
+"the Release files. In any case, this mechanism can complement a per-package "
+"signature."

 msgstr ""
 "Es schützt jedoch nicht gegen eine Kompromittierung des Haupt-Debian-Servers "
 "selbst (der die Pakete signiert) oder gegen eine Kompromittierung des "
 msgstr ""
 "Es schützt jedoch nicht gegen eine Kompromittierung des Haupt-Debian-Servers "
 "selbst (der die Pakete signiert) oder gegen eine Kompromittierung des "


@@ -2900,17 +3235,25 @@ msgstr ""
 "Fall kann dieser Mechanismus eine Signatur pro Paket ergänzen."
 
 #. type: Content of: <refentry><refsect1><title>
 "Fall kann dieser Mechanismus eine Signatur pro Paket ergänzen."
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt-secure.8.xml:146
-msgid "User configuration"
+#: apt-secure.8.xml
+#, fuzzy
+#| msgid "User configuration"
+msgid "User Configuration"

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

-#: apt-secure.8.xml:148
+#: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "<command>apt-key</command> is the program that manages the list of keys "
+#| "used by apt. It can be used to add or remove keys, although an "
+#| "installation of this release will automatically contain the default "
+#| "Debian archive signing keys used in the Debian package repositories."

 msgid ""
 "<command>apt-key</command> is the program that manages the list of keys used "
 msgid ""
 "<command>apt-key</command> is the program that manages the list of keys used "

-"by apt. It can be used to add or remove keys, although an installation of "
-"this release will automatically contain the default Debian archive signing "
-"keys used in the Debian package repositories."
+"by APT to trust repositories. It can be used to add or remove keys as well "
+"as list the trusted keys. Limiting which key(s) are able to sign which "
+"archive is possible via the <option>Signed-By</option> in &sources-list;."

 msgstr ""
 "<command>apt-key</command> ist das Programm, das die Liste der von APT "
 "verwendeten Schlüssel verwaltet. Es kann benutzt werden, um Schlüssel "
 msgstr ""
 "<command>apt-key</command> ist das Programm, das die Liste der von APT "
 "verwendeten Schlüssel verwaltet. Es kann benutzt werden, um Schlüssel "


@@ -2919,7 +3262,16 @@ msgstr ""
 "den Debian-Paketdepots benutzt werden."
 
 #. type: Content of: <refentry><refsect1><para>
 "den Debian-Paketdepots benutzt werden."
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-secure.8.xml:155
+#: apt-secure.8.xml
+msgid ""
+"Note that a default installation already contains all keys to securely "
+"acquire packages from the default repositories, so fiddling with "
+"<command>apt-key</command> is only needed if third-party repositories are "
+"added."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt-secure.8.xml

 msgid ""
 "In order to add a new key you need to first download it (you should make "
 "sure you are using a trusted communication channel when retrieving it), add "
 msgid ""
 "In order to add a new key you need to first download it (you should make "
 "sure you are using a trusted communication channel when retrieving it), add "


@@ -2937,12 +3289,14 @@ msgstr ""
 "herunterladen und prüfen kann."
 
 #. type: Content of: <refentry><refsect1><title>
 "herunterladen und prüfen kann."
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt-secure.8.xml:164
-msgid "Archive configuration"
+#: apt-secure.8.xml
+#, fuzzy
+#| msgid "Archive configuration"
+msgid "Archive Configuration"

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

-#: apt-secure.8.xml:166
+#: apt-secure.8.xml

 msgid ""
 "If you want to provide archive signatures in an archive under your "
 "maintenance you have to:"
 msgid ""
 "If you want to provide archive signatures in an archive under your "
 "maintenance you have to:"


@@ -2951,7 +3305,7 @@ msgstr ""
 "stellen möchten, müssen Sie:"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 "stellen möchten, müssen Sie:"
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>

-#: apt-secure.8.xml:171
+#: apt-secure.8.xml

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


@@ -2962,7 +3316,7 @@ msgstr ""
 "<command>apt-ftparchive release</command> (aus apt-utils) ausführen."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 "<command>apt-ftparchive release</command> (aus apt-utils) ausführen."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>

-#: apt-secure.8.xml:176
+#: apt-secure.8.xml

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


@@ -2973,18 +3327,36 @@ msgstr ""
 "abs -o Release.gpg Release</command> ausführen."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 "abs -o Release.gpg Release</command> ausführen."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>

-#: apt-secure.8.xml:180
+#: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "<emphasis>Publish the key fingerprint</emphasis>, that way your users "
+#| "will know what key they need to import in order to authenticate the files "
+#| "in the archive."

 msgid ""
 msgid ""

-"<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
+"<emphasis>Publish the key fingerprint</emphasis>, so that your users will "

 "know what key they need to import in order to authenticate the files in the "
 "know what key they need to import in order to authenticate the files in the "

-"archive."
+"archive. It is best to ship your key in its own keyring package like "
+"&keyring-distro; does with &keyring-package; to be able to distribute "
+"updates and key transitions automatically later."

 msgstr ""
 "<emphasis>Veröffentlichen Sie den Schlüsselfingerabdruck</emphasis>, damit "
 "Ihre Anwender wissen, welchen Schlüssel sie importieren müssen, um die "
 "Dateien im Archiv zu authentifizieren."
 
 msgstr ""
 "<emphasis>Veröffentlichen Sie den Schlüsselfingerabdruck</emphasis>, damit "
 "Ihre Anwender wissen, welchen Schlüssel sie importieren müssen, um die "
 "Dateien im Archiv zu authentifizieren."
 

+#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
+#: apt-secure.8.xml
+msgid ""
+"<emphasis>Provide instructions on how to add your archive and key</"
+"emphasis>.  If your users can't acquire your key securely the chain of trust "
+"described above is broken.  How you can help users add your key depends on "
+"your archive and target audience ranging from having your keyring package "
+"included in another archive users already have configured (like the default "
+"repositories of their distribution) to leveraging the web of trust."
+msgstr ""
+

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

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

 msgid ""
 "Whenever the contents of the archive change (new packages are added or "
 "removed) the archive maintainer has to follow the first two steps outlined "
 msgid ""
 "Whenever the contents of the archive change (new packages are added or "
 "removed) the archive maintainer has to follow the first two steps outlined "


@@ -2995,21 +3367,29 @@ msgstr ""
 "Schritten folgen."
 
 #. type: Content of: <refentry><refsect1><para>
 "Schritten folgen."
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-secure.8.xml:195
+#: apt-secure.8.xml

 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "

-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"

 msgstr ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
 msgstr ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "

-"&debsign; &debsig-verify;, &gpg;"
+"&debsign;, &debsig-verify;, &gpg;"

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

-#: apt-secure.8.xml:199
+#: apt-secure.8.xml
+#, fuzzy
+#| msgid ""
+#| "For more background information you might want to review the <ulink url="
+#| "\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+#| "Security Infrastructure</ulink> chapter of the Securing Debian Manual "
+#| "(available also in the harden-doc package) and the <ulink url=\"http://"
+#| "www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution "
+#| "HOWTO</ulink> by V. Alex Brennen."

 msgid ""
 "For more background information you might want to review the <ulink url="
 msgid ""
 "For more background information you might want to review the <ulink url="

-"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
-"Security Infrastructure</ulink> chapter of the Securing Debian Manual "
-"(available also in the harden-doc package) and the <ulink url=\"http://www."
+"\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+"Security Infrastructure</ulink> chapter of the Securing Debian Manual (also "
+"available in the harden-doc package) and the <ulink url=\"http://www."

 "cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
 "ulink> by V. Alex Brennen."
 msgstr ""
 "cryptnet.net/fdp/crypto/strong_distro.html\" >Strong Distribution HOWTO</"
 "ulink> by V. Alex Brennen."
 msgstr ""


@@ -3021,12 +3401,12 @@ msgstr ""
 ">Strong Distribution HOWTO</ulink> von V. Alex Brennen lesen."
 
 #. type: Content of: <refentry><refsect1><title>
 ">Strong Distribution HOWTO</ulink> von V. Alex Brennen lesen."
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt-secure.8.xml:212
+#: apt-secure.8.xml

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

-#: apt-secure.8.xml:214
+#: apt-secure.8.xml

 msgid ""
 "This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac "
 "Jones, Colin Walters, Florian Weimer and Michael Vogt."
 msgid ""
 "This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac "
 "Jones, Colin Walters, Florian Weimer and Michael Vogt."


@@ -3035,12 +3415,12 @@ msgstr ""
 "Peña, Isaac Jones, Colin Walters, Florian Weimer und Michael Vogt."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 "Peña, Isaac Jones, Colin Walters, Florian Weimer und Michael Vogt."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>

-#: apt-cdrom.8.xml:34
+#: apt-cdrom.8.xml

 msgid "APT CD-ROM management utility"
 msgstr "APT-CD-ROM-Verwaltungswerkzeug"
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "APT CD-ROM management utility"
 msgstr "APT-CD-ROM-Verwaltungswerkzeug"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-cdrom.8.xml:40
+#: apt-cdrom.8.xml

 msgid ""
 "<command>apt-cdrom</command> is used to add a new CD-ROM to APT's list of "
 "available sources. <command>apt-cdrom</command> takes care of determining "
 msgid ""
 "<command>apt-cdrom</command> is used to add a new CD-ROM to APT's list of "
 "available sources. <command>apt-cdrom</command> takes care of determining "


@@ -3053,7 +3433,7 @@ msgstr ""
 "mehrere mögliche Fehlbrennungen und prüft die Indexdateien."
 
 #. type: Content of: <refentry><refsect1><para>
 "mehrere mögliche Fehlbrennungen und prüft die Indexdateien."
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-cdrom.8.xml:47
+#: apt-cdrom.8.xml

 msgid ""
 "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
 "system; it cannot be done by hand. Furthermore each disc in a multi-CD set "
 msgid ""
 "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
 "system; it cannot be done by hand. Furthermore each disc in a multi-CD set "


@@ -3065,7 +3445,7 @@ msgstr ""
 "gescannt werden, um auf mögliche Fehlbrennungen zu testen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "gescannt werden, um auf mögliche Fehlbrennungen zu testen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cdrom.8.xml:58
+#: apt-cdrom.8.xml

 msgid ""
 "<literal>add</literal> is used to add a new disc to the source list. It will "
 "unmount the CD-ROM device, prompt for a disc to be inserted and then proceed "
 msgid ""
 "<literal>add</literal> is used to add a new disc to the source list. It will "
 "unmount the CD-ROM device, prompt for a disc to be inserted and then proceed "


@@ -3080,7 +3460,7 @@ msgstr ""
 "Verzeichnis hat, werden Sie nach einem aussagekräftigen Titel gefragt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Verzeichnis hat, werden Sie nach einem aussagekräftigen Titel gefragt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cdrom.8.xml:66
+#: apt-cdrom.8.xml

 msgid ""
 "APT uses a CD-ROM ID to track which disc is currently in the drive and "
 "maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
 msgid ""
 "APT uses a CD-ROM ID to track which disc is currently in the drive and "
 "maintains a database of these IDs in <filename>&statedir;/cdroms.list</"


@@ -3091,7 +3471,7 @@ msgstr ""
 "<filename>&statedir;/cdroms.list</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "<filename>&statedir;/cdroms.list</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cdrom.8.xml:74
+#: apt-cdrom.8.xml

 msgid ""
 "A debugging tool to report the identity of the current disc as well as the "
 "stored file name"
 msgid ""
 "A debugging tool to report the identity of the current disc as well as the "
 "stored file name"


@@ -3100,7 +3480,7 @@ msgstr ""
 "gespeicherten Dateinamen zu berichten"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "gespeicherten Dateinamen zu berichten"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cdrom.8.xml:87
+#: apt-cdrom.8.xml

 msgid ""
 "Do not try to auto-detect the CD-ROM path. Usually combined with the "
 "<option>--cdrom</option> option.  Configuration Item: <literal>Acquire::"
 msgid ""
 "Do not try to auto-detect the CD-ROM path. Usually combined with the "
 "<option>--cdrom</option> option.  Configuration Item: <literal>Acquire::"


@@ -3111,7 +3491,7 @@ msgstr ""
 "Konfigurationselement: <literal>Acquire::cdrom::AutoDetect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Konfigurationselement: <literal>Acquire::cdrom::AutoDetect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

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

 msgid ""
 "Mount point; specify the location to mount the CD-ROM. This mount point must "
 "be listed in <filename>/etc/fstab</filename> and properly configured.  "
 msgid ""
 "Mount point; specify the location to mount the CD-ROM. This mount point must "
 "be listed in <filename>/etc/fstab</filename> and properly configured.  "


@@ -3123,7 +3503,7 @@ msgstr ""
 "cdrom::mount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "cdrom::mount</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cdrom.8.xml:104
+#: apt-cdrom.8.xml

 msgid ""
 "Rename a disc; change the label of a disc or override the disc's given "
 "label. This option will cause <command>apt-cdrom</command> to prompt for a "
 msgid ""
 "Rename a disc; change the label of a disc or override the disc's given "
 "label. This option will cause <command>apt-cdrom</command> to prompt for a "


@@ -3135,7 +3515,7 @@ msgstr ""
 "Konfigurationselement: <literal>APT::CDROM::Rename</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Konfigurationselement: <literal>APT::CDROM::Rename</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cdrom.8.xml:113
+#: apt-cdrom.8.xml

 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
 "unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
 "unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"


@@ -3146,7 +3526,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cdrom.8.xml:121
+#: apt-cdrom.8.xml

 msgid ""
 "Fast Copy; Assume the package files are valid and do not check every "
 "package. This option should be used only if <command>apt-cdrom</command> has "
 msgid ""
 "Fast Copy; Assume the package files are valid and do not check every "
 "package. This option should be used only if <command>apt-cdrom</command> has "


@@ -3159,7 +3539,7 @@ msgstr ""
 "festgestellt hat. Konfigurationselement: <literal>APT::CDROM::Fast</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "festgestellt hat. Konfigurationselement: <literal>APT::CDROM::Fast</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cdrom.8.xml:131
+#: apt-cdrom.8.xml

 msgid ""
 "Thorough Package Scan; This option may be needed with some old Debian "
 "1.1/1.2 discs that have Package files in strange places. It takes much "
 msgid ""
 "Thorough Package Scan; This option may be needed with some old Debian "
 "1.1/1.2 discs that have Package files in strange places. It takes much "


@@ -3170,7 +3550,7 @@ msgstr ""
 "Dies verlängert das Durchsuchen des Mediums deutlich, nimmt aber alle auf."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Dies verlängert das Durchsuchen des Mediums deutlich, nimmt aber alle auf."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-cdrom.8.xml:142
+#: apt-cdrom.8.xml

 msgid ""
 "No Changes; Do not change the &sources-list; file and do not write index "
 "files. Everything is still checked however.  Configuration Item: "
 msgid ""
 "No Changes; Do not change the &sources-list; file and do not write index "
 "files. Everything is still checked however.  Configuration Item: "


@@ -3181,12 +3561,12 @@ msgstr ""
 "Konfigurationselement: <literal>APT::CDROM::NoAct</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
 "Konfigurationselement: <literal>APT::CDROM::NoAct</literal>."
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-cdrom.8.xml:155
+#: apt-cdrom.8.xml

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

-#: apt-cdrom.8.xml:160
+#: apt-cdrom.8.xml

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


@@ -3195,12 +3575,12 @@ msgstr ""
 "100 bei Fehlern."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 "100 bei Fehlern."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>

-#: apt-config.8.xml:35
+#: apt-config.8.xml

 msgid "APT Configuration Query program"
 msgstr "APT-Konfigurationsabfrageprogramm"
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "APT Configuration Query program"
 msgstr "APT-Konfigurationsabfrageprogramm"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-config.8.xml:41
+#: apt-config.8.xml

 msgid ""
 "<command>apt-config</command> is an internal program used by various "
 "portions of the APT suite to provide consistent configurability. It accesses "
 msgid ""
 "<command>apt-config</command> is an internal program used by various "
 "portions of the APT suite to provide consistent configurability. It accesses "


@@ -3214,7 +3594,7 @@ msgstr ""
 "Anwendungen zu benutzen ist."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Anwendungen zu benutzen ist."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-config.8.xml:53
+#: apt-config.8.xml

 msgid ""
 "shell is used to access the configuration information from a shell script. "
 "It is given pairs of arguments, the first being a shell variable and the "
 msgid ""
 "shell is used to access the configuration information from a shell script. "
 "It is given pairs of arguments, the first being a shell variable and the "


@@ -3230,7 +3610,7 @@ msgstr ""
 "sollte es wie folgt benutzt werden:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
 "sollte es wie folgt benutzt werden:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>

-#: apt-config.8.xml:61
+#: apt-config.8.xml

 #, no-wrap
 msgid ""
 "OPTS=\"-f\"\n"
 #, no-wrap
 msgid ""
 "OPTS=\"-f\"\n"


@@ -3242,7 +3622,7 @@ msgstr ""
 "eval $RES\n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "eval $RES\n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-config.8.xml:66
+#: apt-config.8.xml

 msgid ""
 "This will set the shell environment variable $OPTS to the value of MyApp::"
 "options with a default of <option>-f</option>."
 msgid ""
 "This will set the shell environment variable $OPTS to the value of MyApp::"
 "options with a default of <option>-f</option>."


@@ -3251,7 +3631,7 @@ msgstr ""
 "mit einer Vorgabe von <option>-f</option> setzen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "mit einer Vorgabe von <option>-f</option> setzen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-config.8.xml:70
+#: apt-config.8.xml

 msgid ""
 "The configuration item may be postfixed with a /[fdbi]. f returns file "
 "names, d returns directories, b returns true or false and i returns an "
 msgid ""
 "The configuration item may be postfixed with a /[fdbi]. f returns file "
 "names, d returns directories, b returns true or false and i returns an "


@@ -3263,12 +3643,12 @@ msgstr ""
 "intern geprüft."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "intern geprüft."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-config.8.xml:79
+#: apt-config.8.xml

 msgid "Just show the contents of the configuration space."
 msgstr "Nur der Inhalt des Konfigurationsbereichs wird angezeigt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "Just show the contents of the configuration space."
 msgstr "Nur der Inhalt des Konfigurationsbereichs wird angezeigt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-config.8.xml:92
+#: apt-config.8.xml

 msgid ""
 "Include options which have an empty value. This is the default, so use --no-"
 "empty to remove them from the output."
 msgid ""
 "Include options which have an empty value. This is the default, so use --no-"
 "empty to remove them from the output."


@@ -3277,12 +3657,12 @@ msgstr ""
 "benutzen Sie daher --no-empty, um sie aus der Ausgabe zu entfernen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
 "benutzen Sie daher --no-empty, um sie aus der Ausgabe zu entfernen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>

-#: apt-config.8.xml:97
+#: apt-config.8.xml

 msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 msgstr "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 msgstr "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-config.8.xml:98
+#: apt-config.8.xml

 msgid ""
 "Defines the output of each config option. &percnt;t will be replaced with "
 "its individual name, &percnt;f with its full hierarchical name and &percnt;v "
 msgid ""
 "Defines the output of each config option. &percnt;t will be replaced with "
 "its individual name, &percnt;f with its full hierarchical name and &percnt;v "


@@ -3301,13 +3681,13 @@ msgstr ""
 "&percnt; kann mittels &percnt;&percnt; ausgegeben werden."
 
 #. type: Content of: <refentry><refsect1><para>
 "&percnt; kann mittels &percnt;&percnt; ausgegeben werden."
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-config.8.xml:112 apt-extracttemplates.1.xml:73 apt-sortpkgs.1.xml:66
-#: apt-ftparchive.1.xml:610
+#: apt-config.8.xml apt-extracttemplates.1.xml apt-sortpkgs.1.xml
+#: apt-ftparchive.1.xml

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

-#: apt-config.8.xml:117
+#: apt-config.8.xml

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


@@ -3316,27 +3696,27 @@ msgstr ""
 "dezimal 100 bei Fehlern."
 
 #. type: Content of: <refentry><refentryinfo><author><contrib>
 "dezimal 100 bei Fehlern."
 
 #. type: Content of: <refentry><refentryinfo><author><contrib>

-#: apt.conf.5.xml:22
+#: apt.conf.5.xml

 msgid "Initial documentation of Debug::*."
 msgstr "ursprüngliche Dokumentation von Debug::*."
 
 #. type: Content of: <refentry><refentryinfo><author><email>
 msgid "Initial documentation of Debug::*."
 msgstr "ursprüngliche Dokumentation von Debug::*."
 
 #. type: Content of: <refentry><refentryinfo><author><email>

-#: apt.conf.5.xml:23
+#: apt.conf.5.xml

 msgid "dburrows@debian.org"
 msgstr "dburrows@debian.org"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
 msgid "dburrows@debian.org"
 msgstr "dburrows@debian.org"
 
 #. type: Content of: <refentry><refmeta><manvolnum>

-#: apt.conf.5.xml:33 apt_preferences.5.xml:27 sources.list.5.xml:28
+#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml

 msgid "5"
 msgstr "5"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 msgid "5"
 msgstr "5"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>

-#: apt.conf.5.xml:40
+#: apt.conf.5.xml

 msgid "Configuration file for APT"
 msgstr "Konfigurationsdatei für APT"
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "Configuration file for APT"
 msgstr "Konfigurationsdatei für APT"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:44
+#: apt.conf.5.xml

 msgid ""
 "<filename>/etc/apt/apt.conf</filename> is the main configuration file shared "
 "by all the tools in the APT suite of tools, though it is by no means the "
 msgid ""
 "<filename>/etc/apt/apt.conf</filename> is the main configuration file shared "
 "by all the tools in the APT suite of tools, though it is by no means the "


@@ -3350,7 +3730,7 @@ msgstr ""
 "Umgebung bereitzustellen."
 
 #. type: Content of: <refentry><refsect1><orderedlist><para>
 "Umgebung bereitzustellen."
 
 #. type: Content of: <refentry><refsect1><orderedlist><para>

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

 msgid ""
 "When an APT tool starts up it will read the configuration files in the "
 "following order:"
 msgid ""
 "When an APT tool starts up it will read the configuration files in the "
 "following order:"


@@ -3359,7 +3739,7 @@ msgstr ""
 "folgenden Reihenfolge lesen:"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
 "folgenden Reihenfolge lesen:"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>

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

 msgid ""
 "the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
 "any)"
 msgid ""
 "the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
 "any)"


@@ -3368,7 +3748,7 @@ msgstr ""
 "angegeben wird (falls gesetzt)"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
 "angegeben wird (falls gesetzt)"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>

-#: apt.conf.5.xml:54
+#: apt.conf.5.xml

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


@@ -3388,7 +3768,7 @@ msgstr ""
 "sie stillschweigend ignoriert."
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
 "sie stillschweigend ignoriert."
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>

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

 msgid ""
 "the main configuration file specified by <literal>Dir::Etc::main</literal>"
 msgstr ""
 msgid ""
 "the main configuration file specified by <literal>Dir::Etc::main</literal>"
 msgstr ""


@@ -3396,7 +3776,14 @@ msgstr ""
 "angegeben wird"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
 "angegeben wird"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>

-#: apt.conf.5.xml:63
+#: apt.conf.5.xml
+msgid ""
+"all options set in the binary specific configuration subtree are moved into "
+"the root of the tree."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
+#: apt.conf.5.xml

 msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
 msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."


@@ -3405,12 +3792,12 @@ msgstr ""
 "zu überschreiben oder um sogar mehrere Konfigurationsdateien zu laden."
 
 #. type: Content of: <refentry><refsect1><title>
 "zu überschreiben oder um sogar mehrere Konfigurationsdateien zu laden."
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt.conf.5.xml:67
+#: apt.conf.5.xml

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

-#: apt.conf.5.xml:68
+#: apt.conf.5.xml

 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 "


@@ -3425,7 +3812,7 @@ msgstr ""
 "das Werkzeug Get. Optionen werden nicht von ihren Elterngruppe geerbt."
 
 #. type: Content of: <refentry><refsect1><para>
 "das Werkzeug Get. Optionen werden nicht von ihren Elterngruppe geerbt."
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:74
+#: apt.conf.5.xml

 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 "


@@ -3452,7 +3839,7 @@ msgstr ""
 "werden, wie:"
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
 "werden, wie:"
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>

-#: apt.conf.5.xml:87
+#: apt.conf.5.xml

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


@@ -3470,7 +3857,7 @@ msgstr ""
 "};\n"
 
 #. type: Content of: <refentry><refsect1><para>
 "};\n"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:95
+#: apt.conf.5.xml

 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 "


@@ -3483,13 +3870,13 @@ msgstr ""
 "eingefügt werden, jeweils getrennt durch einen Schrägstrich."
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
 "eingefügt werden, jeweils getrennt durch einen Schrägstrich."
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>

-#: apt.conf.5.xml:100
+#: apt.conf.5.xml

 #, no-wrap
 msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 
 #. type: Content of: <refentry><refsect1><para>
 #, no-wrap
 msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:103
+#: apt.conf.5.xml

 msgid ""
 "In general the sample configuration file &configureindex; is a good guide "
 "for how it should look."
 msgid ""
 "In general the sample configuration file &configureindex; is a good guide "
 "for how it should look."


@@ -3498,7 +3885,7 @@ msgstr ""
 "gute Anleitung, wie dies aussehen könnte."
 
 #. type: Content of: <refentry><refsect1><para>
 "gute Anleitung, wie dies aussehen könnte."
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:106
+#: apt.conf.5.xml

 msgid ""
 "Case is not significant in names of configuration items, so in the previous "
 "example you could use <literal>dpkg::pre-install-pkgs</literal>."
 msgid ""
 "Case is not significant in names of configuration items, so in the previous "
 "example you could use <literal>dpkg::pre-install-pkgs</literal>."


@@ -3508,7 +3895,7 @@ msgstr ""
 "<literal>dpkg::pre-install-pkgs</literal> benutzen."
 
 #. type: Content of: <refentry><refsect1><para>
 "<literal>dpkg::pre-install-pkgs</literal> benutzen."
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:109
+#: apt.conf.5.xml

 msgid ""
 "Names for the configuration items are optional if a list is defined as can "
 "be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
 msgid ""
 "Names for the configuration items are optional if a list is defined as can "
 "be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "


@@ -3524,7 +3911,7 @@ msgstr ""
 "überschreiben, indem Sie der Option erneut einen neuen Wert zuweisen."
 
 #. type: Content of: <refentry><refsect1><para>
 "überschreiben, indem Sie der Option erneut einen neuen Wert zuweisen."
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:114
+#: apt.conf.5.xml

 msgid ""
 "Two special commands are defined: <literal>#include</literal> (which is "
 "deprecated and not supported by alternative implementations) and "
 msgid ""
 "Two special commands are defined: <literal>#include</literal> (which is "
 "deprecated and not supported by alternative implementations) and "


@@ -3544,7 +3931,7 @@ msgstr ""
 "(Beachten Sie, dass diese Zeilen auch mit einem Schrägstrich enden müssen.)"
 
 #. type: Content of: <refentry><refsect1><para>
 "(Beachten Sie, dass diese Zeilen auch mit einem Schrägstrich enden müssen.)"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:124
+#: apt.conf.5.xml

 msgid ""
 "The <literal>#clear</literal> command is the only way to delete a list or a "
 "complete scope. Reopening a scope (or using the syntax described below with "
 msgid ""
 "The <literal>#clear</literal> command is the only way to delete a list or a "
 "complete scope. Reopening a scope (or using the syntax described below with "


@@ -3561,7 +3948,7 @@ msgstr ""
 "nicht außer Kraft gesetzt, sondern nur bereinigt werden."
 
 #. type: Content of: <refentry><refsect1><para>
 "nicht außer Kraft gesetzt, sondern nur bereinigt werden."
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:132
+#: apt.conf.5.xml

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


@@ -3581,7 +3968,7 @@ msgstr ""
 "Befehlszeile benutzt werden.)"
 
 #. type: Content of: <refentry><refsect1><para>
 "Befehlszeile benutzt werden.)"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:140
+#: apt.conf.5.xml

 msgid ""
 "Note that appending items to a list using <literal>::</literal> only works "
 "for one item per line, and that you should not use it in combination with "
 msgid ""
 "Note that appending items to a list using <literal>::</literal> only works "
 "for one item per line, and that you should not use it in combination with "


@@ -3613,12 +4000,12 @@ msgstr ""
 "beklagt."
 
 #. type: Content of: <refentry><refsect1><title>
 "beklagt."
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt.conf.5.xml:155
+#: apt.conf.5.xml

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

-#: apt.conf.5.xml:156
+#: apt.conf.5.xml

 msgid ""
 "This group of options controls general APT behavior as well as holding the "
 "options for all of the tools."
 msgid ""
 "This group of options controls general APT behavior as well as holding the "
 "options for all of the tools."


@@ -3627,7 +4014,7 @@ msgstr ""
 "wie es die Optionen für alle Werkzeuge enthält."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "wie es die Optionen für alle Werkzeuge enthält."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:161
+#: apt.conf.5.xml

 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 "


@@ -3638,7 +4025,7 @@ msgstr ""
 "die Architektur für die APT kompiliert wurde."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "die Architektur für die APT kompiliert wurde."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

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

 msgid ""
 "All Architectures the system supports. For instance, CPUs implementing the "
 "<literal>amd64</literal> (also called <literal>x86-64</literal>)  "
 msgid ""
 "All Architectures the system supports. For instance, CPUs implementing the "
 "<literal>amd64</literal> (also called <literal>x86-64</literal>)  "


@@ -3660,7 +4047,7 @@ msgstr ""
 "print-architectures</command> registriert werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "print-architectures</command> registriert werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:182
+#: apt.conf.5.xml

 msgid ""
 "List of all build profiles enabled for build-dependency resolution, without "
 "the \"<literal>profile.</literal>\" namespace prefix.  By default this list "
 msgid ""
 "List of all build profiles enabled for build-dependency resolution, without "
 "the \"<literal>profile.</literal>\" namespace prefix.  By default this list "


@@ -3674,20 +4061,20 @@ msgstr ""
 "außer Kraft."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "außer Kraft."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:190
+#: apt.conf.5.xml

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

-"'stable', 'testing', 'unstable', '&stable-codename;', '&testing-codename;', "
-"'4.0', '5.0*'. See also &apt-preferences;."
+"'stable', 'testing', 'unstable', '&debian-stable-codename;', '&debian-"
+"testing-codename;', '4.0', '5.0*'. See also &apt-preferences;."

 msgstr ""
 "Standard-Release von dem Pakete installiert werden, wenn mehr als eine "
 "Version verfügbar ist. Enthält Release-Name, Codename oder Release-Version. "
 msgstr ""
 "Standard-Release von dem Pakete installiert werden, wenn mehr als eine "
 "Version verfügbar ist. Enthält Release-Name, Codename oder Release-Version. "

-"Beispiele: »stable«, »testing, »unstable«, »&stable-codename;«, »&testing-"
-"codename;«, »4.0«, »5.0*«. Siehe auch &apt-preferences;."
+"Beispiele: »stable«, »testing, »unstable«, »&debian-stable-codename;«, "
+"»&debian-testing-codename;«, »4.0«, »5.0*«. Siehe auch &apt-preferences;."

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

-#: apt.conf.5.xml:196
+#: apt.conf.5.xml

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


@@ -3696,7 +4083,7 @@ msgstr ""
 "Problemlöser, gehaltene Pakete beim Treffen von Entscheidungen zu ignorieren."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Problemlöser, gehaltene Pakete beim Treffen von Entscheidungen zu ignorieren."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:201
+#: apt.conf.5.xml

 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 "


@@ -3711,7 +4098,7 @@ msgstr ""
 "Möglichkeiten bereitstellt, um sie erneut zu installieren."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Möglichkeiten bereitstellt, um sie erneut zu installieren."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

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

 msgid ""
 "Defaults to on, which will cause APT to install essential and important "
 "packages as soon as possible in an install/upgrade operation, in order to "
 msgid ""
 "Defaults to on, which will cause APT to install essential and important "
 "packages as soon as possible in an install/upgrade operation, in order to "


@@ -3739,7 +4126,7 @@ msgstr ""
 "Abhängigkeit von A nicht länger erfüllt wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Abhängigkeit von A nicht länger erfüllt wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:221
+#: apt.conf.5.xml

 msgid ""
 "The immediate configuration marker is also applied in the potentially "
 "problematic case of circular dependencies, since a dependency with the "
 msgid ""
 "The immediate configuration marker is also applied in the potentially "
 "problematic case of circular dependencies, since a dependency with the "


@@ -3769,7 +4156,7 @@ msgstr ""
 "Stelle verhindern kann."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Stelle verhindern kann."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

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

 msgid ""
 "Before a big operation like <literal>dist-upgrade</literal> is run with this "
 "option disabled you should try to explicitly <literal>install</literal> the "
 msgid ""
 "Before a big operation like <literal>dist-upgrade</literal> is run with this "
 "option disabled you should try to explicitly <literal>install</literal> the "


@@ -3787,7 +4174,7 @@ msgstr ""
 "des Upgrade-Prozesses arbeiten können."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "des Upgrade-Prozesses arbeiten können."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:245
+#: apt.conf.5.xml

 msgid ""
 "Never enable this option unless you <emphasis>really</emphasis> know what "
 "you are doing. It permits APT to temporarily remove an essential package to "
 msgid ""
 "Never enable this option unless you <emphasis>really</emphasis> know what "
 "you are doing. It permits APT to temporarily remove an essential package to "


@@ -3809,7 +4196,7 @@ msgstr ""
 "davon abhängt, sind."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "davon abhängt, sind."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:257
+#: apt.conf.5.xml

 msgid ""
 "APT uses since version 0.7.26 a resizable memory mapped cache file to store "
 "the available information. <literal>Cache-Start</literal> acts as a hint of "
 msgid ""
 "APT uses since version 0.7.26 a resizable memory mapped cache file to store "
 "the available information. <literal>Cache-Start</literal> acts as a hint of "


@@ -3846,13 +4233,13 @@ msgstr ""
 "auf 0 gesetzt ist, kann der Zwischenspeicher nicht automatisch wachsen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "auf 0 gesetzt ist, kann der Zwischenspeicher nicht automatisch wachsen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:273
+#: apt.conf.5.xml

 msgid "Defines which packages are considered essential build dependencies."
 msgstr ""
 "definiert, welche Pakete als essentielle Bauabhängigkeiten betrachtet werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "Defines which packages are considered essential build dependencies."
 msgstr ""
 "definiert, welche Pakete als essentielle Bauabhängigkeiten betrachtet werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:277
+#: apt.conf.5.xml

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


@@ -3862,7 +4249,7 @@ msgstr ""
 "erhalten."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "erhalten."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

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

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


@@ -3872,7 +4259,7 @@ msgstr ""
 "erhalten."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "erhalten."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:287
+#: apt.conf.5.xml

 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool; please see its "
 "documentation for more information about the options here."
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool; please see its "
 "documentation for more information about the options here."


@@ -3882,12 +4269,12 @@ msgstr ""
 "erhalten."
 
 #. type: Content of: <refentry><refsect1><title>
 "erhalten."
 
 #. type: Content of: <refentry><refsect1><title>

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

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

-#: apt.conf.5.xml:294
+#: apt.conf.5.xml

 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages as well as the various \"acquire methods\" responsible for the "
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages as well as the various \"acquire methods\" responsible for the "


@@ -3898,7 +4285,17 @@ msgstr ""
 "Herunterladen selbst zuständig sind (siehe auch &sources-list;)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Herunterladen selbst zuständig sind (siehe auch &sources-list;)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:301
+#: apt.conf.5.xml
+#, fuzzy
+#| msgid ""
+#| "Security related option defaulting to true, as giving a Release file's "
+#| "validation an expiration date prevents replay attacks over a long "
+#| "timescale, and can also for example help users to identify mirrors that "
+#| "are no longer updated - but the feature depends on the correctness of the "
+#| "clock on the user system. Archive maintainers are encouraged to create "
+#| "Release files with the <literal>Valid-Until</literal> header, but if they "
+#| "don't or a stricter value is desired the <literal>Max-ValidTime</literal> "
+#| "option below can be used."

 msgid ""
 "Security related option defaulting to true, as giving a Release file's "
 "validation an expiration date prevents replay attacks over a long timescale, "
 msgid ""
 "Security related option defaulting to true, as giving a Release file's "
 "validation an expiration date prevents replay attacks over a long timescale, "


@@ -3907,7 +4304,9 @@ msgid ""
 "user system. Archive maintainers are encouraged to create Release files with "
 "the <literal>Valid-Until</literal> header, but if they don't or a stricter "
 "value is desired the <literal>Max-ValidTime</literal> option below can be "
 "user system. Archive maintainers are encouraged to create Release files with "
 "the <literal>Valid-Until</literal> header, but if they don't or a stricter "
 "value is desired the <literal>Max-ValidTime</literal> option below can be "

-"used."
+"used.  The <option>Check-Valid-Until</option> option of &sources-list; "
+"entries should be preferred to disable the check selectively instead of "
+"using this global override."

 msgstr ""
 "Die sicherheitsbezogene Option wird als »true« vorgegeben, da es "
 "Wiederholungsangriffe über einen langen Zeitraum verhindert, einer "
 msgstr ""
 "Die sicherheitsbezogene Option wird als »true« vorgegeben, da es "
 "Wiederholungsangriffe über einen langen Zeitraum verhindert, einer "


@@ -3920,7 +4319,16 @@ msgstr ""
 "ValidTime</literal> unten benutzt werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "ValidTime</literal> unten benutzt werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:314
+#: apt.conf.5.xml
+#, fuzzy
+#| msgid ""
+#| "Maximum time (in seconds) after its creation (as indicated by the "
+#| "<literal>Date</literal> header) that the <filename>Release</filename> "
+#| "file should be considered valid.  If the Release file itself includes a "
+#| "<literal>Valid-Until</literal> header the earlier date of the two is used "
+#| "as the expiration date.  The default value is <literal>0</literal> which "
+#| "stands for \"valid forever\".  Archive specific settings can be made by "
+#| "appending the label of the archive to the option name."

 msgid ""
 "Maximum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
 msgid ""
 "Maximum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "


@@ -3928,7 +4336,9 @@ msgid ""
 "<literal>Valid-Until</literal> header the earlier date of the two is used as "
 "the expiration date.  The default value is <literal>0</literal> which stands "
 "for \"valid forever\".  Archive specific settings can be made by appending "
 "<literal>Valid-Until</literal> header the earlier date of the two is used as "
 "the expiration date.  The default value is <literal>0</literal> which stands "
 "for \"valid forever\".  Archive specific settings can be made by appending "

-"the label of the archive to the option name."
+"the label of the archive to the option name. Preferably, the same can be "
+"achieved for specific &sources-list; entries by using the <option>Valid-"
+"Until-Max</option> option there."

 msgstr ""
 "maximale Zeit (in Sekunden) nach der Erzeugung (die in der Kopfzeile "
 "<literal>Date</literal> angegeben ist), die die Datei <filename>Release</"
 msgstr ""
 "maximale Zeit (in Sekunden) nach der Erzeugung (die in der Kopfzeile "
 "<literal>Date</literal> angegeben ist), die die Datei <filename>Release</"


@@ -3939,7 +4349,16 @@ msgstr ""
 "Anhängen der Archivbezeichnung an den Optionsnamen vorgenommen werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Anhängen der Archivbezeichnung an den Optionsnamen vorgenommen werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:326
+#: apt.conf.5.xml
+#, fuzzy
+#| msgid ""
+#| "Minimum time (in seconds) after its creation (as indicated by the "
+#| "<literal>Date</literal> header) that the <filename>Release</filename> "
+#| "file should be considered valid.  Use this if you need to use a seldom "
+#| "updated (local) mirror of a more frequently updated archive with a "
+#| "<literal>Valid-Until</literal> header instead of completely disabling the "
+#| "expiration date checking.  Archive specific settings can and should be "
+#| "used by appending the label of the archive to the option name."

 msgid ""
 "Minimum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
 msgid ""
 "Minimum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "


@@ -3947,7 +4366,9 @@ msgid ""
 "(local) mirror of a more frequently updated archive with a <literal>Valid-"
 "Until</literal> header instead of completely disabling the expiration date "
 "checking.  Archive specific settings can and should be used by appending the "
 "(local) mirror of a more frequently updated archive with a <literal>Valid-"
 "Until</literal> header instead of completely disabling the expiration date "
 "checking.  Archive specific settings can and should be used by appending the "

-"label of the archive to the option name."
+"label of the archive to the option name. Preferably, the same can be "
+"achieved for specific &sources-list; entries by using the <option>Valid-"
+"Until-Min</option> option there."

 msgstr ""
 "minimale Zeit (in Sekunden), nach der Erzeugung (die in der Kopfzeile "
 "<literal>Date</literal> angegeben ist), die die Datei <filename>Release</"
 msgstr ""
 "minimale Zeit (in Sekunden), nach der Erzeugung (die in der Kopfzeile "
 "<literal>Date</literal> angegeben ist), die die Datei <filename>Release</"


@@ -3959,18 +4380,24 @@ msgstr ""
 "Optionsnamen vorgenommen werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Optionsnamen vorgenommen werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:338
+#: apt.conf.5.xml
+#, fuzzy
+#| msgid ""
+#| "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
+#| "<filename>Packages</filename> files) instead of downloading whole ones. "
+#| "True by default."

 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
 "<filename>Packages</filename> files) instead of downloading whole ones. True "
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
 "<filename>Packages</filename> files) instead of downloading whole ones. True "

-"by default."
+"by default. Preferably, this can be set for specific &sources-list; entries "
+"or index files by using the <option>PDiffs</option> option there."

 msgstr ""
 "versucht Unterschiede, die <literal>PDiffs</literal> genannt werden, für "
 "Indexe (wie <filename>Packages</filename>-Dateien) herunterzuladen, statt "
 "der kompletten Dateien. Vorgabe ist True."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgstr ""
 "versucht Unterschiede, die <literal>PDiffs</literal> genannt werden, für "
 "Indexe (wie <filename>Packages</filename>-Dateien) herunterzuladen, statt "
 "der kompletten Dateien. Vorgabe ist True."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:341
+#: apt.conf.5.xml

 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: "
 "<literal>FileLimit</literal> can be used to specify a maximum number of "
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: "
 "<literal>FileLimit</literal> can be used to specify a maximum number of "


@@ -3988,7 +4415,26 @@ msgstr ""
 "komplette Datei anstelle der Patche heruntergeladen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "komplette Datei anstelle der Patche heruntergeladen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:351
+#: apt.conf.5.xml
+#, fuzzy
+#| msgid ""
+#| "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
+#| "<filename>Packages</filename> files) instead of downloading whole ones. "
+#| "True by default."
+msgid ""
+"Try to download indexes via an URI constructed from a hashsum of the "
+"expected file rather than downloaded via a well-known stable filename. True "
+"by default, but automatically disabled if the source indicates no support "
+"for it. Usage can be forced with the special value \"force\". Preferably, "
+"this can be set for specific &sources-list; entries or index files by using "
+"the <option>By-Hash</option> option there."
+msgstr ""
+"versucht Unterschiede, die <literal>PDiffs</literal> genannt werden, für "
+"Indexe (wie <filename>Packages</filename>-Dateien) herunterzuladen, statt "
+"der kompletten Dateien. Vorgabe ist True."
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml

 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 "


@@ -4004,7 +4450,7 @@ msgstr ""
 "URI-Art geöffnet wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "URI-Art geöffnet wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

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

 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."


@@ -4013,7 +4459,7 @@ msgstr ""
 "APT fehlgeschlagene Dateien in der angegebenen Zahl erneut versuchen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "APT fehlgeschlagene Dateien in der angegebenen Zahl erneut versuchen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:364
+#: apt.conf.5.xml

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


@@ -4023,7 +4469,7 @@ msgstr ""
 "kopiert zu werden. True ist die Vorgabe."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "kopiert zu werden. True ist die Vorgabe."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:369
+#: apt.conf.5.xml

 msgid ""
 "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
 "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
 msgid ""
 "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
 "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"


@@ -4042,7 +4488,7 @@ msgstr ""
 "wurde, wird die Umgebungsvariable <envar>http_proxy</envar> benutzt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "wurde, wird die Umgebungsvariable <envar>http_proxy</envar> benutzt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:377
+#: apt.conf.5.xml

 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
 "caches.  <literal>No-Cache</literal> tells the proxy not to 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 not to use its cached "


@@ -4063,7 +4509,7 @@ msgstr ""
 "Zwischenspeicher mit (großen) .deb-Dateien verunreinigt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Zwischenspeicher mit (großen) .deb-Dateien verunreinigt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:387 apt.conf.5.xml:475
+#: apt.conf.5.xml

 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method; this value applies to the connection as well as the data timeout."
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method; this value applies to the connection as well as the data timeout."


@@ -4073,15 +4519,24 @@ msgstr ""
 "Datenzeitüberschreitungen angewandt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Datenzeitüberschreitungen angewandt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:390
+#: apt.conf.5.xml
+#, fuzzy
+#| msgid ""
+#| "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used "
+#| "to enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be "
+#| "beneficial e.g. on high-latency connections. It specifies how many "
+#| "requests are sent in a pipeline.  Previous APT versions had a default of "
+#| "10 for this setting, but the default value is now 0 (= disabled) to avoid "
+#| "problems with the ever-growing amount of webservers and proxies which "
+#| "choose to not conform to the HTTP/1.1 specification."

 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
 "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
 "g. on high-latency connections. It specifies how many requests are sent in a "
 msgid ""
 "The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
 "enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial e."
 "g. on high-latency connections. It specifies how many requests are sent in a "

-"pipeline.  Previous APT versions had a default of 10 for this setting, but "
-"the default value is now 0 (= disabled) to avoid problems with the ever-"
-"growing amount of webservers and proxies which choose to not conform to the "
-"HTTP/1.1 specification."
+"pipeline.  APT tries to detect and workaround misbehaving webservers and "
+"proxies at runtime, but if you know that yours does not conform to the "
+"HTTP/1.1 specification pipelining can be disabled by setting the value to 0. "
+"It is enabled by default with the value 10."

 msgstr ""
 "Die Einstellung <literal>Acquire::http::Pipeline-Depth</literal> kann "
 "verwandt werden, um HTTP-Weiterleitung zu aktivieren (RFC 2616 Abschnitt "
 msgstr ""
 "Die Einstellung <literal>Acquire::http::Pipeline-Depth</literal> kann "
 "verwandt werden, um HTTP-Weiterleitung zu aktivieren (RFC 2616 Abschnitt "


@@ -4093,7 +4548,7 @@ msgstr ""
 "HTTP/1.1-Spezifikation entsprechen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "HTTP/1.1-Spezifikation entsprechen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:397
+#: apt.conf.5.xml

 msgid ""
 "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
 "follow redirects, which is enabled by default."
 msgid ""
 "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
 "follow redirects, which is enabled by default."


@@ -4102,7 +4557,7 @@ msgstr ""
 "folgen wird, was standardmäßig aktiviert ist."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "folgen wird, was standardmäßig aktiviert ist."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:400
+#: apt.conf.5.xml

 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
 "literal> which accepts integer values in kilobytes per second. The default "
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
 "literal> which accepts integer values in kilobytes per second. The default "


@@ -4118,7 +4573,7 @@ msgstr ""
 "Zeit deaktiviert."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Zeit deaktiviert."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:407
+#: apt.conf.5.xml

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


@@ -4130,7 +4585,7 @@ msgstr ""
 "bekannten Bezeichner verwendet."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "bekannten Bezeichner verwendet."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

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

 msgid ""
 "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
 "an external command to discover the http proxy to use. Apt expects the "
 msgid ""
 "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
 "an external command to discover the http proxy to use. Apt expects the "


@@ -4153,7 +4608,7 @@ msgstr ""
 "dem veralteten Optionsnamen <literal>ProxyAutoDetect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "dem veralteten Optionsnamen <literal>ProxyAutoDetect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:429
+#: apt.conf.5.xml

 msgid ""
 "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
 "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
 msgid ""
 "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
 "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "


@@ -4170,7 +4625,7 @@ msgstr ""
 "<literal>Pipeline-Depth</literal> wird noch nicht unterstützt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "<literal>Pipeline-Depth</literal> wird noch nicht unterstützt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:437
+#: apt.conf.5.xml

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


@@ -4211,7 +4666,7 @@ msgstr ""
 "Rechner ist <literal>&lt;host&gt;::SslForceVersion</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Rechner ist <literal>&lt;host&gt;::SslForceVersion</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

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

 msgid ""
 "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
 "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
 msgid ""
 "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
 "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"


@@ -4246,7 +4701,7 @@ msgstr ""
 "literal> und <literal>$(SITE_PORT)</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "literal> und <literal>$(SITE_PORT)</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:478
+#: apt.conf.5.xml

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


@@ -4263,7 +4718,7 @@ msgstr ""
 "Musterkonfigurationsdatei)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Musterkonfigurationsdatei)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

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

 msgid ""
 "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
 "envar> environment variable to an 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 an HTTP URL - see the discussion of the http "


@@ -4277,7 +4732,7 @@ msgstr ""
 "Effizienz nicht empfohlen FTP über HTTP zu benutzen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Effizienz nicht empfohlen FTP über HTTP zu benutzen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:490
+#: apt.conf.5.xml

 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 "


@@ -4293,13 +4748,13 @@ msgstr ""
 "Server RFC2428 unterstützen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
 "Server RFC2428 unterstützen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>

-#: apt.conf.5.xml:504
+#: apt.conf.5.xml

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

-#: apt.conf.5.xml:499
+#: apt.conf.5.xml

 msgid ""
 "For URIs using the <literal>cdrom</literal> method, the only configurable "
 "option is the mount point, <literal>cdrom::Mount</literal>, which must be "
 msgid ""
 "For URIs using the <literal>cdrom</literal> method, the only configurable "
 "option is the mount point, <literal>cdrom::Mount</literal>, which must be "


@@ -4321,7 +4776,7 @@ msgstr ""
 "Aushängebefehle können per UMount angegeben werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Aushängebefehle können per UMount angegeben werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

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

 msgid ""
 "For GPGV URIs the only configurable option is <literal>gpgv::Options</"
 "literal>, which passes additional parameters to gpgv."
 msgid ""
 "For GPGV URIs the only configurable option is <literal>gpgv::Options</"
 "literal>, which passes additional parameters to gpgv."


@@ -4330,13 +4785,13 @@ msgstr ""
 "literal>, um zusätzliche Parameter an Gpgv weiterzuleiten."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
 "literal>, um zusätzliche Parameter an Gpgv weiterzuleiten."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>

-#: apt.conf.5.xml:523
+#: apt.conf.5.xml

 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr "Acquire::CompressionTypes::<replaceable>Dateierweiterung</replaceable> \"<replaceable>Methodenname</replaceable>\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #, no-wrap
 msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
 msgstr "Acquire::CompressionTypes::<replaceable>Dateierweiterung</replaceable> \"<replaceable>Methodenname</replaceable>\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:518
+#: apt.conf.5.xml

 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 "


@@ -4356,19 +4811,19 @@ msgstr ""
 "\"synopsis\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
 "\"synopsis\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>

-#: apt.conf.5.xml:528
+#: apt.conf.5.xml

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

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

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

-#: apt.conf.5.xml:524
+#: apt.conf.5.xml

 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 "


@@ -4400,13 +4855,13 @@ msgstr ""
 "explizit zur Liste hinzuzufügen, da es automatisch hinzufügt wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
 "explizit zur Liste hinzuzufügen, da es automatisch hinzufügt wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>

-#: apt.conf.5.xml:538
+#: apt.conf.5.xml

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

-#: apt.conf.5.xml:533
+#: apt.conf.5.xml

 msgid ""
 "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
 "literal> will be checked at run time. If this option has been set, the "
 msgid ""
 "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
 "literal> will be checked at run time. If this option has been set, the "


@@ -4432,7 +4887,7 @@ msgstr ""
 "nicht überschreiben, es wird diesen Typ nur vor die Liste setzen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "nicht überschreiben, es wird diesen Typ nur vor die Liste setzen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:543
+#: apt.conf.5.xml

 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "


@@ -4444,7 +4899,7 @@ msgstr ""
 "dies meist nur für lokale Spiegel benutzt werden kann."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "dies meist nur für lokale Spiegel benutzt werden kann."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:550
+#: apt.conf.5.xml

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


@@ -4458,7 +4913,7 @@ msgstr ""
 "False."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "False."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:558
+#: apt.conf.5.xml

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


@@ -4478,13 +4933,13 @@ msgstr ""
 "langen Sprachcodes selten."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
 "langen Sprachcodes selten."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>

-#: apt.conf.5.xml:575
+#: apt.conf.5.xml

 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:563
+#: apt.conf.5.xml

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


@@ -4525,7 +4980,7 @@ msgstr ""
 "\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:576
+#: apt.conf.5.xml

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


@@ -4539,22 +4994,125 @@ msgstr ""
 "Liste hinzugefügt (nach einem impliziten »<literal>none</literal>«)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Liste hinzugefügt (nach einem impliziten »<literal>none</literal>«)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:585
+#: apt.conf.5.xml

 msgid "When downloading, force to use only the IPv4 protocol."
 msgstr "Beim Herunterladen wird die Verwendung des IPv4-Protokolls erzwungen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "When downloading, force to use only the IPv4 protocol."
 msgstr "Beim Herunterladen wird die Verwendung des IPv4-Protokolls erzwungen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

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

 msgid "When downloading, force to use only the IPv6 protocol."
 msgstr "Beim Herunterladen wird die Verwendung des IPv6-Protokolls erzwungen."
 
 msgid "When downloading, force to use only the IPv6 protocol."
 msgstr "Beim Herunterladen wird die Verwendung des IPv6-Protokolls erzwungen."
 

+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
+"The maximum file size of Release/Release.gpg/InRelease files.  The default "
+"is 10MB."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
+"This option controls if apt will use the DNS SRV server record as specified "
+"in RFC 2782 to select an alternative server to connect to.  The default is "
+"\"true\"."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
+"Allow the update operation to load data files from a repository without a "
+"trusted signature. If enabled this option no data files will be loaded and "
+"the update operation fails with a error for this source. The default is "
+"false for backward compatibility. This will be changed in the future."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
+"Allow that a repository that was previously gpg signed to become unsigned "
+"durign a update operation. When there is no valid signature of a perviously "
+"trusted repository apt will refuse the update. This option can be used to "
+"override this protection. You almost certainly never want to enable this. "
+"The default is false.  Note that apt will still consider packages from this "
+"source untrusted and warn about them if you try to install them."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.conf.5.xml
+msgid "scope"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
+"Acquiring changelogs can only be done if an URI is known from where to get "
+"them.  Preferable the Release file indicates this in a 'Changelogs' field. "
+"If this isn't available the Label/Origin field of the Release file is used "
+"to check if a <literal>Acquire::Changelogs::URI::Label::<replaceable>LABEL</"
+"replaceable></literal> or <literal>Acquire::Changelogs::URI::Origin::"
+"<replaceable>ORIGIN</replaceable></literal> option exists and if so this "
+"value is taken. The value in the Release file can be overridden with "
+"<literal>Acquire::Changelogs::URI::Override::Label::<replaceable>LABEL</"
+"replaceable></literal> or <literal>Acquire::Changelogs::URI::Override::"
+"Origin::<replaceable>ORIGIN</replaceable></literal>.  The value should be a "
+"normal URI to a text file, except that package specific data is replaced "
+"with the placeholder <literal>@CHANGEPATH@</literal>. The value for it is: "
+"1. if the package is from a component (e.g. <literal>main</literal>)  this "
+"is the first part otherwise it is omitted, 2. the first letter of source "
+"package name, except if the source package name starts with '<literal>lib</"
+"literal>' in which case it will be the first four letters. 3. The complete "
+"source package name. 4. the complete name again and 5. the source version.  "
+"The first (if present), second, third and fourth part are separated by a "
+"slash ('<literal>/</literal>')  and between the fourth and fifth part is an "
+"underscore ('<literal>_</literal>').  The special value '<literal>no</"
+"literal>' is available for this option indicating that this source can't be "
+"used to acquire changelog files from. Another source will be tried if "
+"available in this case."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: apt.conf.5.xml
+#, fuzzy
+#| msgid "User configuration"
+msgid "Binary specific configuration"
+msgstr "Benutzerkonfiguration"
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml
+msgid ""
+"Especially with the introduction of the <command>apt</command> binary it can "
+"be useful to set certain options only for a specific binary as even options "
+"which look like they would effect only a certain binary like <option>APT::"
+"Get::Show-Versions</option> effect <command>apt-get</command> as well as "
+"<command>apt</command>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml
+msgid ""
+"Setting an option for a specific binary only can be achieved by setting the "
+"option inside the <option>Binary::<replaceable>specific-binary</"
+"replaceable></option> scope. Setting the option <option>APT::Get::Show-"
+"Versions</option> for the <command>apt</command> only can e.g. by done by "
+"setting <option>Binary::apt::APT::Get::Show-Versions</option> instead."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml
+msgid ""
+"Note that as seen in the DESCRIPTION section further above you can't set "
+"binary-specific options on the commandline itself nor in configuration files "
+"loaded via the commandline."
+msgstr ""
+

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

-#: apt.conf.5.xml:598
+#: apt.conf.5.xml

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

-#: apt.conf.5.xml:600
+#: apt.conf.5.xml

 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 "


@@ -4574,30 +5132,32 @@ msgstr ""
 "nicht mit <filename>/</filename> oder <filename>./</filename> beginnen."
 
 #. type: Content of: <refentry><refsect1><para>
 "nicht mit <filename>/</filename> oder <filename>./</filename> beginnen."
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:607
+#: apt.conf.5.xml

 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
 "and <literal>pkgcache</literal> as well as the location to place downloaded "
 "archives, <literal>Dir::Cache::archives</literal>. Generation of caches can "
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
 "and <literal>pkgcache</literal> as well as the location to place downloaded "
 "archives, <literal>Dir::Cache::archives</literal>. Generation of caches can "

-"be turned off by setting their names to the empty string. This will slow "
+"be turned off by setting <literal>pkgcache</literal> or "
+"<literal>srcpkgcache</literal> to <literal>\"\"</literal>.  This will slow "

 "down startup but save disk space. It is probably preferable to turn off the "
 "down startup but save disk space. It is probably preferable to turn off the "

-"pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the "
-"default directory is contained in <literal>Dir::Cache</literal>"
+"pkgcache rather than the srcpkgcache.  Like <literal>Dir::State</literal> "
+"the default directory is contained in <literal>Dir::Cache</literal>"

 msgstr ""
 "<literal>Dir::Cache</literal> enthält Orte, die zu lokalen "
 "Zwischenspeicherinformationen gehören, so wie die beiden "
 "Paketzwischenspeicher <literal>srcpkgcache</literal> und <literal>pkgcache</"
 "literal>, sowie den Ort, an den heruntergeladene Archive platziert werden, "
 "<literal>Dir::Cache::archives</literal>. Die Generierung von "
 msgstr ""
 "<literal>Dir::Cache</literal> enthält Orte, die zu lokalen "
 "Zwischenspeicherinformationen gehören, so wie die beiden "
 "Paketzwischenspeicher <literal>srcpkgcache</literal> und <literal>pkgcache</"
 "literal>, sowie den Ort, an den heruntergeladene Archive platziert werden, "
 "<literal>Dir::Cache::archives</literal>. Die Generierung von "

-"Zwischenspeichern kann ausgeschaltet werden, indem ihre Namen auf leere "
-"Zeichenketten gesetzt werden. Dies wird den Start verlangsamen, aber "
-"Plattenplatz sparen. Es ist vermutlich vorzuziehen, statt des »srcpkgcache«s "
-"den »pkgcache« auszuschalten. Wie <literal>Dir::State</literal> ist das "
-"Standardverzeichnis in <literal>Dir::Cache</literal> enthalten."
+"Zwischenspeichern kann ausgeschaltet werden, indem <literal>pkgcache</"
+"literal> oder <literal>srcpkgcache</literal> auf <literal>\"\"</literal> "
+"wird. Dies wird den Start verlangsamen, aber Plattenplatz sparen. Es ist "
+"vermutlich vorzuziehen, statt des »srcpkgcache«s den »pkgcache« "
+"auszuschalten. Wie <literal>Dir::State</literal> ist das Standardverzeichnis "
+"in <literal>Dir::Cache</literal> enthalten."

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

-#: apt.conf.5.xml:616
+#: apt.conf.5.xml

 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 "


@@ -4612,7 +5172,7 @@ msgstr ""
 "Konfigurationsdatei erfolgt)."
 
 #. type: Content of: <refentry><refsect1><para>
 "Konfigurationsdatei erfolgt)."
 
 #. type: Content of: <refentry><refsect1><para>

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

 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 "


@@ -4624,7 +5184,7 @@ msgstr ""
 "geladen."
 
 #. type: Content of: <refentry><refsect1><para>
 "geladen."
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:626
+#: apt.conf.5.xml

 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 "


@@ -4642,16 +5202,26 @@ msgstr ""
 "Programms an."
 
 #. type: Content of: <refentry><refsect1><para>
 "Programms an."
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:634
+#: apt.conf.5.xml
+#, fuzzy
+#| msgid ""
+#| "The configuration item <literal>RootDir</literal> has a special meaning.  "
+#| "If set, all paths in <literal>Dir::</literal> will be relative to "
+#| "<literal>RootDir</literal>, <emphasis>even paths that are specified "
+#| "absolutely</emphasis>.  So, for instance, if <literal>RootDir</literal> "
+#| "is set to <filename>/tmp/staging</filename> and <literal>Dir::State::"
+#| "status</literal> is set to <filename>/var/lib/dpkg/status</filename>, "
+#| "then the status file will be looked up in <filename>/tmp/staging/var/lib/"
+#| "dpkg/status</filename>."

 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "

-"set, all paths in <literal>Dir::</literal> will be relative to "
-"<literal>RootDir</literal>, <emphasis>even paths that are specified "
-"absolutely</emphasis>.  So, for instance, if <literal>RootDir</literal> is "
-"set to <filename>/tmp/staging</filename> and <literal>Dir::State::status</"
-"literal> is set to <filename>/var/lib/dpkg/status</filename>, then the "
-"status file will be looked up in <filename>/tmp/staging/var/lib/dpkg/status</"
-"filename>."
+"set, all paths will be relative to <literal>RootDir</literal>, "
+"<emphasis>even paths that are specified absolutely</emphasis>.  So, for "
+"instance, if <literal>RootDir</literal> is set to <filename>/tmp/staging</"
+"filename> and <literal>Dir::State::status</literal> is set to <filename>/var/"
+"lib/dpkg/status</filename>, then the status file will be looked up in "
+"<filename>/tmp/staging/var/lib/dpkg/status</filename>.  If you want to "
+"prefix only relative paths, set <literal>Dir</literal> instead."

 msgstr ""
 "Das Konfigurationselement <literal>RootDir</literal> hat eine besondere "
 "Bedeutung. Falls es gesetzt ist, sind alle Pfad relativ zu <literal>RootDir</"
 msgstr ""
 "Das Konfigurationselement <literal>RootDir</literal> hat eine besondere "
 "Bedeutung. Falls es gesetzt ist, sind alle Pfad relativ zu <literal>RootDir</"


@@ -4662,7 +5232,7 @@ msgstr ""
 "<filename>/tmp/staging/var/lib/dpkg/status</filename> nachgesehen."
 
 #. type: Content of: <refentry><refsect1><para>
 "<filename>/tmp/staging/var/lib/dpkg/status</filename> nachgesehen."
 
 #. type: Content of: <refentry><refsect1><para>

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

 msgid ""
 "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
 "which files APT should silently ignore while parsing the files in the "
 msgid ""
 "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
 "which files APT should silently ignore while parsing the files in the "


@@ -4680,12 +5250,12 @@ msgstr ""
 "diese Muster verwandt werden."
 
 #. type: Content of: <refentry><refsect1><title>
 "diese Muster verwandt werden."
 
 #. type: Content of: <refentry><refsect1><title>

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

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

-#: apt.conf.5.xml:658
+#: apt.conf.5.xml

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


@@ -4696,7 +5266,7 @@ msgstr ""
 "<literal>DSelect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "<literal>DSelect</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:663
+#: apt.conf.5.xml

 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"


@@ -4719,7 +5289,7 @@ msgstr ""
 "vor dem Herunterladen neuer Pakete durch."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "vor dem Herunterladen neuer Pakete durch."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:677
+#: apt.conf.5.xml

 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."


@@ -4728,7 +5298,7 @@ msgstr ""
 "übermittelt, wenn es für die Installationsphase durchlaufen wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "übermittelt, wenn es für die Installationsphase durchlaufen wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:682
+#: apt.conf.5.xml

 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the update phase."
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the update phase."


@@ -4737,7 +5307,7 @@ msgstr ""
 "übermittelt, wenn es für die Aktualisierungsphase durchlaufen wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "übermittelt, wenn es für die Aktualisierungsphase durchlaufen wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:687
+#: apt.conf.5.xml

 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."


@@ -4746,12 +5316,12 @@ msgstr ""
 "nachfragen, um fortzufahren. Vorgabe ist es, nur bei Fehlern nachzufragen."
 
 #. type: Content of: <refentry><refsect1><title>
 "nachfragen, um fortzufahren. Vorgabe ist es, nur bei Fehlern nachzufragen."
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt.conf.5.xml:693
+#: apt.conf.5.xml

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

-#: apt.conf.5.xml:694
+#: apt.conf.5.xml

 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."


@@ -4760,7 +5330,7 @@ msgstr ""
 "stehen im Abschnitt <literal>DPkg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "stehen im Abschnitt <literal>DPkg</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:699
+#: apt.conf.5.xml

 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 "


@@ -4771,7 +5341,7 @@ msgstr ""
 "jedes Listenelement wird als einzelnes Argument an &dpkg; übermittelt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "jedes Listenelement wird als einzelnes Argument an &dpkg; übermittelt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:705
+#: apt.conf.5.xml

 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 "


@@ -4785,7 +5355,7 @@ msgstr ""
 "APT abgebrochen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "APT abgebrochen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:712
+#: apt.conf.5.xml

 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 "


@@ -4804,20 +5374,52 @@ msgstr ""
 "übergeben."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "übergeben."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:719
+#: apt.conf.5.xml
+msgid ""
+"Version 2 of this protocol sends more information through the requested file "
+"descriptor: a line with the text <literal>VERSION 2</literal>, the APT "
+"configuration space, and a list of package actions with filename and version "
+"information."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
+"Each configuration directive line has the form <literal>key=value</"
+"literal>.  Special characters (equal signs, newlines, nonprintable "
+"characters, quotation marks, and percent signs in <literal>key</literal> and "
+"newlines, nonprintable characters, and percent signs in <literal>value</"
+"literal>) are %-encoded. Lists are represented by multiple <literal>key::"
+"=value</literal> lines with the same key. The configuration section ends "
+"with a blank line."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml
+msgid ""
+"Package action lines consist of five fields in Version 2: package name "
+"(without architecture qualification even if foreign), old version, direction "
+"of version change (&lt; for upgrades, &gt; for downgrades, = for no change), "
+"new version, action. The version fields are \"-\" for no version at all (for "
+"example when installing a package for the first time; no version is treated "
+"as earlier than any real version, so that is an upgrade, indicated as "
+"<literal>- &lt; 1.23.4</literal>). The action field is \"**CONFIGURE**\" if "
+"the package is being configured, \"**REMOVE**\" if it is being removed, or "
+"the filename of a .deb file if it is being unpacked."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml

 msgid ""
 msgid ""

-"Version 2 of this protocol dumps more information, including the protocol "
-"version, the APT configuration space and the packages, files and versions "
-"being changed. Version 3 adds the architecture and <literal>MultiArch</"
-"literal> flag to each version being dumped."
+"In Version 3 after each version field follows the architecture of this "
+"version, which is \"-\" if there is no version, and a field showing the "
+"MultiArch type \"same\", \"foreign\", \"allowed\" or \"none\". Note that "
+"\"none\" is an incorrect typename which is just kept to remain compatible, "
+"it should be read as \"no\" and users are encouraged to support both."

 msgstr ""
 msgstr ""

-"Version 2 dieses Protokolls gibt mehr Informationen aus, einschließlich der "
-"Protokollversion, dem APT-Konfigurationsraum und den Paketen, Dateien und "
-"den Versionen, die geändert werden. Version 3 fügt jeder ausgegebenen "
-"Version die Architektur und den <literal>MultiArch</literal>-Schalter hinzu."

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

-#: apt.conf.5.xml:724
+#: apt.conf.5.xml

 msgid ""
 "The version of the protocol to be used for the command "
 "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
 msgid ""
 "The version of the protocol to be used for the command "
 "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "


@@ -4835,7 +5437,7 @@ msgstr ""
 "bietet."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "bietet."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:731
+#: apt.conf.5.xml

 msgid ""
 "The file descriptor to be used to send the information can be requested with "
 "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</"
 msgid ""
 "The file descriptor to be used to send the information can be requested with "
 "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</"


@@ -4853,7 +5455,7 @@ msgstr ""
 "verwendeten Dateideskriptors als eine Bestätigung."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "verwendeten Dateideskriptors als eine Bestätigung."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:741
+#: apt.conf.5.xml

 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."


@@ -4862,7 +5464,7 @@ msgstr ""
 "die Vorgabe ist <filename>/</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "die Vorgabe ist <filename>/</filename>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:746
+#: apt.conf.5.xml

 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."


@@ -4872,12 +5474,12 @@ msgstr ""
 "Programme werden erstellt."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 "Programme werden erstellt."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt.conf.5.xml:751
+#: apt.conf.5.xml

 msgid "dpkg trigger usage (and related options)"
 msgstr "Dpkd-Trigger-Benutzung (und zugehörige Optionen)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgid "dpkg trigger usage (and related options)"
 msgstr "Dpkd-Trigger-Benutzung (und zugehörige Optionen)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt.conf.5.xml:752
+#: apt.conf.5.xml

 msgid ""
 "APT can call &dpkg; in such a way as to let it make aggressive use of "
 "triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
 msgid ""
 "APT can call &dpkg; in such a way as to let it make aggressive use of "
 "triggers over multiple calls of &dpkg;. Without further options &dpkg; will "


@@ -4904,7 +5506,7 @@ msgstr ""
 "Pakete konfiguriert werden."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
 "Pakete konfiguriert werden."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>

-#: apt.conf.5.xml:767
+#: apt.conf.5.xml

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


@@ -4918,7 +5520,7 @@ msgstr ""
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 "DPkg::TriggersPending \"true\";"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt.conf.5.xml:761
+#: apt.conf.5.xml

 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 "


@@ -4943,7 +5545,7 @@ msgstr ""
 "Optionenkombination wäre <placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "Optionenkombination wäre <placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:774
+#: apt.conf.5.xml

 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 "


@@ -4966,7 +5568,7 @@ msgstr ""
 "anhängen."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "anhängen."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:782
+#: apt.conf.5.xml

 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"


@@ -4996,7 +5598,7 @@ msgstr ""
 "enden könnte und möglicherweise nicht mehr startbar ist."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "enden könnte und möglicherweise nicht mehr startbar ist."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:797
+#: apt.conf.5.xml

 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 "


@@ -5015,7 +5617,7 @@ msgstr ""
 "deaktivieren."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "deaktivieren."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:804
+#: apt.conf.5.xml

 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "
 msgid ""
 "Useful for the <literal>smart</literal> configuration as a package which has "
 "pending triggers is not considered as <literal>installed</literal>, and "


@@ -5031,7 +5633,7 @@ msgstr ""
 "benötigt werden."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
 "benötigt werden."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>

-#: apt.conf.5.xml:817
+#: apt.conf.5.xml

 #, no-wrap
 msgid ""
 "OrderList::Score {\n"
 #, no-wrap
 msgid ""
 "OrderList::Score {\n"


@@ -5049,7 +5651,7 @@ msgstr ""
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "};"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:810
+#: apt.conf.5.xml

 msgid ""
 "Essential packages (and their dependencies) should be configured immediately "
 "after unpacking. It is a good idea to do this quite early in the upgrade "
 msgid ""
 "Essential packages (and their dependencies) should be configured immediately "
 "after unpacking. It is a good idea to do this quite early in the upgrade "


@@ -5073,12 +5675,12 @@ msgstr ""
 "mit ihren Vorgabewerten. <placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>
 "mit ihren Vorgabewerten. <placeholder type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt.conf.5.xml:830
+#: apt.conf.5.xml

 msgid "Periodic and Archives options"
 msgstr "Periodische- und Archivoptionen"
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "Periodic and Archives options"
 msgstr "Periodische- und Archivoptionen"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:831
+#: apt.conf.5.xml

 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "


@@ -5092,12 +5694,12 @@ msgstr ""
 "Dokumentation dieser Optionen zu erhalten."
 
 #. type: Content of: <refentry><refsect1><title>
 "Dokumentation dieser Optionen zu erhalten."
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt.conf.5.xml:839
+#: apt.conf.5.xml

 msgid "Debug options"
 msgstr "Fehlersuchoptionen"
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "Debug options"
 msgstr "Fehlersuchoptionen"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:841
+#: apt.conf.5.xml

 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 "


@@ -5115,7 +5717,7 @@ msgstr ""
 "könnten es sein:"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 "könnten es sein:"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>

-#: apt.conf.5.xml:852
+#: apt.conf.5.xml

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


@@ -5126,7 +5728,7 @@ msgstr ""
 "getroffenen Entscheidungen ein."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 "getroffenen Entscheidungen ein."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>

-#: apt.conf.5.xml:860
+#: apt.conf.5.xml

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


@@ -5137,7 +5739,7 @@ msgstr ""
 "<literal>apt-get -s install</literal>) als nicht root-Anwender auszuführen."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 "<literal>apt-get -s install</literal>) als nicht root-Anwender auszuführen."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>

-#: apt.conf.5.xml:869
+#: apt.conf.5.xml

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


@@ -5149,7 +5751,7 @@ 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:877
+#: apt.conf.5.xml

 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."


@@ -5158,12 +5760,12 @@ msgstr ""
 "Daten in CD-ROM-IDs aus."
 
 #. type: Content of: <refentry><refsect1><para>
 "Daten in CD-ROM-IDs aus."
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:887
+#: apt.conf.5.xml

 msgid "A full list of debugging options to apt follows."
 msgstr "Eine vollständige Liste der Fehlersuchoptionen von APT folgt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "A full list of debugging options to apt follows."
 msgstr "Eine vollständige Liste der Fehlersuchoptionen von APT folgt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:896
+#: apt.conf.5.xml

 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 msgid ""
 "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""


@@ -5171,28 +5773,28 @@ msgstr ""
 "literal>-Quellen beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "literal>-Quellen beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:907
+#: apt.conf.5.xml

 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 "gibt Informationen aus, die sich auf das Herunterladen von Paketen per FTP "
 "beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 "gibt Informationen aus, die sich auf das Herunterladen von Paketen per FTP "
 "beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:918
+#: apt.conf.5.xml

 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 "gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTP "
 "beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 "gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTP "
 "beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:929
+#: apt.conf.5.xml

 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 "gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTPS "
 "beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 "gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTPS "
 "beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:940
+#: apt.conf.5.xml

 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."


@@ -5201,7 +5803,7 @@ msgstr ""
 "mittels <literal>gpg</literal> beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "mittels <literal>gpg</literal> beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:951
+#: apt.conf.5.xml

 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."


@@ -5210,13 +5812,13 @@ msgstr ""
 "CD-ROMs gespeichert sind."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "CD-ROMs gespeichert sind."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:961
+#: apt.conf.5.xml

 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 "beschreibt den Prozess der Auflösung von Bauabhängigkeiten in &apt-get;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 "beschreibt den Prozess der Auflösung von Bauabhängigkeiten in &apt-get;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:971
+#: apt.conf.5.xml

 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."
 msgid ""
 "Output each cryptographic hash that is generated by the <literal>apt</"
 "literal> libraries."


@@ -5225,7 +5827,7 @@ msgstr ""
 "Bibliotheken generiert wurde."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Bibliotheken generiert wurde."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:981
+#: apt.conf.5.xml

 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 "


@@ -5236,7 +5838,7 @@ msgstr ""
 "ID für eine CD-ROM generiert wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "ID für eine CD-ROM generiert wird."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:992
+#: apt.conf.5.xml

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


@@ -5246,14 +5848,14 @@ msgstr ""
 "gleichen Zeit laufen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "gleichen Zeit laufen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1004
+#: apt.conf.5.xml

 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 "protokolliert, wenn Elemente aus der globalen Warteschlange zum "
 "Herunterladen hinzugefügt oder entfernt werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 "protokolliert, wenn Elemente aus der globalen Warteschlange zum "
 "Herunterladen hinzugefügt oder entfernt werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1014
+#: apt.conf.5.xml

 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."


@@ -5262,7 +5864,7 @@ msgstr ""
 "und kryptografischen Signaturen von heruntergeladenen Dateien beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "und kryptografischen Signaturen von heruntergeladenen Dateien beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1024
+#: apt.conf.5.xml

 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."


@@ -5271,7 +5873,7 @@ msgstr ""
 "Diffs und Fehler, die die Paketindexlisten-Diffs betreffen, aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Diffs und Fehler, die die Paketindexlisten-Diffs betreffen, aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1036
+#: apt.conf.5.xml

 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."


@@ -5281,7 +5883,7 @@ msgstr ""
 "werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1047
+#: apt.conf.5.xml

 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
 msgid ""
 "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""


@@ -5289,7 +5891,7 @@ msgstr ""
 "durchführen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "durchführen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1058
+#: apt.conf.5.xml

 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."


@@ -5299,7 +5901,7 @@ msgstr ""
 "beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "beziehen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1068
+#: apt.conf.5.xml

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


@@ -5315,7 +5917,7 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1082
+#: apt.conf.5.xml

 msgid ""
 "Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "
 msgid ""
 "Generate debug messages describing which packages are marked as keep/install/"
 "remove while the ProblemResolver does his work.  Each addition or deletion "


@@ -5348,7 +5950,7 @@ msgstr ""
 "dem das Paket erscheint."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "dem das Paket erscheint."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1103
+#: apt.conf.5.xml

 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."


@@ -5358,7 +5960,7 @@ msgstr ""
 "sind, aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "sind, aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1114
+#: apt.conf.5.xml

 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."


@@ -5367,7 +5969,7 @@ msgstr ""
 "und alle während deren Auswertung gefundenen Fehler aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "und alle während deren Auswertung gefundenen Fehler aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1125
+#: apt.conf.5.xml

 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."


@@ -5377,7 +5979,7 @@ msgstr ""
 "soll."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "soll."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1137
+#: apt.conf.5.xml

 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
 msgid ""
 "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""


@@ -5385,12 +5987,12 @@ msgstr ""
 "von &dpkg; ausgeführt werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "von &dpkg; ausgeführt werden."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1148
+#: apt.conf.5.xml

 msgid "Output the priority of each package list on startup."
 msgstr "gibt die Priorität jeder Paketliste beim Start aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 msgid "Output the priority of each package list on startup."
 msgstr "gibt die Priorität jeder Paketliste beim Start aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1158
+#: apt.conf.5.xml

 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."


@@ -5400,7 +6002,7 @@ msgstr ""
 "aufgetreten ist)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "aufgetreten ist)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1169
+#: apt.conf.5.xml

 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 "


@@ -5412,7 +6014,7 @@ msgstr ""
 "Marker</literal> beschrieben."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Marker</literal> beschrieben."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1181
+#: apt.conf.5.xml

 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."
 msgid ""
 "Print information about the vendors read from <filename>/etc/apt/vendors."
 "list</filename>."


@@ -5421,21 +6023,23 @@ msgstr ""
 "filename> gelesenen Anbieter aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "filename> gelesenen Anbieter aus."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt.conf.5.xml:1191
+#: apt.conf.5.xml

 msgid ""
 "Display the external commands that are called by apt hooks.  This includes e."
 "g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
 "<literal>APT::Update::{Pre,Post}-Invoke</literal>."
 msgstr ""
 msgid ""
 "Display the external commands that are called by apt hooks.  This includes e."
 "g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
 "<literal>APT::Update::{Pre,Post}-Invoke</literal>."
 msgstr ""

+"zeigt die externen Befehle, die durch APT-Hooks aufgerufen werden. Dies "
+"schließt z.B. die Konfigurationsoptionen <literal>DPkg::{Pre,Post}-Invoke</"
+"literal> oder <literal>APT::Update::{Pre,Post}-Invoke</literal> mit ein."

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

-#: apt.conf.5.xml:1215 apt_preferences.5.xml:547 sources.list.5.xml:239
-#: apt-ftparchive.1.xml:598
+#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt-ftparchive.1.xml

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

-#: apt.conf.5.xml:1216
+#: apt.conf.5.xml

 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."


@@ -5445,17 +6049,17 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>

-#: apt.conf.5.xml:1228
+#: apt.conf.5.xml

 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>

-#: apt_preferences.5.xml:34
+#: apt_preferences.5.xml

 msgid "Preference control file for APT"
 msgstr "Voreinstellungssteuerdatei für APT"
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "Preference control file for APT"
 msgstr "Voreinstellungssteuerdatei für APT"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt_preferences.5.xml:39
+#: apt_preferences.5.xml

 msgid ""
 "The APT preferences file <filename>/etc/apt/preferences</filename> and the "
 "fragment files in the <filename>/etc/apt/preferences.d/</filename> folder "
 msgid ""
 "The APT preferences file <filename>/etc/apt/preferences</filename> and the "
 "fragment files in the <filename>/etc/apt/preferences.d/</filename> folder "


@@ -5468,7 +6072,7 @@ msgstr ""
 "Installation ausgewählt werden."
 
 #. type: Content of: <refentry><refsect1><para>
 "Installation ausgewählt werden."
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt_preferences.5.xml:44
+#: apt_preferences.5.xml

 msgid ""
 "Several versions of a package may be available for installation when the "
 "&sources-list; file contains references to more than one distribution (for "
 msgid ""
 "Several versions of a package may be available for installation when the "
 "&sources-list; file contains references to more than one distribution (for "


@@ -5490,7 +6094,7 @@ msgstr ""
 "Installation ausgewählt wird."
 
 #. type: Content of: <refentry><refsect1><para>
 "Installation ausgewählt wird."
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt_preferences.5.xml:54
+#: apt_preferences.5.xml

 msgid ""
 "Several instances of the same version of a package may be available when the "
 "&sources-list; file contains references to more than one source.  In this "
 msgid ""
 "Several instances of the same version of a package may be available when the "
 "&sources-list; file contains references to more than one source.  In this "


@@ -5506,7 +6110,7 @@ msgstr ""
 "der Version."
 
 #. type: Content of: <refentry><refsect1><para>
 "der Version."
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt_preferences.5.xml:61
+#: apt_preferences.5.xml

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


@@ -5530,7 +6134,7 @@ msgstr ""
 "nicht. Sind wurden gewarnt."
 
 #. type: Content of: <refentry><refsect1><para>
 "nicht. Sind wurden gewarnt."
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt_preferences.5.xml:72
+#: apt_preferences.5.xml

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


@@ -5552,24 +6156,24 @@ msgstr ""
 "diesem Fall wird sie stillschweigend ignoriert."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 "diesem Fall wird sie stillschweigend ignoriert."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt_preferences.5.xml:81
+#: apt_preferences.5.xml

 msgid "APT's Default Priority Assignments"
 msgstr "APTs Standardprioritätszuweisungen"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 msgid "APT's Default Priority Assignments"
 msgstr "APTs Standardprioritätszuweisungen"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>

-#: apt_preferences.5.xml:96
+#: apt_preferences.5.xml

 #, no-wrap
 msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
 msgstr "<command>apt-get install -t testing <replaceable>irgendein_Paket</replaceable></command>\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #, no-wrap
 msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
 msgstr "<command>apt-get install -t testing <replaceable>irgendein_Paket</replaceable></command>\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>

-#: apt_preferences.5.xml:99
+#: apt_preferences.5.xml

 #, no-wrap
 msgid "APT::Default-Release \"stable\";\n"
 msgstr "APT::Default-Release \"stable\";\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #, no-wrap
 msgid "APT::Default-Release \"stable\";\n"
 msgstr "APT::Default-Release \"stable\";\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:83
+#: apt_preferences.5.xml

 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 "


@@ -5597,7 +6201,7 @@ msgstr ""
 "\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 "\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:103
+#: apt_preferences.5.xml

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


@@ -5607,12 +6211,12 @@ msgstr ""
 "Zuweisung:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 "Zuweisung:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:108
+#: apt_preferences.5.xml

 msgid "priority 1"
 msgstr "Priorität 1"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "priority 1"
 msgstr "Priorität 1"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:109
+#: apt_preferences.5.xml

 msgid ""
 "to the versions coming from archives which in their <filename>Release</"
 "filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
 msgid ""
 "to the versions coming from archives which in their <filename>Release</"
 "filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"


@@ -5625,12 +6229,12 @@ msgstr ""
 "<literal>experimental</literal> von Debian."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 "<literal>experimental</literal> von Debian."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:115
+#: apt_preferences.5.xml

 msgid "priority 100"
 msgstr "Priorität 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "priority 100"
 msgstr "Priorität 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:116
+#: apt_preferences.5.xml

 msgid ""
 "to the version that is already installed (if any) and to the versions coming "
 "from archives which in their <filename>Release</filename> files are marked "
 msgid ""
 "to the version that is already installed (if any) and to the versions coming "
 "from archives which in their <filename>Release</filename> files are marked "


@@ -5644,33 +6248,42 @@ msgstr ""
 "backports</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 "backports</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:123
+#: apt_preferences.5.xml

 msgid "priority 500"
 msgstr "Priorität 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "priority 500"
 msgstr "Priorität 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:124
-msgid ""
-"to the versions that are not installed and do not belong to the target "
-"release."
+#: apt_preferences.5.xml
+#, fuzzy
+#| msgid ""
+#| "to the versions that are not installed and belong to the target release."
+msgid "to the versions that do not belong to the target release."

 msgstr ""
 msgstr ""

-"zu den Versionen, die nicht installiert sind und die nicht zum Ziel-Release "
-"gehören."
+"zu den Versionen, die nicht installiert sind und zum Ziel-Release gehören."

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

-#: apt_preferences.5.xml:128
+#: apt_preferences.5.xml

 msgid "priority 990"
 msgstr "Priorität 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "priority 990"
 msgstr "Priorität 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:129
-msgid ""
-"to the versions that are not installed and belong to the target release."
+#: apt_preferences.5.xml
+#, fuzzy
+#| msgid ""
+#| "to the versions that are not installed and belong to the target release."
+msgid "to the versions that belong to the target release."

 msgstr ""
 "zu den Versionen, die nicht installiert sind und zum Ziel-Release gehören."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgstr ""
 "zu den Versionen, die nicht installiert sind und zum Ziel-Release gehören."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:134
+#: apt_preferences.5.xml
+msgid ""
+"The highest of those priorities whose description matches the version is "
+"assigned to the version."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml

 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 "


@@ -5688,7 +6301,7 @@ msgstr ""
 "markiert sind."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 "markiert sind."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:141
+#: apt_preferences.5.xml

 msgid ""
 "APT then applies the following rules, listed in order of precedence, to "
 "determine which version of a package to install."
 msgid ""
 "APT then applies the following rules, listed in order of precedence, to "
 "determine which version of a package to install."


@@ -5698,7 +6311,7 @@ msgstr ""
 "ist."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 "ist."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>

-#: apt_preferences.5.xml:144
+#: apt_preferences.5.xml

 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 "


@@ -5714,12 +6327,12 @@ msgstr ""
 "Downgrading eines Paketes riskant sein kann.)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 "Downgrading eines Paketes riskant sein kann.)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>

-#: apt_preferences.5.xml:150
+#: apt_preferences.5.xml

 msgid "Install the highest priority version."
 msgstr "installiert die Version mit der höchsten Priorität."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 msgid "Install the highest priority version."
 msgstr "installiert die Version mit der höchsten Priorität."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>

-#: apt_preferences.5.xml:151
+#: apt_preferences.5.xml

 msgid ""
 "If two or more versions have the same priority, install the most recent one "
 "(that is, the one with the higher version number)."
 msgid ""
 "If two or more versions have the same priority, install the most recent one "
 "(that is, the one with the higher version number)."


@@ -5728,7 +6341,7 @@ msgstr ""
 "aktuellste installiert (das ist die mit der höheren Versionsnummer)."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 "aktuellste installiert (das ist die mit der höheren Versionsnummer)."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>

-#: apt_preferences.5.xml:154
+#: apt_preferences.5.xml

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


@@ -5740,7 +6353,7 @@ msgstr ""
 "installierte installiert."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 "installierte installiert."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:160
+#: apt_preferences.5.xml

 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 "


@@ -5756,7 +6369,7 @@ msgstr ""
 "upgrade</command> ausgeführt wird."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 "upgrade</command> ausgeführt wird."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:167
+#: apt_preferences.5.xml

 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 "


@@ -5770,7 +6383,7 @@ msgstr ""
 "upgrade</command> ausgeführt wird."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 "upgrade</command> ausgeführt wird."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:172
+#: apt_preferences.5.xml

 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 "


@@ -5790,12 +6403,12 @@ msgstr ""
 "hat."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 "hat."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt_preferences.5.xml:181
+#: apt_preferences.5.xml

 msgid "The Effect of APT Preferences"
 msgstr "Die Auswirkungen von APT-Einstellungen"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgid "The Effect of APT Preferences"
 msgstr "Die Auswirkungen von APT-Einstellungen"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:183
+#: apt_preferences.5.xml

 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 "


@@ -5809,7 +6422,7 @@ msgstr ""
 "allgemeine Gestalt."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 "allgemeine Gestalt."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>

-#: apt_preferences.5.xml:189
+#: apt_preferences.5.xml

 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages with a specified version or version range.  For example, "
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages with a specified version or version range.  For example, "


@@ -5826,7 +6439,7 @@ msgstr ""
 "Pakete können durch Leerzeichen getrennt werden."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 "Pakete können durch Leerzeichen getrennt werden."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>

-#: apt_preferences.5.xml:196
+#: apt_preferences.5.xml

 #, no-wrap
 msgid ""
 "Package: perl\n"
 #, no-wrap
 msgid ""
 "Package: perl\n"


@@ -5838,7 +6451,7 @@ msgstr ""
 "Pin-Priority: 1001\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 "Pin-Priority: 1001\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>

-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml

 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 "


@@ -5853,7 +6466,7 @@ msgstr ""
 "ausgebildeten Domänennamen identifiziert wird, eine Priorität zu."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 "ausgebildeten Domänennamen identifiziert wird, eine Priorität zu."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>

-#: apt_preferences.5.xml:208
+#: apt_preferences.5.xml

 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 "


@@ -5864,7 +6477,7 @@ msgstr ""
 "Paketversionen eine hohe Priorität zu, die lokal liegen."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 "Paketversionen eine hohe Priorität zu, die lokal liegen."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>

-#: apt_preferences.5.xml:213
+#: apt_preferences.5.xml

 #, no-wrap
 msgid ""
 "Package: *\n"
 #, no-wrap
 msgid ""
 "Package: *\n"


@@ -5876,7 +6489,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>

-#: apt_preferences.5.xml:218
+#: apt_preferences.5.xml

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


@@ -5890,7 +6503,7 @@ msgstr ""
 "de.debian.org« identifiziert wird."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 "de.debian.org« identifiziert wird."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>

-#: apt_preferences.5.xml:222
+#: apt_preferences.5.xml

 #, no-wrap
 msgid ""
 "Package: *\n"
 #, no-wrap
 msgid ""
 "Package: *\n"


@@ -5902,7 +6515,7 @@ msgstr ""
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>

-#: apt_preferences.5.xml:226
+#: apt_preferences.5.xml

 msgid ""
 "This should <emphasis>not</emphasis> be confused with the Origin of a "
 "distribution as specified in a <filename>Release</filename> file.  What "
 msgid ""
 "This should <emphasis>not</emphasis> be confused with the Origin of a "
 "distribution as specified in a <filename>Release</filename> file.  What "


@@ -5917,7 +6530,7 @@ msgstr ""
 "oder »Ximian«."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 "oder »Ximian«."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>

-#: apt_preferences.5.xml:231
+#: apt_preferences.5.xml

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


@@ -5928,7 +6541,7 @@ msgstr ""
 "Priorität zu."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 "Priorität zu."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>

-#: apt_preferences.5.xml:235
+#: apt_preferences.5.xml

 #, no-wrap
 msgid ""
 "Package: *\n"
 #, no-wrap
 msgid ""
 "Package: *\n"


@@ -5940,58 +6553,69 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>

-#: apt_preferences.5.xml:240
+#: apt_preferences.5.xml

 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>&testing-codename;"
-"</literal>\"."
+"belonging to any distribution whose Codename is \"<literal>&debian-testing-"
+"codename;</literal>\"."

 msgstr ""
 "Der folgende Datensatz weist allen Paketversionen, die zu einer Distribution "
 msgstr ""
 "Der folgende Datensatz weist allen Paketversionen, die zu einer Distribution "

-"gehören, deren Codename »<literal>&testing-codename;</literal>« ist, eine "
-"hohe Priorität zu."
+"gehören, deren Codename »<literal>&debian-testing-codename;</literal>« ist, "
+"eine hohe Priorität zu."

 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>

-#: apt_preferences.5.xml:244
+#: apt_preferences.5.xml

 #, no-wrap
 msgid ""
 "Package: *\n"
 #, no-wrap
 msgid ""
 "Package: *\n"

-"Pin: release n=&testing-codename;\n"
+"Pin: release n=&debian-testing-codename;\n"

 "Pin-Priority: 900\n"
 msgstr ""
 "Package: *\n"
 "Pin-Priority: 900\n"
 msgstr ""
 "Package: *\n"

-"Pin: release n=&testing-codename;\n"
+"Pin: release n=&debian-testing-codename;\n"

 "Pin-Priority: 900\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 "Pin-Priority: 900\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>

-#: apt_preferences.5.xml:249
+#: apt_preferences.5.xml

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

-"and whose release Version number is \"<literal>&stable-version;</literal>\"."
+"and whose release Version number is \"<literal>&debian-stable-version;</"
+"literal>\"."

 msgstr ""
 "Der folgende Datensatz weist allen Paketversionen, die zu einer Distribution "
 "gehören, deren Archivname »<literal>stable</literal>« und deren Release-"
 msgstr ""
 "Der folgende Datensatz weist allen Paketversionen, die zu einer Distribution "
 "gehören, deren Archivname »<literal>stable</literal>« und deren Release-"

-"Nummer »<literal>&stable-version;</literal>« ist, eine hohe Priorität zu."
+"Nummer »<literal>&debian-stable-version;</literal>« ist, eine hohe Priorität "
+"zu."

 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>

-#: apt_preferences.5.xml:254
+#: apt_preferences.5.xml

 #, no-wrap
 msgid ""
 "Package: *\n"
 #, no-wrap
 msgid ""
 "Package: *\n"

-"Pin: release a=stable, v=&stable-version;\n"
+"Pin: release a=stable, v=&debian-stable-version;\n"

 "Pin-Priority: 500\n"
 msgstr ""
 "Package: *\n"
 "Pin-Priority: 500\n"
 msgstr ""
 "Package: *\n"

-"Pin: release a=stable, v=&stable-version;\n"
+"Pin: release a=stable, v=&debian-stable-version;\n"

 "Pin-Priority: 500\n"
 
 "Pin-Priority: 500\n"
 

+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml
+msgid ""
+"The effect of the comma operator is similar to an \"and\" in logic: All "
+"conditions must be satisfied for the pin to match. There is one exception: "
+"For any type of condition (such as two \"a\" conditions), only the last such "
+"condition is checked."
+msgstr ""
+

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

-#: apt_preferences.5.xml:264
+#: apt_preferences.5.xml

 msgid "Regular expressions and &glob; syntax"
 msgstr "Reguläre Ausdrücke und &glob;-Syntax"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgid "Regular expressions and &glob; syntax"
 msgstr "Reguläre Ausdrücke und &glob;-Syntax"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:266
+#: apt_preferences.5.xml

 msgid ""
 "APT also supports pinning by &glob; expressions, and regular expressions "
 "surrounded by slashes. For example, the following example assigns the "
 msgid ""
 "APT also supports pinning by &glob; expressions, and regular expressions "
 "surrounded by slashes. For example, the following example assigns the "


@@ -6007,19 +6631,19 @@ msgstr ""
 "von Schrägstrichen umschlossen wird)."
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
 "von Schrägstrichen umschlossen wird)."
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>

-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml

 #, no-wrap
 msgid ""
 "Package: gnome* /kde/\n"
 #, no-wrap
 msgid ""
 "Package: gnome* /kde/\n"

-"Pin: release n=experimental\n"
+"Pin: release a=experimental\n"

 "Pin-Priority: 500\n"
 msgstr ""
 "Package: gnome* /kde/\n"
 "Pin-Priority: 500\n"
 msgstr ""
 "Package: gnome* /kde/\n"

-"Pin: release n=experimental\n"
+"Pin: release a=experimental\n"

 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 "Pin-Priority: 500\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:281
+#: apt_preferences.5.xml

 msgid ""
 "The rule for those expressions is that they can occur anywhere where a "
 "string can occur. Thus, the following pin assigns the priority 990 to all "
 msgid ""
 "The rule for those expressions is that they can occur anywhere where a "
 "string can occur. Thus, the following pin assigns the priority 990 to all "


@@ -6030,7 +6654,7 @@ msgstr ""
 "Paketen von einem Release seit Karmic die Priorität 900 zu."
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
 "Paketen von einem Release seit Karmic die Priorität 900 zu."
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>

-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml

 #, no-wrap
 msgid ""
 "Package: *\n"
 #, no-wrap
 msgid ""
 "Package: *\n"


@@ -6042,7 +6666,7 @@ msgstr ""
 "Pin-Priority: 990\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 "Pin-Priority: 990\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:293
+#: apt_preferences.5.xml

 msgid ""
 "If a regular expression occurs in a <literal>Package</literal> field, the "
 "behavior is the same as if this regular expression were replaced with a list "
 msgid ""
 "If a regular expression occurs in a <literal>Package</literal> field, the "
 "behavior is the same as if this regular expression were replaced with a list "


@@ -6060,12 +6684,12 @@ msgstr ""
 "»Package«-Feld wird selbst nicht als ein &glob;-Ausdruck angesehen."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 "»Package«-Feld wird selbst nicht als ein &glob;-Ausdruck angesehen."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt_preferences.5.xml:309
+#: apt_preferences.5.xml

 msgid "How APT Interprets Priorities"
 msgstr "Wie APT Prioritäten interpretiert"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgid "How APT Interprets Priorities"
 msgstr "Wie APT Prioritäten interpretiert"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml

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


@@ -6075,12 +6699,12 @@ msgstr ""
 "(grob gesagt):"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 "(grob gesagt):"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:317
+#: apt_preferences.5.xml

 msgid "P &gt;= 1000"
 msgstr "P &gt;= 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "P &gt;= 1000"
 msgstr "P &gt;= 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:318
+#: apt_preferences.5.xml

 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"


@@ -6089,12 +6713,12 @@ msgstr ""
 "des Pakets durchführt"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 "des Pakets durchführt"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:322
+#: apt_preferences.5.xml

 msgid "990 &lt;= P &lt; 1000"
 msgstr "990 &lt;= P &lt; 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "990 &lt;= P &lt; 1000"
 msgstr "990 &lt;= P &lt; 1000"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml

 msgid ""
 "causes a version to be installed even if it does not come from the target "
 "release, unless the installed version is more recent"
 msgid ""
 "causes a version to be installed even if it does not come from the target "
 "release, unless the installed version is more recent"


@@ -6103,12 +6727,12 @@ msgstr ""
 "Ziel-Release kommt, außer wenn die installierte Version aktueller ist"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 "Ziel-Release kommt, außer wenn die installierte Version aktueller ist"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml

 msgid "500 &lt;= P &lt; 990"
 msgstr "500 &lt;= P &lt; 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "500 &lt;= P &lt; 990"
 msgstr "500 &lt;= P &lt; 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:329
+#: apt_preferences.5.xml

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


@@ -6118,12 +6742,12 @@ msgstr ""
 "neuer ist"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 "neuer ist"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:334
+#: apt_preferences.5.xml

 msgid "100 &lt;= P &lt; 500"
 msgstr "100 &lt;= P &lt; 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "100 &lt;= P &lt; 500"
 msgstr "100 &lt;= P &lt; 500"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml

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


@@ -6133,12 +6757,12 @@ msgstr ""
 "installierte Version neuer ist"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 "installierte Version neuer ist"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:340
+#: apt_preferences.5.xml

 msgid "0 &lt; P &lt; 100"
 msgstr "0 &lt; P &lt; 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "0 &lt; P &lt; 100"
 msgstr "0 &lt; P &lt; 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:341
+#: apt_preferences.5.xml

 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"
 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"


@@ -6147,22 +6771,40 @@ msgstr ""
 "installierte Version des Pakets gibt"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 "installierte Version des Pakets gibt"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:345
+#: apt_preferences.5.xml

 msgid "P &lt; 0"
 msgstr "P &lt; 0"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "P &lt; 0"
 msgstr "P &lt; 0"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:346
+#: apt_preferences.5.xml

 msgid "prevents the version from being installed"
 msgstr "verhindert das Installieren der Version"
 
 msgid "prevents the version from being installed"
 msgstr "verhindert das Installieren der Version"
 

+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
+#: apt_preferences.5.xml
+msgid "P = 0"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
+#: apt_preferences.5.xml
+msgid "has undefined behaviour, do not use it."
+msgstr ""
+

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

-#: apt_preferences.5.xml:351
-msgid ""
-"If any specific-form records match an available package version then the "
-"first such record determines the priority of the package version.  Failing "
-"that, if any general-form records match an available package version then "
-"the first such record determines the priority of the package version."
+#: apt_preferences.5.xml
+#, fuzzy
+#| msgid ""
+#| "If any specific-form records match an available package version then the "
+#| "first such record determines the priority of the package version.  "
+#| "Failing that, if any general-form records match an available package "
+#| "version then the first such record determines the priority of the package "
+#| "version."
+msgid ""
+"The first specific-form record matching an available package version "
+"determines the priority of the package version.  Failing that, the priority "
+"of the package is defined as the maximum of all priorities defined by "
+"generic-form records matching the version.  Records defined using patterns "
+"in the Pin field other than \"*\" are treated like specific-form records."

 msgstr ""
 "Wenn irgendwelche Datensätze mit speziellem Format zu einer verfügbaren "
 "Paketversion passen, dann legt der erste dieser Datensätze die Priorität der "
 msgstr ""
 "Wenn irgendwelche Datensätze mit speziellem Format zu einer verfügbaren "
 "Paketversion passen, dann legt der erste dieser Datensätze die Priorität der "


@@ -6171,7 +6813,7 @@ msgstr ""
 "erste dieser Datensätze die Priorität der Paketversion fest."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 "erste dieser Datensätze die Priorität der Paketversion fest."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:357
+#: apt_preferences.5.xml

 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"


@@ -6180,7 +6822,7 @@ msgstr ""
 "bereits gezeigten Datensätze:"
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
 "bereits gezeigten Datensätze:"
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>

-#: apt_preferences.5.xml:361
+#: apt_preferences.5.xml

 #, no-wrap
 msgid ""
 "Package: perl\n"
 #, no-wrap
 msgid ""
 "Package: perl\n"


@@ -6208,12 +6850,12 @@ msgstr ""
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 "Pin-Priority: 50\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:374
+#: apt_preferences.5.xml

 msgid "Then:"
 msgstr "Dann:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 msgid "Then:"
 msgstr "Dann:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>

-#: apt_preferences.5.xml:376
+#: apt_preferences.5.xml

 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 "


@@ -6228,7 +6870,7 @@ msgstr ""
 "perl;* ist, dann wird von <literal>perl</literal> ein Downgrade durchgeführt."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 "perl;* ist, dann wird von <literal>perl</literal> ein Downgrade durchgeführt."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>

-#: apt_preferences.5.xml:381
+#: apt_preferences.5.xml

 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 "


@@ -6239,7 +6881,7 @@ msgstr ""
 "sogar wenn diese Versionen zum Ziel-Release gehören."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 "sogar wenn diese Versionen zum Ziel-Release gehören."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>

-#: apt_preferences.5.xml:385
+#: apt_preferences.5.xml

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


@@ -6253,12 +6895,12 @@ msgstr ""
 "Pakets installiert ist."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 "Pakets installiert ist."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt_preferences.5.xml:395
+#: apt_preferences.5.xml

 msgid "Determination of Package Version and Distribution Properties"
 msgstr "Festlegung von Paketversion und Distributions-Eigenschaften"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgid "Determination of Package Version and Distribution Properties"
 msgstr "Festlegung von Paketversion und Distributions-Eigenschaften"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:397
+#: apt_preferences.5.xml

 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 "


@@ -6269,7 +6911,7 @@ msgstr ""
 "bereitstellen, um die an diesem Ort verfügbaren Pakete zu beschreiben."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 "bereitstellen, um die an diesem Ort verfügbaren Pakete zu beschreiben."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:401
+#: apt_preferences.5.xml

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


@@ -6288,54 +6930,54 @@ msgstr ""
 "Datensatz sind nur zwei Zeilen zum Setzen der APT-Prioritäten relevant:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 "Datensatz sind nur zwei Zeilen zum Setzen der APT-Prioritäten relevant:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:409
+#: apt_preferences.5.xml

 msgid "the <literal>Package:</literal> line"
 msgstr "die <literal>Package:</literal>-Zeile"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "the <literal>Package:</literal> line"
 msgstr "die <literal>Package:</literal>-Zeile"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:410
+#: apt_preferences.5.xml

 msgid "gives the package name"
 msgstr "gibt den Paketnamen an"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 msgid "gives the package name"
 msgstr "gibt den Paketnamen an"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:413 apt_preferences.5.xml:463
+#: apt_preferences.5.xml

 msgid "the <literal>Version:</literal> line"
 msgstr "die <literal>Version:</literal>-Zeile"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "the <literal>Version:</literal> line"
 msgstr "die <literal>Version:</literal>-Zeile"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:414
+#: apt_preferences.5.xml

 msgid "gives the version number for the named package"
 msgstr "gibt die Versionsnummer für das genannte Paket an"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgid "gives the version number for the named package"
 msgstr "gibt die Versionsnummer für das genannte Paket an"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:419
+#: apt_preferences.5.xml

 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/&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:"
+"dists/&debian-stable-codename;/Release</filename>.  It consists of a single "
+"multi-line record which applies to <emphasis>all</emphasis> of the packages "
+"in the directory tree below its parent.  Unlike the <filename>Packages</"
+"filename> file, nearly all of the lines in a <filename>Release</filename> "
+"file are relevant for setting APT priorities:"

 msgstr ""
 "Die <filename>Release</filename>-Datei ist normalerweise im Verzeichnis "
 "<filename>…/dists/<replaceable>Distributionsname</replaceable></filename> zu "
 "finden, zum Beispiel <filename>…/dists/stable/Release</filename> oder "
 msgstr ""
 "Die <filename>Release</filename>-Datei ist normalerweise im Verzeichnis "
 "<filename>…/dists/<replaceable>Distributionsname</replaceable></filename> zu "
 "finden, zum Beispiel <filename>…/dists/stable/Release</filename> oder "

-"<filename>…/dists/&stable-codename;/Release</filename>. Sie besteht aus "
-"einem einzelnen mehrzeiligen Datensatz, der auf <emphasis>alle</emphasis> "
-"Pakete im Verzeichnisbaum unterhalb des übergeordneten Verzeichnisses "
-"zutrifft. Anders als die <filename>Packages</filename>-Datei sind nahezu "
-"alle Zeilen in einer <filename>Release</filename>-Datei für das Setzen von "
-"APT-Prioritäten relevant:"
+"<filename>…/dists/&debian-stable-codename;/Release</filename>. Sie besteht "
+"aus einem einzelnen mehrzeiligen Datensatz, der auf <emphasis>alle</"
+"emphasis> Pakete im Verzeichnisbaum unterhalb des übergeordneten "
+"Verzeichnisses zutrifft. Anders als die <filename>Packages</filename>-Datei "
+"sind nahezu alle Zeilen in einer <filename>Release</filename>-Datei für das "
+"Setzen von APT-Prioritäten relevant:"

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

-#: apt_preferences.5.xml:430
+#: apt_preferences.5.xml

 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgstr "die <literal>Archive:</literal>- oder <literal>Suite:</literal>-Zeile"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgstr "die <literal>Archive:</literal>- oder <literal>Suite:</literal>-Zeile"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:431
+#: apt_preferences.5.xml

 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 "


@@ -6352,75 +6994,75 @@ msgstr ""
 "die folgende Zeile benötigen:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 "die folgende Zeile benötigen:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>

-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml

 #, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr "Pin: release a=stable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:447
+#: apt_preferences.5.xml

 msgid "the <literal>Codename:</literal> line"
 msgstr "die <literal>Codename:</literal>-Zeile"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "the <literal>Codename:</literal> line"
 msgstr "die <literal>Codename:</literal>-Zeile"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:448
+#: apt_preferences.5.xml

 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: &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:"
+"For example, the line \"Codename: &debian-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>&debian-"
+"testing-codename;</literal>.  Specifying this value in the APT preferences "
+"file would require the line:"

 msgstr ""
 "benennt den Codenamen, zu dem alle Pakete im Verzeichnisbaum gehören. Die "
 msgstr ""
 "benennt den Codenamen, zu dem alle Pakete im Verzeichnisbaum gehören. Die "

-"Zeile »Codename: &testing-codename;« gibt zum Beispiel an, dass alle Pakete "
-"im Verzeichnisbaum unterhalb des der <filename>Release</filename>-Datei "
-"übergeordneten Verzeichnisses zu einer Version mit Namen <literal>&testing-"
-"codename;</literal> gehören. Diesen Wert in der APT-Einstellungsdatei "
-"anzugeben würde die folgende Zeile benötigen:"
+"Zeile »Codename: &debian-testing-codename;« gibt zum Beispiel an, dass alle "
+"Pakete im Verzeichnisbaum unterhalb des der <filename>Release</filename>-"
+"Datei übergeordneten Verzeichnisses zu einer Version mit Namen "
+"<literal>&debian-testing-codename;</literal> gehören. Diesen Wert in der APT-"
+"Einstellungsdatei anzugeben würde die folgende Zeile benötigen:"

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

-#: apt_preferences.5.xml:457
+#: apt_preferences.5.xml

 #, no-wrap
 #, no-wrap

-msgid "Pin: release n=&testing-codename;\n"
-msgstr "Pin: release n=&testing-codename;\n"
+msgid "Pin: release n=&debian-testing-codename;\n"
+msgstr "Pin: release n=&debian-testing-codename;\n"

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

-#: apt_preferences.5.xml:464
+#: apt_preferences.5.xml

 msgid ""
 "names the release version.  For example, the packages in the tree might "
 msgid ""
 "names the release version.  For example, the packages in the tree might "

-"belong to Debian release version &stable-version;.  Note that there is "
-"normally no version number for the <literal>testing</literal> and "
+"belong to Debian release version &debian-stable-version;.  Note that there "
+"is normally no version number for the <literal>testing</literal> and "

 "<literal>unstable</literal> distributions because they have not been "
 "released yet.  Specifying this in the APT preferences file would require one "
 "of the following lines."
 msgstr ""
 "benennt die Release-Version. Die Pakete im Baum könnten zum Beispiel zur "
 "<literal>unstable</literal> distributions because they have not been "
 "released yet.  Specifying this in the APT preferences file would require one "
 "of the following lines."
 msgstr ""
 "benennt die Release-Version. Die Pakete im Baum könnten zum Beispiel zur "

-"Debian-Release-Version &stable-version; gehören. Beachten Sie, dass es "
-"normalerweise keine Versionsnummer für <literal>testing</literal>- und "
+"Debian-Release-Version &debian-stable-version; gehören. Beachten Sie, dass "
+"es normalerweise keine Versionsnummer für <literal>testing</literal>- und "

 "<literal>unstable</literal>-Distributionen gibt, weil sie noch nicht "
 "veröffentlicht wurden. Diese in der APT-Einstellungsdatei anzugeben würde "
 "eine der folgenden Zeilen benötigen:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 "<literal>unstable</literal>-Distributionen gibt, weil sie noch nicht "
 "veröffentlicht wurden. Diese in der APT-Einstellungsdatei anzugeben würde "
 "eine der folgenden Zeilen benötigen:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>

-#: apt_preferences.5.xml:473
+#: apt_preferences.5.xml

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-"Pin: release v=&stable-version;\n"
-"Pin: release a=stable, v=&stable-version;\n"
-"Pin: release &stable-version;\n"
+"Pin: release v=&debian-stable-version;\n"
+"Pin: release a=stable, v=&debian-stable-version;\n"
+"Pin: release &debian-stable-version;\n"

 msgstr ""
 msgstr ""

-"Pin: release v=&stable-version;\n"
-"Pin: release a=stable, v=&stable-version;\n"
-"Pin: release &stable-version;\n"
+"Pin: release v=&debian-stable-version;\n"
+"Pin: release a=stable, v=&debian-stable-version;\n"
+"Pin: release &debian-stable-version;\n"

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

-#: apt_preferences.5.xml:482
+#: apt_preferences.5.xml

 msgid "the <literal>Component:</literal> line"
 msgstr "die <literal>Component:</literal>-Zeile"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "the <literal>Component:</literal> line"
 msgstr "die <literal>Component:</literal>-Zeile"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:483
+#: apt_preferences.5.xml

 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 "


@@ -6438,18 +7080,18 @@ msgstr ""
 "Zeilen benötigen:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 "Zeilen benötigen:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>

-#: apt_preferences.5.xml:492
+#: apt_preferences.5.xml

 #, no-wrap
 msgid "Pin: release c=main\n"
 msgstr "Pin: release c=main\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #, no-wrap
 msgid "Pin: release c=main\n"
 msgstr "Pin: release c=main\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:498
+#: apt_preferences.5.xml

 msgid "the <literal>Origin:</literal> line"
 msgstr "die <literal>Origin:</literal>-Zeile"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "the <literal>Origin:</literal> line"
 msgstr "die <literal>Origin:</literal>-Zeile"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:499
+#: apt_preferences.5.xml

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


@@ -6461,18 +7103,18 @@ msgstr ""
 "in der APT-Einstellungsdatei anzugeben würde die folgende Zeile benötigen:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 "in der APT-Einstellungsdatei anzugeben würde die folgende Zeile benötigen:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>

-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml

 #, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr "Pin: release o=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr "Pin: release o=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>

-#: apt_preferences.5.xml:511
+#: apt_preferences.5.xml

 msgid "the <literal>Label:</literal> line"
 msgstr "die <literal>Label:</literal>-Zeile"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 msgid "the <literal>Label:</literal> line"
 msgstr "die <literal>Label:</literal>-Zeile"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>

-#: apt_preferences.5.xml:512
+#: apt_preferences.5.xml

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


@@ -6485,13 +7127,13 @@ msgstr ""
 "die folgende Zeile benötigen:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 "die folgende Zeile benötigen:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>

-#: apt_preferences.5.xml:518
+#: apt_preferences.5.xml

 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr "Pin: release l=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr "Pin: release l=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:525
+#: apt_preferences.5.xml

 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 "


@@ -6517,12 +7159,12 @@ msgstr ""
 "Distribution heruntergeladen wurde."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 "Distribution heruntergeladen wurde."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt_preferences.5.xml:538
+#: apt_preferences.5.xml

 msgid "Optional Lines in an APT Preferences Record"
 msgstr "Optionale Zeilen in einem APT-Einstellungsdatensatz"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 msgid "Optional Lines in an APT Preferences Record"
 msgstr "Optionale Zeilen in einem APT-Einstellungsdatensatz"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:540
+#: apt_preferences.5.xml

 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "


@@ -6533,12 +7175,12 @@ msgstr ""
 "anfangen. Dieses stellt einen Platz für Kommentare bereit."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 "anfangen. Dieses stellt einen Platz für Kommentare bereit."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt_preferences.5.xml:549
+#: apt_preferences.5.xml

 msgid "Tracking Stable"
 msgstr "Stable verfolgen"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 msgid "Tracking Stable"
 msgstr "Stable verfolgen"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>

-#: apt_preferences.5.xml:557
+#: apt_preferences.5.xml

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


@@ -6562,7 +7204,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:551
+#: apt_preferences.5.xml

 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 "


@@ -6577,8 +7219,7 @@ msgstr ""
 "Distributionen gehören. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 "Distributionen gehören. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>

-#: apt_preferences.5.xml:574 apt_preferences.5.xml:620
-#: apt_preferences.5.xml:678
+#: apt_preferences.5.xml

 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"


@@ -6590,7 +7231,7 @@ msgstr ""
 "apt-get dist-upgrade\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 "apt-get dist-upgrade\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:569
+#: apt_preferences.5.xml

 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 "


@@ -6603,13 +7244,13 @@ msgstr ""
 "type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 "type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>

-#: apt_preferences.5.xml:586
+#: apt_preferences.5.xml

 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr "apt-get install <replaceable>Paket</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr "apt-get install <replaceable>Paket</replaceable>/testing\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml

 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 "


@@ -6623,12 +7264,12 @@ msgstr ""
 "\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 "\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt_preferences.5.xml:592
+#: apt_preferences.5.xml

 msgid "Tracking Testing or Unstable"
 msgstr "Testing oder Unstable verfolgen"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 msgid "Tracking Testing or Unstable"
 msgstr "Testing oder Unstable verfolgen"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>

-#: apt_preferences.5.xml:601
+#: apt_preferences.5.xml

 #, no-wrap
 msgid ""
 "Package: *\n"
 #, no-wrap
 msgid ""
 "Package: *\n"


@@ -6656,7 +7297,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:594
+#: apt_preferences.5.xml

 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 "


@@ -6673,7 +7314,7 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:615
+#: apt_preferences.5.xml

 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 "


@@ -6686,13 +7327,13 @@ msgstr ""
 "type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 "type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>

-#: apt_preferences.5.xml:635
+#: apt_preferences.5.xml

 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr "apt-get install <replaceable>Paket</replaceable>/unstable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr "apt-get install <replaceable>Paket</replaceable>/unstable\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:626
+#: apt_preferences.5.xml

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


@@ -6712,18 +7353,18 @@ msgstr ""
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt_preferences.5.xml:642
+#: apt_preferences.5.xml

 msgid "Tracking the evolution of a codename release"
 msgstr "Die Entwicklung eines Codename-Releases verfolgen"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 msgid "Tracking the evolution of a codename release"
 msgstr "Die Entwicklung eines Codename-Releases verfolgen"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>

-#: apt_preferences.5.xml:656
+#: apt_preferences.5.xml

 #, 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 &testing-codename; or sid\n"
+"Explanation: other than those in the distribution codenamed with &debian-testing-codename; or sid\n"

 "Package: *\n"
 "Package: *\n"

-"Pin: release n=&testing-codename;\n"
+"Pin: release n=&debian-testing-codename;\n"

 "Pin-Priority: 900\n"
 "\n"
 "Explanation: Debian unstable is always codenamed with sid\n"
 "Pin-Priority: 900\n"
 "\n"
 "Explanation: Debian unstable is always codenamed with sid\n"


@@ -6736,10 +7377,10 @@ msgid ""
 "Pin-Priority: -10\n"
 msgstr ""
 "Explanation: Deinstallieren oder nicht installieren von anderen von Debian\n"
 "Pin-Priority: -10\n"
 msgstr ""
 "Explanation: Deinstallieren oder nicht installieren von anderen von Debian\n"

-"Explanation: stammenden Paketversionen als denen der &testing-codename;-\n"
+"Explanation: stammenden Paketversionen als denen der &debian-testing-codename;-\n"

 "Explanation: oder Sid-Distribution\n"
 "Package: *\n"
 "Explanation: oder Sid-Distribution\n"
 "Package: *\n"

-"Pin: release n=&testing-codename;\n"
+"Pin: release n=&debian-testing-codename;\n"

 "Pin-Priority: 900\n"
 "\n"
 "Explanation: Debian-Unstable hat immer den Codenamen sid\n"
 "Pin-Priority: 900\n"
 "\n"
 "Explanation: Debian-Unstable hat immer den Codenamen sid\n"


@@ -6752,7 +7393,7 @@ msgstr ""
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 "Pin-Priority: -10\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:644
+#: apt_preferences.5.xml

 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 "


@@ -6778,63 +7419,75 @@ msgstr ""
 "benutzen. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 "benutzen. <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:673
+#: apt_preferences.5.xml

 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>&testing-codename;</literal>.  "
+"the release codenamed with <literal>&debian-testing-codename;</literal>.  "

 "<placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 "Mit einer geeigneten &sources-list;-Datei und der obigen Einstellungsdatei "
 "wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die "
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 "Mit einer geeigneten &sources-list;-Datei und der obigen Einstellungsdatei "
 "wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die "

-"letzte(n) Version(en) im Release mit Codenamen <literal>&testing-codename;</"
-"literal> durchzuführen. <placeholder type=\"programlisting\" id=\"0\"/>"
+"letzte(n) Version(en) im Release mit Codenamen <literal>&debian-testing-"
+"codename;</literal> durchzuführen. <placeholder type=\"programlisting\" id="
+"\"0\"/>"

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

-#: apt_preferences.5.xml:693
+#: apt_preferences.5.xml

 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr "apt-get install <replaceable>Paket</replaceable>/sid\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr "apt-get install <replaceable>Paket</replaceable>/sid\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt_preferences.5.xml:684
+#: apt_preferences.5.xml

 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>&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\"/>"
+"recent <literal>&debian-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 ""
 "Der folgende Befehl wird APT veranlassen, ein Upgrade des angegebenen Pakets "
 "auf die letzte Version der <literal>sid</literal>-Distribution "
 "durchzuführen. Danach wird <command>apt-get upgrade</command> ein Upgrade "
 msgstr ""
 "Der folgende Befehl wird APT veranlassen, ein Upgrade des angegebenen Pakets "
 "auf die letzte Version der <literal>sid</literal>-Distribution "
 "durchzuführen. Danach wird <command>apt-get upgrade</command> ein Upgrade "

-"des Pakets auf die aktuellste <literal>&testing-codename;</literal>-Version "
-"durchführen, wenn diese aktueller als die installierte Version ist, "
+"des Pakets auf die aktuellste <literal>&debian-testing-codename;</literal>-"
+"Version durchführen, wenn diese aktueller als die installierte Version ist, "

 "andernfalls auf die aktuellste <literal>sid</literal>-Version, wenn diese "
 "aktueller als die installierte Version ist. <placeholder type="
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
 "andernfalls auf die aktuellste <literal>sid</literal>-Version, wenn diese "
 "aktueller als die installierte Version ist. <placeholder type="
 "\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt_preferences.5.xml:708
+#: apt_preferences.5.xml

 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>

-#: sources.list.5.xml:35
+#: sources.list.5.xml

 msgid "List of configured APT data sources"
 msgstr "Liste konfigurierter APT-Datenquellen"
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "List of configured APT data sources"
 msgstr "Liste konfigurierter APT-Datenquellen"
 
 #. type: Content of: <refentry><refsect1><para>

-#: sources.list.5.xml:40
-msgid ""
-"The source list <filename>/etc/apt/sources.list</filename> is designed to "
-"support any number of active sources and a variety of source media. The file "
-"lists one source per line, with the most preferred source listed first. The "
-"information available from the configured sources is acquired by "
-"<command>apt-get update</command> (or by an equivalent command from another "
-"APT front-end)."
+#: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "The source list <filename>/etc/apt/sources.list</filename> is designed to "
+#| "support any number of active sources and a variety of source media. The "
+#| "file lists one source per line, with the most preferred source listed "
+#| "first. The information available from the configured sources is acquired "
+#| "by <command>apt-get update</command> (or by an equivalent command from "
+#| "another APT front-end)."
+msgid ""
+"The source list <filename>/etc/apt/sources.list</filename> and the files "
+"contained in <filename>/etc/apt/sources.list.d/</filename> are designed to "
+"support any number of active sources and a variety of source media. The "
+"files list one source per line (one-line style) or contain multiline stanzas "
+"defining one or more sources per stanza (deb822 style), with the most "
+"preferred source listed first (in case a single version is available from "
+"more than one source). The information available from the configured sources "
+"is acquired by <command>apt-get update</command> (or by an equivalent "
+"command from another APT front-end)."

 msgstr ""
 "Die Quellenliste <filename>/etc/apt/sources.list</filename> wurde entworfen, "
 "um jede Zahl aktiver Quellen und unterschiedlicher Quellmedien zu "
 msgstr ""
 "Die Quellenliste <filename>/etc/apt/sources.list</filename> wurde entworfen, "
 "um jede Zahl aktiver Quellen und unterschiedlicher Quellmedien zu "


@@ -6843,37 +7496,35 @@ msgstr ""
 "durch <command>apt-get update</command> (oder einen vergleichbaren Befehl "
 "einer anderen APT-Oberfläche) beschafft."
 
 "durch <command>apt-get update</command> (oder einen vergleichbaren Befehl "
 "einer anderen APT-Oberfläche) beschafft."
 

-#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:47
-msgid ""
-"Each line specifying a source starts with type (e.g. <literal>deb-src</"
-"literal>)  followed by options and arguments for this type.  Individual "
-"entries cannot be continued onto a following line. Empty lines are ignored, "
-"and a <literal>#</literal> character anywhere on a line marks the remainder "
-"of that line as a comment."
-msgstr ""
-"Jede Zeile, die eine Quelle angibt, beginnt mit den Typ (z.B. <literal>deb-"
-"src</literal>) gefolgt von Optionen und Argumenten für diesen Typ. Einzelne "
-"Einträge können nicht auf einer folgenden Zeile fortgesetzt werden. Leere "
-"Zeilen werden ignoriert und ein <literal>#</literal>-Zeichen irgendwo in "
-"einer Zeile kennzeichnet den Rest dieser Zeile als Kommentar."
-

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

-#: sources.list.5.xml:55
+#: sources.list.5.xml

 msgid "sources.list.d"
 msgstr "sources.list.d"
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "sources.list.d"
 msgstr "sources.list.d"
 
 #. type: Content of: <refentry><refsect1><para>

-#: sources.list.5.xml:56
+#: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "The <filename>/etc/apt/sources.list.d</filename> directory provides a way "
+#| "to add sources.list entries in separate files.  The format is the same as "
+#| "for the regular <filename>sources.list</filename> file.  File names need "
+#| "to end with <filename>.list</filename> and may only contain letters (a-z "
+#| "and A-Z), digits (0-9), underscore (_), hyphen (-) and period (.) "
+#| "characters.  Otherwise APT will print a notice that it has ignored a "
+#| "file, unless that file matches a pattern in the <literal>Dir::Ignore-"
+#| "Files-Silently</literal> configuration list - in which case it will be "
+#| "silently ignored."

 msgid ""
 "The <filename>/etc/apt/sources.list.d</filename> directory provides a way to "
 msgid ""
 "The <filename>/etc/apt/sources.list.d</filename> directory provides a way to "

-"add sources.list entries in separate files.  The format is the same as for "
-"the regular <filename>sources.list</filename> file.  File names need to end "
-"with <filename>.list</filename> and may only contain letters (a-z and A-Z), "
-"digits (0-9), underscore (_), hyphen (-) and period (.) characters.  "
-"Otherwise APT will print a notice that it has ignored a file, unless that "
-"file matches a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
-"configuration list - in which case it will be silently ignored."
+"add sources.list entries in separate files.  Two different file formats are "
+"allowed as described in the next two sections.  Filenames need to have "
+"either the extension <filename>.list</filename> or <filename>.sources</"
+"filename> depending on the contained format.  The filenames may only contain "
+"letters (a-z and A-Z), digits (0-9), underscore (_), hyphen (-) and period "
+"(.) characters.  Otherwise APT will print a notice that it has ignored a "
+"file, unless that file matches a pattern in the <literal>Dir::Ignore-Files-"
+"Silently</literal> configuration list - in which case it will be silently "
+"ignored."

 msgstr ""
 "Das Verzeichnis <filename>/etc/apt/sources.list.d</filename> stellt eine "
 "Möglichkeit bereit, sources.list-Einträge in separaten Dateien hinzuzufügen. "
 msgstr ""
 "Das Verzeichnis <filename>/etc/apt/sources.list.d</filename> stellt eine "
 "Möglichkeit bereit, sources.list-Einträge in separaten Dateien hinzuzufügen. "


@@ -6886,19 +7537,109 @@ msgstr ""
 "Silently</literal> passt – in diesem Fall wird sie stillschweigend ignoriert."
 
 #. type: Content of: <refentry><refsect1><title>
 "Silently</literal> passt – in diesem Fall wird sie stillschweigend ignoriert."
 
 #. type: Content of: <refentry><refsect1><title>

-#: sources.list.5.xml:67
-msgid "The deb and deb-src types"
+#: sources.list.5.xml
+msgid "One-Line-Style Format"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml
+msgid ""
+"Files in this format have the extension <filename>.list</filename>.  Each "
+"line specifying a source starts with a type (e.g. <literal>deb-src</"
+"literal>)  followed by options and arguments for this type.  Individual "
+"entries cannot be continued onto a following line. Empty lines are ignored, "
+"and a <literal>#</literal> character anywhere on a line marks the remainder "
+"of that line as a comment. Consequently an entry can be disabled by "
+"commenting out the entire line.  If options should be provided they are "
+"separated by spaces and all of them together are enclosed by square brackets "
+"(<literal>[]</literal>)  included in the line after the type separated from "
+"it with a space.  If an option allows multiple values these are separated "
+"from each other with a comma (<literal>,</literal>). An option name is "
+"separated from its value(s) by an equals sign (<literal>=</literal>). "
+"Multivalue options also have <literal>-=</literal> and <literal>+=</literal> "
+"as separators, which instead of replacing the default with the given "
+"value(s) modify the default value(s) to remove or include the given values."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml
+msgid ""
+"This is the traditional format and supported by all apt versions.  Note that "
+"not all options as described below are supported by all apt versions.  Note "
+"also that some older applications parsing this format on their own might not "
+"expect to encounter options as they were uncommon before the introduction of "
+"multi-architecture support."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: sources.list.5.xml
+msgid "deb822-Style Format"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml
+msgid ""
+"Files in this format have the extension <filename>.sources</filename>.  The "
+"format is similar in syntax to other files used by Debian and its "
+"derivatives, such as the metadata files that apt will download from the "
+"configured sources or the <filename>debian/control</filename> file in a "
+"Debian source package.  Individual entries are separated by an empty line; "
+"additional empty lines are ignored, and a <literal>#</literal> character at "
+"the start of the line marks the entire line as a comment. An entry can hence "
+"be disabled by commenting out each line belonging to the stanza, but it is "
+"usually easier to add the field \"Enabled: no\" to the stanza to disable the "
+"entry. Removing the field or setting it to yes reenables it.  Options have "
+"the same syntax as every other field: A fieldname separated by a colon "
+"(<literal>:</literal>) and optionally spaces from its value(s).  Note "
+"especially that multiple values are separated by spaces, not by commas as in "
+"the one-line format. Multivalue fields like <literal>Architectures</literal> "
+"also have <literal>Architectures-Add</literal> and <literal>Architectures-"
+"Remove</literal> to modify the default value rather than replacing it."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml
+msgid ""
+"This is a new format supported by apt itself since version 1.1. Previous "
+"versions ignore such files with a notice message as described earlier.  It "
+"is intended to make this format gradually the default format, deprecating "
+"the previously described one-line-style format, as it is easier to create, "
+"extend and modify for humans and machines alike especially if a lot of "
+"sources and/or options are involved.  Developers who are working with and/or "
+"parsing apt sources are highly encouraged to add support for this format and "
+"to contact the APT team to coordinate and share this work. Users can freely "
+"adopt this format already, but may encounter problems with software not "
+"supporting the format yet."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: sources.list.5.xml
+#, fuzzy
+#| msgid "The deb and deb-src types"
+msgid "The deb and deb-src Types: General Format"

 msgstr "Die Typen deb und deb-src"
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr "Die Typen deb und deb-src"
 
 #. type: Content of: <refentry><refsect1><para>

-#: sources.list.5.xml:68
+#: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "The <literal>deb</literal> type references a typical two-level Debian "
+#| "archive, <filename>distribution/component</filename>. The "
+#| "<literal>distribution</literal> is generally an archive name like "
+#| "<literal>stable</literal> or <literal>testing</literal> or a codename "
+#| "like <literal>&debian-stable-codename;</literal> or <literal>&debian-"
+#| "testing-codename;</literal> while component is one of <literal>main</"
+#| "literal>, <literal>contrib</literal> or <literal>non-free</literal>. The "
+#| "<literal>deb-src</literal> type references a Debian distribution's source "
+#| "code in the same form as the <literal>deb</literal> type.  A <literal>deb-"
+#| "src</literal> line is required to fetch source indexes."

 msgid ""
 "The <literal>deb</literal> type references a typical two-level Debian "
 "archive, <filename>distribution/component</filename>. The "
 msgid ""
 "The <literal>deb</literal> type references a typical two-level Debian "
 "archive, <filename>distribution/component</filename>. The "

-"<literal>distribution</literal> is generally an archive name like "
+"<literal>distribution</literal> is generally a suite name like "

 "<literal>stable</literal> or <literal>testing</literal> or a codename like "
 "<literal>stable</literal> or <literal>testing</literal> or a codename like "

-"<literal>&stable-codename;</literal> or <literal>&testing-codename;</"
-"literal> while component is one of <literal>main</literal>, "
+"<literal>&debian-stable-codename;</literal> or <literal>&debian-testing-"
+"codename;</literal> while component is one of <literal>main</literal>, "

 "<literal>contrib</literal> or <literal>non-free</literal>. The <literal>deb-"
 "src</literal> type references a Debian distribution's source code in the "
 "same form as the <literal>deb</literal> type.  A <literal>deb-src</literal> "
 "<literal>contrib</literal> or <literal>non-free</literal>. The <literal>deb-"
 "src</literal> type references a Debian distribution's source code in the "
 "same form as the <literal>deb</literal> type.  A <literal>deb-src</literal> "


@@ -6907,88 +7648,81 @@ msgstr ""
 "Der <literal>deb</literal>-Typ beschreibt ein typisches zweistufiges Debian-"
 "Archiv, <filename>Distribution/Komponente</filename>. <literal>Distribution</"
 "literal> ist typischerweise ein Archivname wie <literal>stable</literal> "
 "Der <literal>deb</literal>-Typ beschreibt ein typisches zweistufiges Debian-"
 "Archiv, <filename>Distribution/Komponente</filename>. <literal>Distribution</"
 "literal> ist typischerweise ein Archivname wie <literal>stable</literal> "

-"oder <literal>testing</literal> oder ein Codename wie <literal>&stable-"
-"codename;</literal> oder <literal>&testing-codename;</literal> während "
-"Komponente entweder <literal>main</literal>, <literal>contrib</literal> oder "
-"<literal>non-free</literal> ist. Der <literal>deb-src</literal>-Typ "
-"beschreibt den Quellcode einer Debian-Distribution in der gleichen Form wie "
-"den <literal>deb</literal>-Typ. Eine <literal>deb-src</literal>-Zeile wird "
-"benötigt, um Quellindizes herunterzuladen."
+"oder <literal>testing</literal> oder ein Codename wie <literal>&debian-"
+"stable-codename;</literal> oder <literal>&debian-testing-codename;</literal> "
+"während Komponente entweder <literal>main</literal>, <literal>contrib</"
+"literal> oder <literal>non-free</literal> ist. Der <literal>deb-src</"
+"literal>-Typ beschreibt den Quellcode einer Debian-Distribution in der "
+"gleichen Form wie den <literal>deb</literal>-Typ. Eine <literal>deb-src</"
+"literal>-Zeile wird benötigt, um Quellindizes herunterzuladen."

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

-#: sources.list.5.xml:79
+#: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "The format for a <filename>sources.list</filename> entry using the "
+#| "<literal>deb</literal> and <literal>deb-src</literal> types is:"

 msgid ""
 msgid ""

-"The format for a <filename>sources.list</filename> entry using the "
-"<literal>deb</literal> and <literal>deb-src</literal> types is:"
+"The format for two one-line-style entries using the <literal>deb</literal> "
+"and <literal>deb-src</literal> types is:"

 msgstr ""
 "Das Format für einen <filename>sources.list</filename>-Eintrag, der die "
 "<literal>deb</literal>- und <literal>deb-src</literal>-Typen benutzt, ist:"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 msgstr ""
 "Das Format für einen <filename>sources.list</filename>-Eintrag, der die "
 "<literal>deb</literal>- und <literal>deb-src</literal>-Typen benutzt, ist:"
 
 #. type: Content of: <refentry><refsect1><literallayout>

-#: sources.list.5.xml:82
+#: sources.list.5.xml

 #, no-wrap
 #, no-wrap

-msgid "deb [ options ] uri suite [component1] [component2] [...]"
-msgstr "deb [ Optionen ] URI Suite [Komponente1] [Komponente2] […]"
+msgid ""
+"deb [ option1=value1 option2=value2 ] uri suite [component1] [component2] [...]\n"
+"deb-src [ option1=value1 option2=value2 ] uri suite [component1] [component2] [...]"
+msgstr ""

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

-#: sources.list.5.xml:86
+#: sources.list.5.xml

 #, no-wrap
 msgid ""
 "     Types: deb deb-src\n"
 #, no-wrap
 msgid ""
 "     Types: deb deb-src\n"

-"     URIs: http://example.com\n"
-"     Suites: stable testing\n"
-"     Sections: component1 component2\n"
-"     Description: short\n"
-"      long long long\n"
-"     [option1]: [option1-value]\n"
-"\n"
-"     Types: deb\n"
-"     URIs: http://another.example.com\n"
-"     Suites: experimental\n"
-"     Sections: component1 component2\n"
-"     Enabled: no\n"
-"     Description: short\n"
-"      long long long\n"
-"     [option1]: [option1-value]\n"
+"     URIs: uri\n"
+"     Suites: suite\n"
+"     Components: [component1] [component2] [...]\n"
+"     option1: value1\n"
+"     option2: value2\n"

 "   "
 msgstr ""
 "   "
 msgstr ""

-"     Types: deb deb-src\n"
-"     URIs: http://example.com\n"
-"     Suites: stable testing\n"
-"     Sections: Komponente1 Komponente2\n"
-"     Description: short\n"
-"      long long long\n"
-"     [Option1]: [Option1-Wert]\n"
-"\n"
-"     Types: deb\n"
-"     URIs: http://another.example.com\n"
-"     Suites: experimental\n"
-"     Sections: Komponente1 Komponente2\n"
-"     Enabled: no\n"
-"     Description: short\n"
-"      long long long\n"
-"     [Option1]: [Option1-Wert]\n"
-"   "

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

-#: sources.list.5.xml:84
+#: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "Alternatively a rfc822 style format is also supported: <placeholder type="
+#| "\"literallayout\" id=\"0\"/>"

 msgid ""
 msgid ""

-"Alternatively a rfc822 style format is also supported: <placeholder type="
-"\"literallayout\" id=\"0\"/>"
+"Alternatively the equivalent entry in deb822 style looks like this: "
+"<placeholder type=\"literallayout\" id=\"0\"/>"

 msgstr ""
 "Alternativ wird auch ein Format im Stil von RFC822 unterstützt: <placeholder "
 "type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr ""
 "Alternativ wird auch ein Format im Stil von RFC822 unterstützt: <placeholder "
 "type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>

-#: sources.list.5.xml:105
+#: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "The URI for the <literal>deb</literal> type must specify the base of the "
+#| "Debian distribution, from which APT will find the information it needs.  "
+#| "<literal>suite</literal> can specify an exact path, in which case the "
+#| "components must be omitted and <literal>suite</literal> must end with a "
+#| "slash (<literal>/</literal>). This is useful for the case when only a "
+#| "particular sub-section of the archive denoted by the URI is of interest.  "
+#| "If <literal>suite</literal> does not specify an exact path, at least one "
+#| "<literal>component</literal> must be present."

 msgid ""
 "The URI for the <literal>deb</literal> type must specify the base of the "
 "Debian distribution, from which APT will find the information it needs.  "
 "<literal>suite</literal> can specify an exact path, in which case the "
 "components must be omitted and <literal>suite</literal> must end with a "
 "slash (<literal>/</literal>). This is useful for the case when only a "
 msgid ""
 "The URI for the <literal>deb</literal> type must specify the base of the "
 "Debian distribution, from which APT will find the information it needs.  "
 "<literal>suite</literal> can specify an exact path, in which case the "
 "components must be omitted and <literal>suite</literal> must end with a "
 "slash (<literal>/</literal>). This is useful for the case when only a "

-"particular sub-section of the archive denoted by the URI is of interest.  If "
-"<literal>suite</literal> does not specify an exact path, at least one "
+"particular sub-directory of the archive denoted by the URI is of interest.  "
+"If <literal>suite</literal> does not specify an exact path, at least one "

 "<literal>component</literal> must be present."
 msgstr ""
 "Die URI für den <literal>deb</literal>-Typ muss die Basis der Debian-"
 "<literal>component</literal> must be present."
 msgstr ""
 "Die URI für den <literal>deb</literal>-Typ muss die Basis der Debian-"


@@ -7001,13 +7735,22 @@ msgstr ""
 "muss mindestens eine <literal>Komponente</literal> angegeben sein."
 
 #. type: Content of: <refentry><refsect1><para>
 "muss mindestens eine <literal>Komponente</literal> angegeben sein."
 
 #. type: Content of: <refentry><refsect1><para>

-#: sources.list.5.xml:114
+#: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</"
+#| "literal> which expands to the Debian architecture (such as "
+#| "<literal>amd64</literal> or <literal>armel</literal>) used on the system. "
+#| "This permits architecture-independent <filename>sources.list</filename> "
+#| "files to be used. In general this is only of interest when specifying an "
+#| "exact path, <literal>APT</literal> will automatically generate a URI with "
+#| "the current architecture otherwise."

 msgid ""
 "<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</"
 "literal> which expands to the Debian architecture (such as <literal>amd64</"
 "literal> or <literal>armel</literal>) used on the system. This permits "
 "architecture-independent <filename>sources.list</filename> files to be used. "
 msgid ""
 "<literal>suite</literal> may also contain a variable, <literal>$(ARCH)</"
 "literal> which expands to the Debian architecture (such as <literal>amd64</"
 "literal> or <literal>armel</literal>) used on the system. This permits "
 "architecture-independent <filename>sources.list</filename> files to be used. "

-"In general this is only of interest when specifying an exact path, "
+"In general this is only of interest when specifying an exact path; "

 "<literal>APT</literal> will automatically generate a URI with the current "
 "architecture otherwise."
 msgstr ""
 "<literal>APT</literal> will automatically generate a URI with the current "
 "architecture otherwise."
 msgstr ""


@@ -7021,19 +7764,32 @@ msgstr ""
 "generieren."
 
 #. type: Content of: <refentry><refsect1><para>
 "generieren."
 
 #. type: Content of: <refentry><refsect1><para>

-#: sources.list.5.xml:122
-msgid ""
-"In the traditional style sources.list format since only one distribution can "
-"be specified per line it may be necessary to have multiple lines for the "
-"same URI, if a subset of all available distributions or components at that "
+#: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "In the traditional style sources.list format since only one distribution "
+#| "can be specified per line it may be necessary to have multiple lines for "
+#| "the same URI, if a subset of all available distributions or components at "
+#| "that location is desired.  APT will sort the URI list after it has "
+#| "generated a complete set internally, and will collapse multiple "
+#| "references to the same Internet host, for instance, into a single "
+#| "connection, so that it does not inefficiently establish an FTP "
+#| "connection, close it, do something else, and then re-establish a "
+#| "connection to that same host. This feature is useful for accessing busy "
+#| "FTP sites with limits on the number of simultaneous anonymous users. APT "
+#| "also parallelizes connections to different hosts to more effectively deal "
+#| "with sites with low bandwidth."
+msgid ""
+"Especially in the one-line-style format since only one distribution can be "
+"specified per line it may be necessary to have multiple lines for the same "
+"URI, if a subset of all available distributions or components at that "

 "location is desired.  APT will sort the URI list after it has generated a "
 "complete set internally, and will collapse multiple references to the same "
 "Internet host, for instance, into a single connection, so that it does not "
 "location is desired.  APT will sort the URI list after it has generated a "
 "complete set internally, and will collapse multiple references to the same "
 "Internet host, for instance, into a single connection, so that it does not "

-"inefficiently establish an FTP connection, close it, do something else, and "
-"then re-establish a connection to that same host. This feature is useful for "
-"accessing busy FTP sites with limits on the number of simultaneous anonymous "
-"users. APT also parallelizes connections to different hosts to more "
-"effectively deal with sites with low bandwidth."
+"inefficiently establish a connection, close it, do something else, and then "
+"re-establish a connection to that same host. APT also parallelizes "
+"connections to different hosts to more effectively deal with sites with low "
+"bandwidth."

 msgstr ""
 "In der Sources.list im herkömmlichen Formatstil könnte es nötig sein, da pro "
 "Zeile nur eine Distribution angegeben werden kann, mehrere Zeilen für die "
 msgstr ""
 "In der Sources.list im herkömmlichen Formatstil könnte es nötig sein, da pro "
 "Zeile nur eine Distribution angegeben werden kann, mehrere Zeilen für die "


@@ -7050,31 +7806,97 @@ msgstr ""
 "hauszuhalten."
 
 #. type: Content of: <refentry><refsect1><para>
 "hauszuhalten."
 
 #. type: Content of: <refentry><refsect1><para>

-#: sources.list.5.xml:136
-msgid ""
-"<literal>options</literal> is always optional and needs to be surrounded by "
-"square brackets. It can consist of multiple settings in the form "
-"<literal><replaceable>setting</replaceable>=<replaceable>value</"
-"replaceable></literal>.  Multiple settings are separated by spaces. The "
-"following settings are supported by APT (note however that unsupported "
-"settings will be ignored silently):"
-msgstr ""
-"<literal>options</literal> ist immer optional und muss in eckige Klammern "
-"eingeschlossen werden. Es kann aus mehreren Einstellungen in der Form "
-"<literal><replaceable>Einstellung</replaceable>=<replaceable>Wert</"
-"replaceable></literal> bestehen. Mehrere Einstellungen werden durch "
-"Leerzeichen getrennt. Die folgenden Einstellungen werden von APT "
-"unterstützt. Beachten Sie allerdings, dass nicht unterstützte Einstellungen "
-"stillschweigend ignoriert werden."
+#: sources.list.5.xml
+msgid ""
+"It is important to list sources in order of preference, with the most "
+"preferred source listed first. Typically this will result in sorting by "
+"speed from fastest to slowest (CD-ROM followed by hosts on a local network, "
+"followed by distant Internet hosts, for example)."
+msgstr ""
+"Es ist wichtig, die Quellen in der Reihenfolge ihrer Wichtigkeit "
+"aufzulisten, die bevorzugte Quelle zuerst. Typischerweise resultiert dies in "
+"einer Sortierung nach Geschwindigkeit, vom schnellsten zum langsamsten (CD-"
+"ROM, gefolgt von Rechnern im lokalen Netzwerk, gefolgt von Internet-"
+"Rechnern, zum Beispiel)."
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml
+#, no-wrap
+msgid "&sourceslist-list-format;"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml
+#, no-wrap
+msgid "&sourceslist-sources-format;"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml
+msgid ""
+"As an example, the sources for your distribution could look like this in one-"
+"line-style format: <placeholder type=\"literallayout\" id=\"0\"/> or like "
+"this in deb822 style format: <placeholder type=\"literallayout\" id=\"1\"/>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: sources.list.5.xml
+#, fuzzy
+#| msgid "The deb and deb-src types"
+msgid "The deb and deb-src types: Options"
+msgstr "Die Typen deb und deb-src"
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml
+msgid ""
+"Each source entry can have options specified to modify which source is "
+"accessed and how data is acquired from it. Format, syntax and names of the "
+"options vary between the one-line-style and deb822-style formats as "
+"described, but they both have the same options available. For simplicity we "
+"list the deb822 fieldname and provide the one-line name in brackets.  "
+"Remember that besides setting multivalue options explicitly, there is also "
+"the option to modify them based on the default, but we aren't listing those "
+"names explicitly here. Unsupported options are silently ignored by all APT "
+"versions."
+msgstr ""

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

-#: sources.list.5.xml:142
+#: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+#| "replaceable>,…</literal> can be used to specify for which architectures "
+#| "information should be downloaded. If this option is not set all "
+#| "architectures defined by the <literal>APT::Architectures</literal> option "
+#| "will be downloaded."

 msgid ""
 msgid ""

-"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
-"replaceable>,…</literal> can be used to specify for which architectures "
-"information should be downloaded. If this option is not set all "
-"architectures defined by the <literal>APT::Architectures</literal> option "
-"will be downloaded."
+"<option>Architectures</option> (<option>arch</option>) is a multivalue "
+"option defining for which architectures information should be downloaded. If "
+"this option isn't set the default is all architectures as defined by the "
+"<option>APT::Architectures</option> config option."
+msgstr ""
+"<literal>arch=<replaceable>Architektur1</replaceable>,"
+"<replaceable>Architektur2</replaceable>, …</literal> kann benutzt werden, um "
+"anzugeben, für welche Architekturen Paketinformationen heruntergeladen "
+"werden sollen. Falls diese Option nicht gesetzt ist, werden alle durch die "
+"Option <literal>APT::Architectures</literal> definierten Architekturen "
+"heruntergeladen."
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+#| "replaceable>,…</literal> can be used to specify for which architectures "
+#| "information should be downloaded. If this option is not set all "
+#| "architectures defined by the <literal>APT::Architectures</literal> option "
+#| "will be downloaded."
+msgid ""
+"<option>Languages</option> (<option>lang</option>) is a multivalue option "
+"defining for which languages information such as translated package "
+"descriptions should be downloaded.  If this option isn't set the default is "
+"all languages as defined by the <option>Acquire::Languages</option> config "
+"option."

 msgstr ""
 "<literal>arch=<replaceable>Architektur1</replaceable>,"
 "<replaceable>Architektur2</replaceable>, …</literal> kann benutzt werden, um "
 msgstr ""
 "<literal>arch=<replaceable>Architektur1</replaceable>,"
 "<replaceable>Architektur2</replaceable>, …</literal> kann benutzt werden, um "


@@ -7084,81 +7906,133 @@ msgstr ""
 "heruntergeladen."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 "heruntergeladen."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>

-#: sources.list.5.xml:146
+#: sources.list.5.xml
+msgid ""
+"<option>Targets</option> (<option>target</option>) is a multivalue option "
+"defining which download targets apt will try to acquire from this source. If "
+"not specified, the default set is defined by the <option>Acquire::"
+"IndexTargets</option> configuration scope.  Additionally, specific targets "
+"can be enabled or disabled by using the identifier as field name instead of "
+"using this multivalue option."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml

 msgid ""
 msgid ""

-"<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
-"replaceable>,…</literal> and <literal>arch-=<replaceable>arch1</replaceable>,"
-"<replaceable>arch2</replaceable>,…</literal> which can be used to add/remove "
-"architectures from the set which will be downloaded."
+"<option>PDiffs</option> (<option>pdiffs</option>)  is a yes/no value which "
+"controls if APT should try to use PDiffs to update old indexes instead of "
+"downloading the new indexes entirely. The value of this option is ignored if "
+"the repository doesn't announce the availability of PDiffs.  Defaults to the "
+"value of the option with the same name for a specific index file defined in "
+"the <option>Acquire::IndexTargets</option> scope, which itself defaults to "
+"the value of configuration option <option>Acquire::PDiffs</option> which "
+"defaults to <literal>yes</literal>."

 msgstr ""
 msgstr ""

-"<literal>arch+=<replaceable>Architektur1</replaceable>,"
-"<replaceable>Architektur2</replaceable>, …</literal> und <literal>arch-"
-"=<replaceable>Architektur1</replaceable>,<replaceable>Architektur2</"
-"replaceable>, …</literal>, die benutzt werden können, um der "
-"Zusammenstellung, die heruntergeladen werden soll, Architekturen "
-"hinzuzufügen oder zu entfernen."

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

-#: sources.list.5.xml:149
-msgid ""
-"<literal>trusted=yes</literal> can be set to indicate that packages from "
-"this source are always authenticated even if the <filename>Release</"
-"filename> file is not signed or the signature can't be checked. This "
-"disables parts of &apt-secure; and should therefore only be used in a local "
-"and trusted context. <literal>trusted=no</literal> is the opposite which "
-"handles even correctly authenticated sources as not authenticated."
-msgstr ""
-"<literal>trusted=yes</literal> kann gesetzt werden, um anzuzeigen, dass "
-"Pakete aus dieser Quelle immer authentifiziert sind, sogar, falls die Datei "
-"<filename>Release</filename> nicht signiert ist oder die Signatur nicht "
-"geprüft werden kann. Dies deaktiviert Teile von &apt-secure; und sollte "
-"daher nur in lokalem und vertrauenswürdigem Kontext benutzt werden. "
-"<literal>trusted=no</literal> ist das Gegenteil davon. Es handhabt sogar "
-"korrekt authentifizierte Quellen als nicht authentifiziert."
+#: sources.list.5.xml
+msgid ""
+"<option>By-Hash</option> (<option>by-hash</option>)  can have the value "
+"<literal>yes</literal>, <literal>no</literal> or <literal>force</literal> "
+"and controls if APT should try to acquire indexes via a URI constructed from "
+"a hashsum of the expected file instead of using the well-known stable "
+"filename of the index. Using this can avoid hashsum mismatches, but requires "
+"a supporting mirror. A <literal>yes</literal> or <literal>no</literal> value "
+"activates/disables the use of this feature if this source indicates support "
+"for it, while <literal>force</literal> will enable the feature regardless of "
+"what the source indicates. Defaults to the value of the option of the same "
+"name for a specific index file defined in the <option>Acquire::IndexTargets</"
+"option> scope, which itself defaults to the value of configuration option "
+"<option>Acquire::By-Hash</option> which defaults to <literal>yes</literal>."
+msgstr ""

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

-#: sources.list.5.xml:156
+#: sources.list.5.xml

 msgid ""
 msgid ""

-"It is important to list sources in order of preference, with the most "
-"preferred source listed first. Typically this will result in sorting by "
-"speed from fastest to slowest (CD-ROM followed by hosts on a local network, "
-"followed by distant Internet hosts, for example)."
+"Furthermore, there are options which if set affect <emphasis>all</emphasis> "
+"sources with the same URI and Suite, so they have to be set on all such "
+"entries and can not be varied between different components. APT will try to "
+"detect and error out on such anomalies."

 msgstr ""
 msgstr ""

-"Es ist wichtig, die Quellen in der Reihenfolge ihrer Wichtigkeit "
-"aufzulisten, die bevorzugte Quelle zuerst. Typischerweise resultiert dies in "
-"einer Sortierung nach Geschwindigkeit, vom schnellsten zum langsamsten (CD-"
-"ROM, gefolgt von Rechnern im lokalen Netzwerk, gefolgt von Internet-"
-"Rechnern, zum Beispiel)."

 
 

-#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:161
-msgid "Some examples:"
-msgstr "Einige Beispiele:"
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"<option>Trusted</option> (<option>trusted</option>)  is a tri-state value "
+"which defaults to APT deciding if a source is considered trusted or if "
+"warnings should be raised before e.g.  packages are installed from this "
+"source. This option can be used to override that decision. The value "
+"<literal>yes</literal> tells APT always to consider this source as trusted, "
+"even if it doesn't pass authentication checks. It disables parts of &apt-"
+"secure;, and should therefore only be used in a local and trusted context "
+"(if at all) as otherwise security is breached. The value <literal>no</"
+"literal> does the opposite, causing the source to be handled as untrusted "
+"even if the authentication checks passed successfully. The default value "
+"can't be set explicitly."
+msgstr ""

 
 

-#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:163
-#, no-wrap
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml

 msgid ""
 msgid ""

-"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"
-"   "
+"<option>Signed-By</option> (<option>signed-by</option>)  is either an "
+"absolute path to a keyring file (has to be accessible and readable for the "
+"<literal>_apt</literal> user, so ensure everyone has read-permissions on the "
+"file) or a fingerprint of a key either in the <filename>trusted.gpg</"
+"filename> keyring or in one of the keyrings in the <filename>trusted.gpg.d/</"
+"filename> directory (see <command>apt-key fingerprint</command>). If the "
+"option is set, only the key(s) in this keyring or only the key with this "
+"fingerprint is used for the &apt-secure; verification of this repository. "
+"Otherwise all keys in the trusted keyrings are considered valid signers for "
+"this repository."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"<option>Check-Valid-Until</option> (<option>check-valid-until</option>)  is "
+"a yes/no value which controls if APT should try to detect replay attacks. A "
+"repository creator can declare a time until which the data provided in the "
+"repository should be considered valid, and if this time is reached, but no "
+"new data is provided, the data is considered expired and an error is "
+"raised.  Besides increasing security, as a malicious attacker can't send old "
+"data forever to prevent a user from upgrading to a new version, this also "
+"helps users identify mirrors which are no longer updated. However, some "
+"repositories such as historic archives are not updated any more by design, "
+"so this check can be disabled by setting this option to <literal>no</"
+"literal>.  Defaults to the value of configuration option <option>Acquire::"
+"Check-Valid-Until</option> which itself defaults to <literal>yes</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"<option>Valid-Until-Min</option> (<option>valid-until-min</option>) and "
+"<option>Valid-Until-Max</option> (<option>valid-until-max</option>) can be "
+"used to raise or lower the time period in seconds in which the data from "
+"this repository is considered valid. -Max can be especially useful if the "
+"repository provides no Valid-Until field on its Release file to set your own "
+"value, while -Min can be used to increase the valid time on seldom updated "
+"(local) mirrors of a more frequently updated but less accessible archive "
+"(which is in the sources.list as well) instead of disabling the check "
+"entirely.  Default to the value of the configuration options "
+"<option>Acquire::Min-ValidTime</option> and <option>Acquire::Max-ValidTime</"
+"option> which are both unset by default."

 msgstr ""
 msgstr ""

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

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

-#: sources.list.5.xml:169
-msgid "URI specification"
+#: sources.list.5.xml
+#, fuzzy
+#| msgid "URI specification"
+msgid "URI Specification"

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

-#: sources.list.5.xml:171
+#: sources.list.5.xml

 msgid "The currently recognized URI types are:"
 msgstr "Die derzeit zulässigen URI-Typen sind:"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 msgid "The currently recognized URI types are:"
 msgstr "Die derzeit zulässigen URI-Typen sind:"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: sources.list.5.xml:175
+#: sources.list.5.xml

 msgid ""
 "The file scheme allows an arbitrary directory in the file system to be "
 "considered an archive. This is useful for NFS mounts and local mirrors or "
 msgid ""
 "The file scheme allows an arbitrary directory in the file system to be "
 "considered an archive. This is useful for NFS mounts and local mirrors or "


@@ -7169,7 +8043,7 @@ msgstr ""
 "lokale Spiegel oder Archive."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 "lokale Spiegel oder Archive."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: sources.list.5.xml:182
+#: sources.list.5.xml

 msgid ""
 "The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
 "Use the &apt-cdrom; program to create cdrom entries in the source list."
 msgid ""
 "The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
 "Use the &apt-cdrom; program to create cdrom entries in the source list."


@@ -7179,7 +8053,7 @@ msgstr ""
 "der Quellenliste zu erstellen."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 "der Quellenliste zu erstellen."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: sources.list.5.xml:189
+#: sources.list.5.xml

 msgid ""
 "The http scheme specifies an HTTP server for the archive. If an environment "
 "variable <envar>http_proxy</envar> is set with the format http://server:"
 msgid ""
 "The http scheme specifies an HTTP server for the archive. If an environment "
 "variable <envar>http_proxy</envar> is set with the format http://server:"


@@ -7196,7 +8070,7 @@ msgstr ""
 "Beachten Sie, dass dies eine unsichere Authentifizierungsmethode ist."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 "Beachten Sie, dass dies eine unsichere Authentifizierungsmethode ist."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: sources.list.5.xml:200
+#: sources.list.5.xml

 msgid ""
 "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
 "is highly configurable; for more information see the &apt-conf; manual page. "
 msgid ""
 "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
 "is highly configurable; for more information see the &apt-conf; manual page. "


@@ -7218,7 +8092,7 @@ msgstr ""
 "benutzen, werden ignoriert."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 "benutzen, werden ignoriert."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: sources.list.5.xml:212
+#: sources.list.5.xml

 msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "
 msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "


@@ -7231,7 +8105,7 @@ msgstr ""
 "Wechseldatenträger benutzen, um Dateien mit APT umherzukopieren."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 "Wechseldatenträger benutzen, um Dateien mit APT umherzukopieren."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: sources.list.5.xml:219
+#: sources.list.5.xml

 msgid ""
 "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
 "the files as a given user. Prior configuration of rhosts or RSA keys is "
 msgid ""
 "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
 "the files as a given user. Prior configuration of rhosts or RSA keys is "


@@ -7245,12 +8119,12 @@ msgstr ""
 "<command>find</command> und <command>dd</command> verwandt."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 "<command>find</command> und <command>dd</command> verwandt."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>

-#: sources.list.5.xml:226
+#: sources.list.5.xml

 msgid "adding more recognizable URI types"
 msgstr "weitere zulässige URI-Typen hinzufügen"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 msgid "adding more recognizable URI types"
 msgstr "weitere zulässige URI-Typen hinzufügen"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>

-#: sources.list.5.xml:228
+#: sources.list.5.xml

 msgid ""
 "APT can be extended with more methods shipped in other optional packages, "
 "which should follow the naming scheme <package>apt-transport-"
 msgid ""
 "APT can be extended with more methods shipped in other optional packages, "
 "which should follow the naming scheme <package>apt-transport-"


@@ -7269,46 +8143,88 @@ msgstr ""
 "Benutzung von debtorrent verfügbar – siehe &apt-transport-debtorrent;."
 
 #. type: Content of: <refentry><refsect1><para>
 "Benutzung von debtorrent verfügbar – siehe &apt-transport-debtorrent;."
 
 #. type: Content of: <refentry><refsect1><para>

-#: sources.list.5.xml:240
+#: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "Uses the archive stored locally (or NFS mounted) at /home/jason/debian "
+#| "for stable/main, stable/contrib, and stable/non-free."

 msgid ""
 msgid ""

-"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
+"Uses the archive stored locally (or NFS mounted) at /home/apt/debian for "

 "stable/main, stable/contrib, and stable/non-free."
 msgstr ""
 "Benutzt die lokal gespeicherten (oder per NFS eingehängten) Archive in /home/"
 "jason/debian für stable/main, stable/contrib und stable/non-free."
 
 #. type: Content of: <refentry><refsect1><literallayout>
 "stable/main, stable/contrib, and stable/non-free."
 msgstr ""
 "Benutzt die lokal gespeicherten (oder per NFS eingehängten) Archive in /home/"
 "jason/debian für stable/main, stable/contrib und stable/non-free."
 
 #. type: Content of: <refentry><refsect1><literallayout>

-#: sources.list.5.xml:242
-#, no-wrap
-msgid "deb file:/home/jason/debian stable main contrib non-free"
+#: sources.list.5.xml
+#, fuzzy, no-wrap
+#| msgid "deb file:/home/jason/debian stable main contrib non-free"
+msgid "deb file:/home/apt/debian stable main contrib non-free"
+msgstr "deb file:/home/jason/debian stable main contrib non-free"
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml
+#, fuzzy, no-wrap
+#| msgid "deb file:/home/jason/debian stable main contrib non-free"
+msgid ""
+"Types: deb\n"
+"URIs: file:/home/apt/debian\n"
+"Suites: stable\n"
+"Components: main contrib non-free"

 msgstr "deb file:/home/jason/debian stable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr "deb file:/home/jason/debian stable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>

-#: sources.list.5.xml:244
+#: sources.list.5.xml

 msgid "As above, except this uses the unstable (development) distribution."
 msgstr ""
 "wie oben, außer das dies die »unstable«- (Entwicklungs-) Distribution "
 "benutzt."
 
 #. type: Content of: <refentry><refsect1><literallayout>
 msgid "As above, except this uses the unstable (development) distribution."
 msgstr ""
 "wie oben, außer das dies die »unstable«- (Entwicklungs-) Distribution "
 "benutzt."
 
 #. type: Content of: <refentry><refsect1><literallayout>

-#: sources.list.5.xml:245
-#, no-wrap
-msgid "deb file:/home/jason/debian unstable main contrib non-free"
+#: sources.list.5.xml
+#, fuzzy, no-wrap
+#| msgid "deb file:/home/jason/debian unstable main contrib non-free"
+msgid "deb file:/home/apt/debian unstable main contrib non-free"
+msgstr "deb file:/home/jason/debian unstable main contrib non-free"
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml
+#, fuzzy, no-wrap
+#| msgid "deb file:/home/jason/debian unstable main contrib non-free"
+msgid ""
+"Types: deb\n"
+"URIs: file:/home/apt/debian\n"
+"Suites: unstable\n"
+"Components: main contrib non-free"

 msgstr "deb file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr "deb file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>

-#: sources.list.5.xml:247
-msgid "Source line for the above"
+#: sources.list.5.xml
+#, fuzzy
+#| msgid "Source line for the above"
+msgid "Sources specification for the above."

 msgstr "Quellzeile für obiges"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 msgstr "Quellzeile für obiges"
 
 #. type: Content of: <refentry><refsect1><literallayout>

-#: sources.list.5.xml:248
-#, no-wrap
-msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
+#: sources.list.5.xml
+#, fuzzy, no-wrap
+#| msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
+msgid "deb-src file:/home/apt/debian unstable main contrib non-free"
+msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml
+#, fuzzy, no-wrap
+#| msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
+msgid ""
+"Types: deb-src\n"
+"URIs: file:/home/apt/debian\n"
+"Suites: unstable\n"
+"Components: main contrib non-free"

 msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>
 msgstr "deb-src file:/home/jason/debian unstable main contrib non-free"
 
 #. type: Content of: <refentry><refsect1><para>

-#: sources.list.5.xml:250
+#: sources.list.5.xml

 msgid ""
 "The first line gets package information for the architectures in "
 "<literal>APT::Architectures</literal> while the second always retrieves "
 msgid ""
 "The first line gets package information for the architectures in "
 "<literal>APT::Architectures</literal> while the second always retrieves "


@@ -7319,17 +8235,41 @@ msgstr ""
 "<literal>amd64</literal> und <literal>armel</literal> holt."
 
 #. type: Content of: <refentry><refsect1><literallayout>
 "<literal>amd64</literal> und <literal>armel</literal> holt."
 
 #. type: Content of: <refentry><refsect1><literallayout>

-#: sources.list.5.xml:252
-#, no-wrap
+#: sources.list.5.xml
+#, fuzzy, no-wrap
+#| msgid ""
+#| "deb http://ftp.debian.org/debian &debian-stable-codename; main\n"
+#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main"
+msgid ""
+"deb http://httpredir.debian.org/debian &debian-stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &debian-stable-codename; main"
+msgstr ""
+"deb http://ftp.debian.org/debian &debian-stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main"
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml
+#, fuzzy, no-wrap
+#| msgid ""
+#| "deb http://ftp.debian.org/debian &debian-stable-codename; main\n"
+#| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main"

 msgid ""
 msgid ""

-"deb http://ftp.debian.org/debian &stable-codename; main\n"
-"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+"Types: deb\n"
+"URIs: http://httpredir.debian.org/debian\n"
+"Suites: &debian-stable-codename;\n"
+"Components: main\n"
+"\n"
+"Types: deb\n"
+"URIs: http://httpredir.debian.org/debian\n"
+"Suites: &debian-stable-codename;\n"
+"Components: main\n"
+"Architectures: amd64 armel\n"

 msgstr ""
 msgstr ""

-"deb http://ftp.debian.org/debian &stable-codename; main\n"
-"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+"deb http://ftp.debian.org/debian &debian-stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main"

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

-#: sources.list.5.xml:255
+#: sources.list.5.xml

 msgid ""
 "Uses HTTP to access the archive at archive.debian.org, and uses only the "
 "hamm/main area."
 msgid ""
 "Uses HTTP to access the archive at archive.debian.org, and uses only the "
 "hamm/main area."


@@ -7338,29 +8278,51 @@ msgstr ""
 "den hamm/main-Bereich zu benutzen."
 
 #. type: Content of: <refentry><refsect1><literallayout>
 "den hamm/main-Bereich zu benutzen."
 
 #. type: Content of: <refentry><refsect1><literallayout>

-#: sources.list.5.xml:257
+#: sources.list.5.xml

 #, no-wrap
 msgid "deb http://archive.debian.org/debian-archive hamm main"
 msgstr "deb http://archive.debian.org/debian-archive hamm main"
 
 #, no-wrap
 msgid "deb http://archive.debian.org/debian-archive hamm main"
 msgstr "deb http://archive.debian.org/debian-archive hamm main"
 

+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml
+#, fuzzy, no-wrap
+#| msgid "deb http://archive.debian.org/debian-archive hamm main"
+msgid ""
+"Types: deb\n"
+"URIs: http://archive.debian.org/debian-archive\n"
+"Suites: hamm\n"
+"Components: main"
+msgstr "deb http://archive.debian.org/debian-archive hamm main"
+

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

-#: sources.list.5.xml:259
+#: sources.list.5.xml

 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "

-"directory, and uses only the &stable-codename;/contrib area."
+"directory, and uses only the &debian-stable-codename;/contrib area."

 msgstr ""
 "benutzt FTP, um auf das Archiv auf archive.debian.org unter dem debian-"
 msgstr ""
 "benutzt FTP, um auf das Archiv auf archive.debian.org unter dem debian-"

-"Verzeichnis zuzugreifen und nur den &stable-codename;/contrib-Bereich zu "
-"benutzen."
+"Verzeichnis zuzugreifen und nur den &debian-stable-codename;/contrib-Bereich "
+"zu benutzen."

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

-#: sources.list.5.xml:261
+#: sources.list.5.xml

 #, no-wrap
 #, no-wrap

-msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
-msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
+msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
+msgid ""
+"Types: deb\n"
+"URIs: ftp://ftp.debian.org/debian\n"
+"Suites: &debian-stable-codename;\n"
+"Components: contrib"
+msgstr "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"

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

-#: sources.list.5.xml:263
+#: sources.list.5.xml

 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the unstable/contrib area. If this line appears as "
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the unstable/contrib area. If this line appears as "


@@ -7374,19 +8336,49 @@ msgstr ""
 "für beide Quellzeilen benutzt."
 
 #. type: Content of: <refentry><refsect1><literallayout>
 "für beide Quellzeilen benutzt."
 
 #. type: Content of: <refentry><refsect1><literallayout>

-#: sources.list.5.xml:267
+#: sources.list.5.xml

 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian unstable contrib"
 msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
 
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian unstable contrib"
 msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
 

+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml
+#, fuzzy, no-wrap
+#| msgid "deb ftp://ftp.debian.org/debian unstable contrib"
+msgid ""
+"Types: deb\n"
+"URIs: ftp://ftp.debian.org/debian\n"
+"Suites: unstable\n"
+"Components: contrib"
+msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
+

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

-#: sources.list.5.xml:276
+#: sources.list.5.xml

 #, no-wrap
 msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 
 #, no-wrap
 msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 

+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml
+#, fuzzy, no-wrap
+#| msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
+msgid ""
+"Types: deb\n"
+"URIs: http://ftp.tlh.debian.org/universe\n"
+"Suites: unstable/binary-$(ARCH)/"
+msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
+

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

-#: sources.list.5.xml:269
+#: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
+#| "directory, and uses only files found under <filename>unstable/binary-"
+#| "i386</filename> on i386 machines, <filename>unstable/binary-amd64</"
+#| "filename> on amd64, and so forth for other supported architectures. [Note "
+#| "this example only illustrates how to use the substitution variable; "
+#| "official debian archives are not structured like this] <placeholder type="
+#| "\"literallayout\" id=\"0\"/>"

 msgid ""
 "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
 "directory, and uses only files found under <filename>unstable/binary-i386</"
 msgid ""
 "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
 "directory, and uses only files found under <filename>unstable/binary-i386</"


@@ -7394,7 +8386,7 @@ msgid ""
 "amd64, and so forth for other supported architectures. [Note this example "
 "only illustrates how to use the substitution variable; official debian "
 "archives are not structured like this] <placeholder type=\"literallayout\" "
 "amd64, and so forth for other supported architectures. [Note this example "
 "only illustrates how to use the substitution variable; official debian "
 "archives are not structured like this] <placeholder type=\"literallayout\" "

-"id=\"0\"/>"
+"id=\"0\"/> <placeholder type=\"literallayout\" id=\"1\"/>"

 msgstr ""
 "benutzt HTTP, um auf das Archiv auf ftp.tlh.debian.org unter dem universe-"
 "Verzeichnis zuzugreifen und benutzt nur Dateien, die unter "
 msgstr ""
 "benutzt HTTP, um auf das Archiv auf ftp.tlh.debian.org unter dem universe-"
 "Verzeichnis zuzugreifen und benutzt nur Dateien, die unter "


@@ -7406,17 +8398,48 @@ msgstr ""
 "type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
 "type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>

-#: sources.list.5.xml:281
-msgid "&apt-cache; &apt-conf;"
+#: sources.list.5.xml
+msgid ""
+"Uses HTTP to get binary packages as well as sources from the stable, testing "
+"and unstable suites and the components main and contrib."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml
+#, no-wrap
+msgid ""
+"deb http://httpredir.debian.org/debian stable main contrib\n"
+"deb-src http://httpredir.debian.org/debian stable main contrib\n"
+"deb http://httpredir.debian.org/debian testing main contrib\n"
+"deb-src http://httpredir.debian.org/debian testing main contrib\n"
+"deb http://httpredir.debian.org/debian unstable main contrib\n"
+"deb-src http://httpredir.debian.org/debian unstable main contrib"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml
+#, no-wrap
+msgid ""
+"Types: deb deb-src\n"
+"URIs: http://httpredir.debian.org/debian\n"
+"Suites: stable testing unstable\n"
+"Components: main contrib\n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml
+#, fuzzy
+#| msgid "&apt-cache; &apt-conf;"
+msgid "&apt-get;, &apt-conf;"

 msgstr "&apt-cache; &apt-conf;"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
 msgstr "&apt-cache; &apt-conf;"
 
 #. type: Content of: <refentry><refmeta><manvolnum>

-#: apt-extracttemplates.1.xml:28 apt-sortpkgs.1.xml:28 apt-ftparchive.1.xml:28
+#: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml

 msgid "1"
 msgstr "1"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 msgid "1"
 msgstr "1"
 
 #. type: Content of: <refentry><refnamediv><refpurpose>

-#: apt-extracttemplates.1.xml:35
+#: apt-extracttemplates.1.xml

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


@@ -7425,7 +8448,7 @@ msgstr ""
 "und Schablonen von Debian-Paketen"
 
 #. type: Content of: <refentry><refsect1><para>
 "und Schablonen von Debian-Paketen"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-extracttemplates.1.xml:41
+#: apt-extracttemplates.1.xml

 msgid ""
 "<command>apt-extracttemplates</command> will take one or more Debian package "
 "files as input and write out (to a temporary directory) all associated "
 msgid ""
 "<command>apt-extracttemplates</command> will take one or more Debian package "
 "files as input and write out (to a temporary directory) all associated "


@@ -7441,12 +8464,12 @@ msgstr ""
 "generiert:"
 
 #. type: Content of: <refentry><refsect1><para>
 "generiert:"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-extracttemplates.1.xml:46
+#: apt-extracttemplates.1.xml

 msgid "package version template-file config-script"
 msgstr "Paket Version Schablonendatei Konfigurationsskript"
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "package version template-file config-script"
 msgstr "Paket Version Schablonendatei Konfigurationsskript"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-extracttemplates.1.xml:47
+#: apt-extracttemplates.1.xml

 msgid ""
 "template-file and config-script are written to the temporary directory "
 "specified by the <option>-t</option> or <option>--tempdir</option> "
 msgid ""
 "template-file and config-script are written to the temporary directory "
 "specified by the <option>-t</option> or <option>--tempdir</option> "


@@ -7461,7 +8484,7 @@ msgstr ""
 "<filename>package.config.XXXXXX</filename> angegeben wurde."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "<filename>package.config.XXXXXX</filename> angegeben wurde."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-extracttemplates.1.xml:60
+#: apt-extracttemplates.1.xml

 msgid ""
 "Temporary directory in which to write extracted <command>debconf</command> "
 "template files and config scripts.  Configuration Item: <literal>APT::"
 msgid ""
 "Temporary directory in which to write extracted <command>debconf</command> "
 "template files and config scripts.  Configuration Item: <literal>APT::"


@@ -7472,7 +8495,7 @@ msgstr ""
 "Konfigurationselement: <literal>APT::ExtractTemplates::TempDir</literal>"
 
 #. type: Content of: <refentry><refsect1><para>
 "Konfigurationselement: <literal>APT::ExtractTemplates::TempDir</literal>"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-extracttemplates.1.xml:77
+#: apt-extracttemplates.1.xml

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


@@ -7481,12 +8504,12 @@ msgstr ""
 "zurück, dezimal 100 bei Fehlern."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 "zurück, dezimal 100 bei Fehlern."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>

-#: apt-sortpkgs.1.xml:35
+#: apt-sortpkgs.1.xml

 msgid "Utility to sort package index files"
 msgstr "Werkzeug zum Sortieren von Paketindexdateien"
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "Utility to sort package index files"
 msgstr "Werkzeug zum Sortieren von Paketindexdateien"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-sortpkgs.1.xml:41
+#: apt-sortpkgs.1.xml

 msgid ""
 "<command>apt-sortpkgs</command> will take an index file (source index or "
 "package index) and sort the records so that they are ordered by the package "
 msgid ""
 "<command>apt-sortpkgs</command> will take an index file (source index or "
 "package index) and sort the records so that they are ordered by the package "


@@ -7498,7 +8521,7 @@ msgstr ""
 "die internen Felder jedes Datensatzes gemäß interner Sortierregeln sortieren."
 
 #. type: Content of: <refentry><refsect1><para>
 "die internen Felder jedes Datensatzes gemäß interner Sortierregeln sortieren."
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-sortpkgs.1.xml:47
+#: apt-sortpkgs.1.xml

 msgid ""
 "All output is sent to standard output; the input must be a seekable file."
 msgstr ""
 msgid ""
 "All output is sent to standard output; the input must be a seekable file."
 msgstr ""


@@ -7506,7 +8529,7 @@ msgstr ""
 "durchsuchbare Datei sein."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "durchsuchbare Datei sein."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-sortpkgs.1.xml:56
+#: apt-sortpkgs.1.xml

 msgid ""
 "Use source index field ordering.  Configuration Item: <literal>APT::"
 "SortPkgs::Source</literal>."
 msgid ""
 "Use source index field ordering.  Configuration Item: <literal>APT::"
 "SortPkgs::Source</literal>."


@@ -7515,7 +8538,7 @@ msgstr ""
 "SortPkgs::Source</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
 "SortPkgs::Source</literal>."
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-sortpkgs.1.xml:70
+#: apt-sortpkgs.1.xml

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


@@ -7524,12 +8547,12 @@ msgstr ""
 "dezimal 100 bei Fehlern."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 "dezimal 100 bei Fehlern."
 
 #. type: Content of: <refentry><refnamediv><refpurpose>

-#: apt-ftparchive.1.xml:35
+#: apt-ftparchive.1.xml

 msgid "Utility to generate index files"
 msgstr "Hilfsprogramm zum Generieren von Indexdateien"
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "Utility to generate index files"
 msgstr "Hilfsprogramm zum Generieren von Indexdateien"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-ftparchive.1.xml:41
+#: apt-ftparchive.1.xml

 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 "


@@ -7542,7 +8565,7 @@ msgstr ""
 "Inhalts dieser Stelle generiert werden."
 
 #. type: Content of: <refentry><refsect1><para>
 "Inhalts dieser Stelle generiert werden."
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-ftparchive.1.xml:45
+#: apt-ftparchive.1.xml

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


@@ -7556,7 +8579,7 @@ msgstr ""
 "für ein komplettes Archiv zu »skripten«."
 
 #. type: Content of: <refentry><refsect1><para>
 "für ein komplettes Archiv zu »skripten«."
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-ftparchive.1.xml:51
+#: apt-ftparchive.1.xml

 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 "


@@ -7572,7 +8595,7 @@ msgstr ""
 "Ausgabedateien erzeugt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Ausgabedateien erzeugt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:62
+#: apt-ftparchive.1.xml

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


@@ -7585,7 +8608,7 @@ msgstr ""
 "Befehl entspricht etwa &dpkg-scanpackages;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Befehl entspricht etwa &dpkg-scanpackages;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

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

 msgid ""
 "The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr ""
 msgid ""
 "The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr ""


@@ -7593,7 +8616,7 @@ msgstr ""
 "Zwischenspeichern von Programmen anzugeben."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Zwischenspeichern von Programmen anzugeben."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:72
+#: apt-ftparchive.1.xml

 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 "


@@ -7606,7 +8629,7 @@ msgstr ""
 "stdout ausgibt. Dieser Befehl entspricht etwa &dpkg-scansources;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "stdout ausgibt. Dieser Befehl entspricht etwa &dpkg-scansources;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

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

 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 "


@@ -7618,7 +8641,7 @@ msgstr ""
 "ändern."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "ändern."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:84
+#: apt-ftparchive.1.xml

 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 "


@@ -7636,7 +8659,20 @@ msgstr ""
 "getrennt in der Ausgabe."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "getrennt in der Ausgabe."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:96
+#: apt-ftparchive.1.xml
+#, fuzzy
+#| msgid ""
+#| "The <literal>release</literal> command generates a Release file from a "
+#| "directory tree. It recursively searches the given directory for "
+#| "uncompressed <filename>Packages</filename> and <filename>Sources</"
+#| "filename> files and ones compressed with <command>gzip</command>, "
+#| "<command>bzip2</command> or <command>lzma</command> as well as "
+#| "<filename>Release</filename> and <filename>md5sum.txt</filename> files by "
+#| "default (<literal>APT::FTPArchive::Release::Default-Patterns</literal>). "
+#| "Additional filename patterns can be added by listing them in "
+#| "<literal>APT::FTPArchive::Release::Patterns</literal>.  It then writes to "
+#| "stdout a <filename>Release</filename> file containing an MD5, SHA1 and "
+#| "SHA256 digest for each file."

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


@@ -7647,7 +8683,7 @@ msgid ""
 "Release::Default-Patterns</literal>). Additional filename patterns can be "
 "added by listing them in <literal>APT::FTPArchive::Release::Patterns</"
 "literal>.  It then writes to stdout a <filename>Release</filename> file "
 "Release::Default-Patterns</literal>). Additional filename patterns can be "
 "added by listing them in <literal>APT::FTPArchive::Release::Patterns</"
 "literal>.  It then writes to stdout a <filename>Release</filename> file "

-"containing an MD5, SHA1 and SHA256 digest for each file."
+"containing (by default) an MD5, SHA1, SHA256 and SHA512 digest for each file."

 msgstr ""
 "Der Befehl <literal>release</literal> erzeugt eine Release-Datei aus einem "
 "Verzeichnisbaum. Standardmäßig durchsucht er rekursiv das angegebene "
 msgstr ""
 "Der Befehl <literal>release</literal> erzeugt eine Release-Datei aus einem "
 "Verzeichnisbaum. Standardmäßig durchsucht er rekursiv das angegebene "


@@ -7663,7 +8699,7 @@ msgstr ""
 "Prüfsumme enthält."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Prüfsumme enthält."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:106
+#: apt-ftparchive.1.xml

 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under <literal>APT::FTPArchive::Release</"
 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under <literal>APT::FTPArchive::Release</"


@@ -7684,7 +8720,7 @@ msgstr ""
 "<literal>Description</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "<literal>Description</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

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

 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 "


@@ -7700,7 +8736,7 @@ msgstr ""
 "Verwaltung der erforderlichen Einstellungen bereitstellt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Verwaltung der erforderlichen Einstellungen bereitstellt."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

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

 msgid ""
 "The <literal>clean</literal> command tidies the databases used by the given "
 "configuration file by removing any records that are no longer necessary."
 msgid ""
 "The <literal>clean</literal> command tidies the databases used by the given "
 "configuration file by removing any records that are no longer necessary."


@@ -7710,12 +8746,12 @@ msgstr ""
 "Datensätze entfernt."
 
 #. type: Content of: <refentry><refsect1><title>
 "Datensätze entfernt."
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt-ftparchive.1.xml:134
+#: apt-ftparchive.1.xml

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

-#: apt-ftparchive.1.xml:136
+#: apt-ftparchive.1.xml

 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 "


@@ -7733,7 +8769,7 @@ msgstr ""
 "wenn die Markierung »scope« behandelt wird."
 
 #. type: Content of: <refentry><refsect1><para>
 "wenn die Markierung »scope« behandelt wird."
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-ftparchive.1.xml:144
+#: apt-ftparchive.1.xml

 msgid ""
 "The generate configuration has four separate sections, each described below."
 msgstr ""
 msgid ""
 "The generate configuration has four separate sections, each described below."
 msgstr ""


@@ -7741,12 +8777,12 @@ msgstr ""
 "unterhalb beschrieben"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 "unterhalb beschrieben"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt-ftparchive.1.xml:146
+#: apt-ftparchive.1.xml

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

-#: apt-ftparchive.1.xml:148
+#: apt-ftparchive.1.xml

 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 "


@@ -7760,7 +8796,7 @@ msgstr ""
 "absoluten Pfad zu bilden."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "absoluten Pfad zu bilden."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

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

 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 "


@@ -7771,17 +8807,17 @@ msgstr ""
 "enthält."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "enthält."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:162
+#: apt-ftparchive.1.xml

 msgid "Specifies the location of the override files."
 msgstr "gibt den Ort der Override-Dateien an"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 msgid "Specifies the location of the override files."
 msgstr "gibt den Ort der Override-Dateien an"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:167
+#: apt-ftparchive.1.xml

 msgid "Specifies the location of the cache files."
 msgstr "gibt den Ort der Zwischenspeicherdateien an"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 msgid "Specifies the location of the cache files."
 msgstr "gibt den Ort der Zwischenspeicherdateien an"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:172
+#: apt-ftparchive.1.xml

 msgid ""
 "Specifies the location of the file list files, if the <literal>FileList</"
 "literal> setting is used below."
 msgid ""
 "Specifies the location of the file list files, if the <literal>FileList</"
 "literal> setting is used below."


@@ -7790,12 +8826,12 @@ msgstr ""
 "unterhalb gesetzt ist."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 "unterhalb gesetzt ist."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>

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

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

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

 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 "


@@ -7806,7 +8842,7 @@ msgstr ""
 "können diese Vorgaben mit einer Einstellung pro Abschnitt überschreiben."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "können diese Vorgaben mit einer Einstellung pro Abschnitt überschreiben."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:186
+#: apt-ftparchive.1.xml

 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 "


@@ -7820,7 +8856,7 @@ msgstr ""
 "ist ». gzip«."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "ist ». gzip«."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:194
+#: apt-ftparchive.1.xml

 msgid ""
 "Sets the default list of file extensions that are package files.  This "
 "defaults to '.deb'."
 msgid ""
 "Sets the default list of file extensions that are package files.  This "
 "defaults to '.deb'."


@@ -7829,7 +8865,7 @@ msgstr ""
 "Vorgabe ist ».deb«."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "Vorgabe ist ».deb«."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:200
+#: apt-ftparchive.1.xml

 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Sources files."
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Sources files."


@@ -7838,7 +8874,7 @@ msgstr ""
 "Kompression der Quelldateien steuert."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "Kompression der Quelldateien steuert."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:206
+#: apt-ftparchive.1.xml

 msgid ""
 "Sets the default list of file extensions that are source files.  This "
 "defaults to '.dsc'."
 msgid ""
 "Sets the default list of file extensions that are source files.  This "
 "defaults to '.dsc'."


@@ -7847,7 +8883,7 @@ msgstr ""
 "Vorgabe ist ».dsc«."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "Vorgabe ist ».dsc«."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:212
+#: apt-ftparchive.1.xml

 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Contents files."
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Contents files."


@@ -7856,7 +8892,7 @@ msgstr ""
 "Kompression der Inhaltsdateien steuert."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "Kompression der Inhaltsdateien steuert."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:218
+#: apt-ftparchive.1.xml

 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Translation-en master file."
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Translation-en master file."


@@ -7865,7 +8901,7 @@ msgstr ""
 "Kompression der Translation-en-Hauptdatei steuert."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "Kompression der Translation-en-Hauptdatei steuert."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:224
+#: apt-ftparchive.1.xml

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


@@ -7876,7 +8912,7 @@ msgstr ""
 "<literal>External-Links</literal>-Einstellung pro Abschnitt benutzt."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "<literal>External-Links</literal>-Einstellung pro Abschnitt benutzt."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:231
+#: apt-ftparchive.1.xml

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


@@ -7885,7 +8921,7 @@ msgstr ""
 "Indexdateien werden ohne Beachtung von umask auf diese Rechte gesetzt."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "Indexdateien werden ohne Beachtung von umask auf diese Rechte gesetzt."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:238 apt-ftparchive.1.xml:384
+#: apt-ftparchive.1.xml

 msgid ""
 "Specifies whether long descriptions should be included in the "
 "<filename>Packages</filename> file or split out into a master "
 msgid ""
 "Specifies whether long descriptions should be included in the "
 "<filename>Packages</filename> file or split out into a master "


@@ -7896,12 +8932,12 @@ msgstr ""
 "Hauptdatei unterteilt werden sollen"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 "Hauptdatei unterteilt werden sollen"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>

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

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

-#: apt-ftparchive.1.xml:246
+#: apt-ftparchive.1.xml

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


@@ -7912,7 +8948,7 @@ msgstr ""
 "$(SECTION) und $(ARCH) durch ihre jeweiligen Werte ersetzt."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "$(SECTION) und $(ARCH) durch ihre jeweiligen Werte ersetzt."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:253
+#: apt-ftparchive.1.xml

 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 "


@@ -7923,7 +8959,7 @@ msgstr ""
 "Tage alle neu gebildet werden."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "Tage alle neu gebildet werden."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:260
+#: apt-ftparchive.1.xml

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


@@ -7941,7 +8977,7 @@ msgstr ""
 "eine neue Datei benötigen. Die Vorgabe ist 10, die Einheiten sind Tage."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "eine neue Datei benötigen. Die Vorgabe ist 10, die Einheiten sind Tage."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

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

 msgid ""
 "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/</filename>"
 msgid ""
 "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
 "$(SECTION)/binary-$(ARCH)/</filename>"


@@ -7950,7 +8986,7 @@ msgstr ""
 "$(SECTION)/binary-$(ARCH)/</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "$(SECTION)/binary-$(ARCH)/</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:277
+#: apt-ftparchive.1.xml

 msgid ""
 "Sets the top of the source package directory tree. Defaults to <filename>"
 "$(DIST)/$(SECTION)/source/</filename>"
 msgid ""
 "Sets the top of the source package directory tree. Defaults to <filename>"
 "$(DIST)/$(SECTION)/source/</filename>"


@@ -7959,7 +8995,7 @@ msgstr ""
 "$(DIST)/$(SECTION)/source/</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "$(DIST)/$(SECTION)/source/</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:283
+#: apt-ftparchive.1.xml

 msgid ""
 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "binary-$(ARCH)/Packages</filename>"
 msgid ""
 "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "binary-$(ARCH)/Packages</filename>"


@@ -7968,7 +9004,7 @@ msgstr ""
 "binary-$(ARCH)/Packages</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "binary-$(ARCH)/Packages</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:289
+#: apt-ftparchive.1.xml

 msgid ""
 "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "source/Sources</filename>"
 msgid ""
 "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
 "source/Sources</filename>"


@@ -7977,7 +9013,7 @@ msgstr ""
 "source/Sources</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "source/Sources</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:295
+#: apt-ftparchive.1.xml

 msgid ""
 "Sets the output Translation-en master file with the long descriptions if "
 "they should be not included in the Packages file. Defaults to <filename>"
 msgid ""
 "Sets the output Translation-en master file with the long descriptions if "
 "they should be not included in the Packages file. Defaults to <filename>"


@@ -7988,7 +9024,7 @@ msgstr ""
 "ist <filename>$(DIST)/$(SECTION)/i18n/Translation-en</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "ist <filename>$(DIST)/$(SECTION)/i18n/Translation-en</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

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

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


@@ -7999,7 +9035,7 @@ msgstr ""
 "<filename>$(DIST)/$(SECTION)/</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "<filename>$(DIST)/$(SECTION)/</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:309
+#: apt-ftparchive.1.xml

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


@@ -8014,12 +9050,12 @@ msgstr ""
 "automatisch integrieren."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "automatisch integrieren."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:318
+#: apt-ftparchive.1.xml

 msgid "Sets header file to prepend to the contents output."
 msgstr "setzt die Kopfdatendatei, um sie der Inhaltsausgabe voranzustellen."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 msgid "Sets header file to prepend to the contents output."
 msgstr "setzt die Kopfdatendatei, um sie der Inhaltsausgabe voranzustellen."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:323
+#: apt-ftparchive.1.xml

 msgid ""
 "Sets the binary cache database to use for this section. Multiple sections "
 "can share the same database."
 msgid ""
 "Sets the binary cache database to use for this section. Multiple sections "
 "can share the same database."


@@ -8028,7 +9064,7 @@ msgstr ""
 "Abschnitt. Mehrere Abschnitte können sich die gleiche Datenbank teilen."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "Abschnitt. Mehrere Abschnitte können sich die gleiche Datenbank teilen."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

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

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


@@ -8039,7 +9075,7 @@ msgstr ""
 "Relativen Dateinamen wird das Archivverzeichnis vorangestellt."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "Relativen Dateinamen wird das Archivverzeichnis vorangestellt."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

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

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


@@ -8052,12 +9088,12 @@ msgstr ""
 "benutzt, wenn Quellindizes verarbeitet werden."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 "benutzt, wenn Quellindizes verarbeitet werden."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt-ftparchive.1.xml:344
+#: apt-ftparchive.1.xml

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

-#: apt-ftparchive.1.xml:346
+#: apt-ftparchive.1.xml

 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 "


@@ -8072,21 +9108,21 @@ msgstr ""
 "<literal>Directory</literal>-Ersetzungsvariable definiert."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 "<literal>Directory</literal>-Ersetzungsvariable definiert."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt-ftparchive.1.xml:351
+#: apt-ftparchive.1.xml

 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/&stable-codename;</filename>."
+"setting such as <filename>dists/&debian-stable-codename;</filename>."

 msgstr ""
 "Der <literal>Tree</literal>-Abschnitt nimmt eine scope-Markierung, die die "
 "<literal>$(DIST)</literal>-Variable setzt und die Wurzel des Baumes "
 "definiert (der Pfad hat den Präfix von <literal>ArchiveDir</literal>). "
 msgstr ""
 "Der <literal>Tree</literal>-Abschnitt nimmt eine scope-Markierung, die die "
 "<literal>$(DIST)</literal>-Variable setzt und die Wurzel des Baumes "
 "definiert (der Pfad hat den Präfix von <literal>ArchiveDir</literal>). "

-"Typischerweise ist dies eine Einstellung wie <filename>dists/&stable-"
+"Typischerweise ist dies eine Einstellung wie <filename>dists/&debian-stable-"

 "codename;</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 "codename;</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

-#: apt-ftparchive.1.xml:356
+#: apt-ftparchive.1.xml

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


@@ -8097,7 +9133,7 @@ msgstr ""
 "Variablen benutzt werden."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 "Variablen benutzt werden."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>

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

 #, no-wrap
 msgid ""
 "for i in Sections do \n"
 #, no-wrap
 msgid ""
 "for i in Sections do \n"


@@ -8111,7 +9147,7 @@ msgstr ""
 "     "
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 "     "
 
 #. type: Content of: <refentry><refsect1><refsect2><para>

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

 msgid ""
 "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
 "command> performs an operation similar to: <placeholder type=\"programlisting"
 msgid ""
 "When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
 "command> performs an operation similar to: <placeholder type=\"programlisting"


@@ -8122,7 +9158,7 @@ msgstr ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:370
+#: apt-ftparchive.1.xml

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


@@ -8133,18 +9169,18 @@ msgstr ""
 "non-free</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "non-free</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:377
+#: apt-ftparchive.1.xml

 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 "

-"this tree has a source archive."
+"this tree has a source archive.  The architecture 'all' signals that "
+"architecture specific files like <filename>Packages</filename> should not "
+"include information about architecture <literal>all</literal> packages in "
+"all files as they will be available in a dedicated file."

 msgstr ""
 msgstr ""

-"Dies ist eine durch Leerzeichen getrennte Liste aller Architekturen, die "
-"unter dem Suchabschnitt erscheinen. Die spezielle Architektur »source« wird "
-"benutzt, um anzugeben, dass dieser Baum ein Quellarchiv besitzt."

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

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

 msgid ""
 "Sets the binary override file. The override file contains section, priority "
 "and maintainer address information."
 msgid ""
 "Sets the binary override file. The override file contains section, priority "
 "and maintainer address information."


@@ -8153,7 +9189,7 @@ msgstr ""
 "Priorität und Adressinformationen des Betreuers."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "Priorität und Adressinformationen des Betreuers."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:396
+#: apt-ftparchive.1.xml

 msgid ""
 "Sets the source override file. The override file contains section "
 "information."
 msgid ""
 "Sets the source override file. The override file contains section "
 "information."


@@ -8162,22 +9198,22 @@ msgstr ""
 "Abschnittsinformationen."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "Abschnittsinformationen."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:402 apt-ftparchive.1.xml:448
+#: apt-ftparchive.1.xml

 msgid "Sets the binary extra override file."
 msgstr "setzt die zusätzliche Programm-Override-Datei"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 msgid "Sets the binary extra override file."
 msgstr "setzt die zusätzliche Programm-Override-Datei"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:453
+#: apt-ftparchive.1.xml

 msgid "Sets the source extra override file."
 msgstr "setzt die zusätzliche Quell-Override-Datei"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 msgid "Sets the source extra override file."
 msgstr "setzt die zusätzliche Quell-Override-Datei"
 
 #. type: Content of: <refentry><refsect1><refsect2><title>

-#: apt-ftparchive.1.xml:412
+#: apt-ftparchive.1.xml

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

-#: apt-ftparchive.1.xml:414
+#: apt-ftparchive.1.xml

 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 "


@@ -8192,12 +9228,12 @@ msgstr ""
 "<literal>Abschnitt</literal><literal>Architektur</literal> ähnlich."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "<literal>Abschnitt</literal><literal>Architektur</literal> ähnlich."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:422
+#: apt-ftparchive.1.xml

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

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

 msgid ""
 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
 "<literal>Sources</literal> is required."
 msgid ""
 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
 "<literal>Sources</literal> is required."


@@ -8206,42 +9242,42 @@ msgstr ""
 "<literal>Sources</literal> ist erforderlich."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 "<literal>Sources</literal> ist erforderlich."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:433
+#: apt-ftparchive.1.xml

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

-#: apt-ftparchive.1.xml:438
+#: apt-ftparchive.1.xml

 msgid "Sets the binary override file."
 msgstr "setzt die Programm-Override-Datei"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 msgid "Sets the binary override file."
 msgstr "setzt die Programm-Override-Datei"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:443
+#: apt-ftparchive.1.xml

 msgid "Sets the source override file."
 msgstr "setzt die Quell-Override-Datei"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 msgid "Sets the source override file."
 msgstr "setzt die Quell-Override-Datei"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:458
+#: apt-ftparchive.1.xml

 msgid "Sets the cache DB."
 msgstr "setzt die Zwischenspeicherdatenbank"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 msgid "Sets the cache DB."
 msgstr "setzt die Zwischenspeicherdatenbank"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:463
+#: apt-ftparchive.1.xml

 msgid "Appends a path to all the output paths."
 msgstr "hängt einen Pfad an alle Ausgabepfade an"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 msgid "Appends a path to all the output paths."
 msgstr "hängt einen Pfad an alle Ausgabepfade an"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>

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

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

-#: apt-ftparchive.1.xml:475
+#: apt-ftparchive.1.xml

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

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

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


@@ -8256,19 +9292,19 @@ msgstr ""
 "und das letzte Feld ist das Betreuerumsetzungsfeld."
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
 "und das letzte Feld ist das Betreuerumsetzungsfeld."
 
 #. type: Content of: <refentry><refsect1><para><literallayout>

-#: apt-ftparchive.1.xml:482
+#: apt-ftparchive.1.xml

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

-#: apt-ftparchive.1.xml:484
+#: apt-ftparchive.1.xml

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

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

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


@@ -8285,12 +9321,12 @@ msgstr ""
 "bedingungslos."
 
 #. type: Content of: <refentry><refsect1><title>
 "bedingungslos."
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt-ftparchive.1.xml:492
+#: apt-ftparchive.1.xml

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

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

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


@@ -8301,12 +9337,12 @@ msgstr ""
 "Quellpaketname, das zweite ist der Abschnitt, dem er zugeordnet ist."
 
 #. type: Content of: <refentry><refsect1><title>
 "Quellpaketname, das zweite ist der Abschnitt, dem er zugeordnet ist."
 
 #. type: Content of: <refentry><refsect1><title>

-#: apt-ftparchive.1.xml:499
+#: apt-ftparchive.1.xml

 msgid "The Extra Override File"
 msgstr "Die zusätzlich Override-Datei"
 
 #. type: Content of: <refentry><refsect1><para>
 msgid "The Extra Override File"
 msgstr "Die zusätzlich Override-Datei"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-ftparchive.1.xml:501
+#: apt-ftparchive.1.xml

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


@@ -8318,7 +9354,19 @@ msgstr ""
 "ist der neue Wert."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "ist der neue Wert."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:512
+#: apt-ftparchive.1.xml
+#, fuzzy
+#| msgid ""
+#| "Generate the given checksum. These options default to on, when turned off "
+#| "the generated index files will not have the checksum fields where "
+#| "possible.  Configuration Items: <literal>APT::FTPArchive::"
+#| "<replaceable>Checksum</replaceable></literal> and <literal>APT::"
+#| "FTPArchive::<replaceable>Index</replaceable>::<replaceable>Checksum</"
+#| "replaceable></literal> where <literal><replaceable>Index</replaceable></"
+#| "literal> can be <literal>Packages</literal>, <literal>Sources</literal> "
+#| "or <literal>Release</literal> and <literal><replaceable>Checksum</"
+#| "replaceable></literal> can be <literal>MD5</literal>, <literal>SHA1</"
+#| "literal> or <literal>SHA256</literal>."

 msgid ""
 "Generate the given checksum. These options default to on, when turned off "
 "the generated index files will not have the checksum fields where possible.  "
 msgid ""
 "Generate the given checksum. These options default to on, when turned off "
 "the generated index files will not have the checksum fields where possible.  "


@@ -8328,7 +9376,8 @@ msgid ""
 "<literal><replaceable>Index</replaceable></literal> can be "
 "<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</"
 "literal> and <literal><replaceable>Checksum</replaceable></literal> can be "
 "<literal><replaceable>Index</replaceable></literal> can be "
 "<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</"
 "literal> and <literal><replaceable>Checksum</replaceable></literal> can be "

-"<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
+"<literal>MD5</literal>, <literal>SHA1</literal>, <literal>SHA256</literal> "
+"or <literal>SHA512</literal>."

 msgstr ""
 "erzeugt die vorgegebene Prüfsumme. Diese Optionen sind standardmäßig "
 "aktiviert. Wenn sie deaktiviert sind, werden die erzeugten Indexdateien nach "
 msgstr ""
 "erzeugt die vorgegebene Prüfsumme. Diese Optionen sind standardmäßig "
 "aktiviert. Wenn sie deaktiviert sind, werden die erzeugten Indexdateien nach "


@@ -8343,7 +9392,7 @@ msgstr ""
 "literal> sein kann."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "literal> sein kann."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

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

 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."


@@ -8353,7 +9402,7 @@ msgstr ""
 "DB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "DB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:529
+#: apt-ftparchive.1.xml

 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 "


@@ -8367,7 +9416,7 @@ msgstr ""
 "Konfigurationselement: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Konfigurationselement: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

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

 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 "


@@ -8381,7 +9430,7 @@ msgstr ""
 "DeLinkAct</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "DeLinkAct</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:545
+#: apt-ftparchive.1.xml

 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 "


@@ -8397,7 +9446,7 @@ msgstr ""
 "Konfigurationselement: <literal>APT::FTPArchive::Contents</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "Konfigurationselement: <literal>APT::FTPArchive::Contents</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:555
+#: apt-ftparchive.1.xml

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


@@ -8408,7 +9457,7 @@ msgstr ""
 "SourceOverride</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "SourceOverride</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:561
+#: apt-ftparchive.1.xml

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


@@ -8417,7 +9466,7 @@ msgstr ""
 "<literal>APT::FTPArchive::ReadOnlyDB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "<literal>APT::FTPArchive::ReadOnlyDB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:566
+#: apt-ftparchive.1.xml

 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "


@@ -8431,7 +9480,7 @@ msgstr ""
 "FTPArchive::Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "FTPArchive::Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml

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


@@ -8455,7 +9504,7 @@ msgstr ""
 "haben sollte und all diese zusätzlichen Prüfungen daher nutzlos sind."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 "haben sollte und all diese zusätzlichen Prüfungen daher nutzlos sind."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>

-#: apt-ftparchive.1.xml:586
+#: apt-ftparchive.1.xml

 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "


@@ -8471,13 +9520,13 @@ msgstr ""
 "werden kann."
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
 "werden kann."
 
 #. type: Content of: <refentry><refsect1><para><programlisting>

-#: apt-ftparchive.1.xml:604
+#: apt-ftparchive.1.xml

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

-#: apt-ftparchive.1.xml:600
+#: apt-ftparchive.1.xml

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


@@ -8487,7 +9536,7 @@ msgstr ""
 ">"
 
 #. type: Content of: <refentry><refsect1><para>
 ">"
 
 #. type: Content of: <refentry><refsect1><para>

-#: apt-ftparchive.1.xml:614
+#: apt-ftparchive.1.xml

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


@@ -8495,36 +9544,53 @@ msgstr ""
 "<command>apt-ftparchive</command> gibt bei normalen Operationen 0 zurück, "
 "dezimal 100 bei Fehlern."
 
 "<command>apt-ftparchive</command> gibt bei normalen Operationen 0 zurück, "
 "dezimal 100 bei Fehlern."
 

-#. type: <title></title>
-#: guide.sgml:4
+#. type: Attribute 'lang' of: <book>
+#: guide.dbk offline.dbk
+msgid "en"
+msgstr "de"
+
+#. type: Content of: <book><title>
+#: guide.dbk

 msgid "APT User's Guide"
 msgstr "APT-Benutzerhandbuch"
 
 msgid "APT User's Guide"
 msgstr "APT-Benutzerhandbuch"
 

-#. type: <author></author>
-#: guide.sgml:6 offline.sgml:6
-msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
-msgstr "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
+#. type: Content of: <book><bookinfo><authorgroup><author><personname>
+#: guide.dbk offline.dbk
+msgid "Jason Gunthorpe"
+msgstr "Jason Gunthorpe"
+
+#. type: Content of: <book><bookinfo><authorgroup><author><email>
+#: guide.dbk offline.dbk
+msgid "jgg@debian.org"
+msgstr "jgg@debian.org"

 
 

-#. type: <version></version>
-#: guide.sgml:7
-msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
-msgstr "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
+#. type: Content of: <book><bookinfo><releaseinfo>
+#: guide.dbk offline.dbk
+msgid "Version &apt-product-version;"
+msgstr "Version &apt-product-version;"

 
 

-#. type: <abstract></abstract>
-#: guide.sgml:11
+#. type: Content of: <book><bookinfo><abstract><para>
+#: guide.dbk

 msgid ""
 "This document provides an overview of how to use the the APT package manager."
 msgstr ""
 "Dieses Dokument stellt eine Übersicht bereit, wie das APT-"
 "Paketverwaltungsprogramm benutzt wird."
 
 msgid ""
 "This document provides an overview of how to use the the APT package manager."
 msgstr ""
 "Dieses Dokument stellt eine Übersicht bereit, wie das APT-"
 "Paketverwaltungsprogramm benutzt wird."
 

-#. type: <copyrightsummary></copyrightsummary>
-#: guide.sgml:15
-msgid "Copyright &copy; Jason Gunthorpe, 1998."
-msgstr "Copyright &copy; Jason Gunthorpe, 1998."
+#. type: Content of: <book><bookinfo>
+#: guide.dbk
+msgid ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
+"<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"

 
 

-#. type: <p></p>
-#: guide.sgml:21 offline.sgml:22
+#. type: Content of: <book><bookinfo><legalnotice><title>
+#: guide.dbk offline.dbk
+msgid "License Notice"
+msgstr "Lizenzhinweis"
+
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk offline.dbk

 msgid ""
 "\"APT\" and this document are free software; you can redistribute them and/"
 "or modify them under the terms of the GNU General Public License as "
 msgid ""
 "\"APT\" and this document are free software; you can redistribute them and/"
 "or modify them under the terms of the GNU General Public License as "


@@ -8536,8 +9602,8 @@ msgstr ""
 "sie von der Free Software Foundation veröffentlicht wird; entweder Version 2 "
 "der Lizenz oder (optional) jeder späteren Version."
 
 "sie von der Free Software Foundation veröffentlicht wird; entweder Version 2 "
 "der Lizenz oder (optional) jeder späteren Version."
 

-#. type: <p></p>
-#: guide.sgml:24 offline.sgml:25
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: guide.dbk offline.dbk

 msgid ""
 "For more details, on Debian systems, see the file /usr/share/common-licenses/"
 "GPL for the full license."
 msgid ""
 "For more details, on Debian systems, see the file /usr/share/common-licenses/"
 "GPL for the full license."


@@ -8545,31 +9611,32 @@ msgstr ""
 "Siehe für weitere Details auf Debian-Systemen die Datei /usr/share/common-"
 "licenses/GPL, die die vollständige Lizenz enthält."
 
 "Siehe für weitere Details auf Debian-Systemen die Datei /usr/share/common-"
 "licenses/GPL, die die vollständige Lizenz enthält."
 

-#. type: <heading></heading>
-#: guide.sgml:32
+#. type: Content of: <book><chapter><title>
+#: guide.dbk

 msgid "General"
 msgstr "Allgemein"
 
 msgid "General"
 msgstr "Allgemein"
 

-#. type: <p></p>
-#: guide.sgml:38
+#. type: Content of: <book><chapter><para>
+#: guide.dbk

 msgid ""
 msgid ""

-"The APT package currently contains two sections, the APT <prgn>dselect</"
-"prgn> method and the <prgn>apt-get</prgn> command line user interface. Both "
-"provide a way to install and remove packages as well as download new "
-"packages from the Internet."
+"The APT package currently contains two sections, the APT <command>dselect</"
+"command> method and the <command>apt-get</command> command line user "
+"interface. Both provide a way to install and remove packages as well as "
+"download new packages from the Internet."

 msgstr ""
 msgstr ""

-"Das Paket APT enthält derzeit zwei Abschnitte, die APT-<prgn>dselect</prgn>-"
-"Methode und die Anwenderschnittstelle <prgn>apt-get</prgn> für die "
-"Befehlszeile. Beide stellen eine Möglichkeit bereit, Pakete zu installieren, "
-"zu entfernen, sowie neue Pakete aus dem Internet herunterzuladen."
+"Das Paket APT enthält derzeit zwei Abschnitte, die APT-<command>dselect</"
+"command>-Methode und die Anwenderschnittstelle <command>apt-get</command> "
+"für die Befehlszeile. Beide stellen eine Möglichkeit bereit, Pakete zu "
+"installieren, zu entfernen, sowie neue Pakete aus dem Internet "
+"herunterzuladen."

 
 

-#. type: <heading></heading>
-#: guide.sgml:39
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk

 msgid "Anatomy of the Package System"
 msgstr "Anatomie des Paketsystems"
 
 msgid "Anatomy of the Package System"
 msgstr "Anatomie des Paketsystems"
 

-#. type: <p></p>
-#: guide.sgml:44
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk

 msgid ""
 "The Debian packaging system has a large amount of information associated "
 "with each package to help assure that it integrates cleanly and easily into "
 msgid ""
 "The Debian packaging system has a large amount of information associated "
 "with each package to help assure that it integrates cleanly and easily into "


@@ -8580,8 +9647,8 @@ msgstr ""
 "ordentlich und leicht in das System integriert wird. Das bekannteste seiner "
 "Funktionen ist das Abhängigkeitssystem."
 
 "ordentlich und leicht in das System integriert wird. Das bekannteste seiner "
 "Funktionen ist das Abhängigkeitssystem."
 

-#. type: <p></p>
-#: guide.sgml:52
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk

 msgid ""
 "The dependency system allows individual programs to make use of shared "
 "elements in the system such as libraries. It simplifies placing infrequently "
 msgid ""
 "The dependency system allows individual programs to make use of shared "
 "elements in the system such as libraries. It simplifies placing infrequently "


@@ -8596,8 +9663,8 @@ msgstr ""
 "Durchschnittsanwender installieren sollte. Außerdem erlaubt es die Auswahl "
 "von Mail-Transport-Agenten, X-Servern und so weiter."
 
 "Durchschnittsanwender installieren sollte. Außerdem erlaubt es die Auswahl "
 "von Mail-Transport-Agenten, X-Servern und so weiter."
 

-#. type: <p></p>
-#: guide.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk

 msgid ""
 "The first step to understanding the dependency system is to grasp the "
 "concept of a simple dependency. The meaning of a simple dependency is that a "
 msgid ""
 "The first step to understanding the dependency system is to grasp the "
 "concept of a simple dependency. The meaning of a simple dependency is that a "


@@ -8610,8 +9677,8 @@ msgstr ""
 "benötigt, das zu gleichen Zeit installiert sein muss, um ordentlich zu "
 "funktionieren."
 
 "benötigt, das zu gleichen Zeit installiert sein muss, um ordentlich zu "
 "funktionieren."
 

-#. type: <p></p>
-#: guide.sgml:63
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk

 msgid ""
 "For instance, mailcrypt is an emacs extension that aids in encrypting email "
 "with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
 msgid ""
 "For instance, mailcrypt is an emacs extension that aids in encrypting email "
 "with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "


@@ -8624,8 +9691,8 @@ msgstr ""
 "eine Emacs-Erweiterung ist, hat es ebenfalls eine einfache Abhängigkeit von "
 "Emacs. Ohne Emacs ist es komplett unbenutzbar."
 
 "eine Emacs-Erweiterung ist, hat es ebenfalls eine einfache Abhängigkeit von "
 "Emacs. Ohne Emacs ist es komplett unbenutzbar."
 

-#. type: <p></p>
-#: guide.sgml:73
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk

 msgid ""
 "The other important dependency to understand is a conflicting dependency. It "
 "means that a package, when installed with another package, will not work and "
 msgid ""
 "The other important dependency to understand is a conflicting dependency. It "
 "means that a package, when installed with another package, will not work and "


@@ -8647,8 +9714,8 @@ msgstr ""
 "in Konflikt stehende Abhängigkeiten mit allen anderen Mail-Transport-Agenten "
 "haben."
 
 "in Konflikt stehende Abhängigkeiten mit allen anderen Mail-Transport-Agenten "
 "haben."
 

-#. type: <p></p>
-#: guide.sgml:83
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk

 msgid ""
 "As an added complication there is the possibility for a package to pretend "
 "to be another package. Consider that exim and sendmail for many intents are "
 msgid ""
 "As an added complication there is the possibility for a package to pretend "
 "to be another package. Consider that exim and sendmail for many intents are "


@@ -8669,8 +9736,8 @@ msgstr ""
 "dass sie von einem Mail-Transport-Agenten abhängen. Die kann zu großer "
 "Verwirrung führen, wenn manuell versucht wird, Pakete zu reparieren."
 
 "dass sie von einem Mail-Transport-Agenten abhängen. Die kann zu großer "
 "Verwirrung führen, wenn manuell versucht wird, Pakete zu reparieren."
 

-#. type: <p></p>
-#: guide.sgml:88
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk

 msgid ""
 "At any given time a single dependency may be met by packages that are "
 "already installed or it may not be. APT attempts to help resolve dependency "
 msgid ""
 "At any given time a single dependency may be met by packages that are "
 "already installed or it may not be. APT attempts to help resolve dependency "


@@ -8683,77 +9750,85 @@ msgstr ""
 "Algorithmen bereitstellt, die bei der Auswahl von Paketen zur Installation "
 "helfen."
 
 "Algorithmen bereitstellt, die bei der Auswahl von Paketen zur Installation "
 "helfen."
 

-#. type: <heading></heading>
-#: guide.sgml:96
+#. type: Content of: <book><chapter><title>
+#: guide.dbk

 msgid "apt-get"
 msgstr "apt-get"
 
 msgid "apt-get"
 msgstr "apt-get"
 

-#. type: <p></p>
-#: guide.sgml:102
-msgid ""
-"<prgn>apt-get</prgn> provides a simple way to install packages from the "
-"command line. Unlike <prgn>dpkg</prgn>, <prgn>apt-get</prgn> does not "
-"understand .deb files, it works with the package's proper name and can only "
-"install .deb archives from a <em>Source</em>."
-msgstr ""
-"<prgn>apt-get</prgn> stellt eine einfache Möglichkeit zu Verfügung, Pakete "
-"auf der Befehlszeile zu installieren. Anders als <prgn>dpkg</prgn> versteht "
-"<prgn>apt-get</prgn> keine .deb-Dateien. Es arbeitet mit dem Eigennamen des "
-"Pakets und kann .deb-Archive nur aus einer <em>Quelle</em> installieren."
-
-#. type: <p></p>
-#: guide.sgml:109
-msgid ""
-"The first <footnote><p>If you are using an http proxy server you must set "
-"the http_proxy environment variable first, see sources.list(5)</p></"
-"footnote> thing that should be done before using <prgn>apt-get</prgn> is to "
-"fetch the package lists from the <em>Sources</em> so that it knows what "
-"packages are available. This is done with <tt>apt-get update</tt>. For "
-"instance,"
-msgstr ""
-"Das Erste <footnote><p>Falls Sie einen HTTP-Proxy-Server benutzen, müssen "
-"Sie zuerst die Umgebungsvariable »http_proxy« setzen, siehe sources.list(5)</"
-"p></footnote>, das Sie vor der Benutzung von <prgn>apt-get</prgn> tun "
-"sollten, ist es, die Paketlisten von der <em>Quelle</em> herunterzuladen, so "
-"dass es weiß, welche Pakete verfügbar sind. Dies wird mit <tt>apt-get "
-"update</tt> erledigt. Zum Beispiel,"
-
-#. type: <example></example>
-#: guide.sgml:116
+#. type: Content of: <book><chapter><para>
+#: guide.dbk
+msgid ""
+"<command>apt-get</command> provides a simple way to install packages from "
+"the command line. Unlike <command>dpkg</command>, <command>apt-get</command> "
+"does not understand .deb files, it works with the package's proper name and "
+"can only install .deb archives from a <emphasis>Source</emphasis>."
+msgstr ""
+"<command>apt-get</command> stellt eine einfache Möglichkeit zu Verfügung, "
+"Pakete auf der Befehlszeile zu installieren. Anders als <command>dpkg</"
+"command> versteht <command>apt-get</command> keine .deb-Dateien. Es arbeitet "
+"mit dem Eigennamen des Pakets und kann .deb-Archive nur aus einer "
+"<emphasis>Quelle</emphasis> installieren."
+
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk
+msgid ""
+"If you are using an http proxy server you must set the http_proxy "
+"environment variable first, see sources.list(5)"
+msgstr ""
+"Falls Sie einen HTTP-Proxy-Server benutzen, müssen Sie zuerst die "
+"Umgebungsvariable »http_proxy« setzen, siehe sources.list(5)"
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk
+msgid ""
+"The first <placeholder type=\"footnote\" id=\"0\"/> thing that should be "
+"done before using <command>apt-get</command> is to fetch the package lists "
+"from the <emphasis>Sources</emphasis> so that it knows what packages are "
+"available. This is done with <literal>apt-get update</literal>. For instance,"
+msgstr ""
+"Das Erste <placeholder type=\"footnote\" id=\"0\"/>, das Sie vor der "
+"Benutzung von <command>apt-get</command> tun sollten, ist es, die "
+"Paketlisten von der <emphasis>Quelle</emphasis> herunterzuladen, so dass es "
+"weiß, welche Pakete verfügbar sind. Dies wird mit <literal>apt-get update</"
+"literal> erledigt. Zum Beispiel,"
+
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk

 #, no-wrap
 msgid ""
 "# apt-get update\n"
 "Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Reading Package Lists... Done\n"
 #, no-wrap
 msgid ""
 "# apt-get update\n"
 "Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Reading Package Lists... Done\n"

-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"

 msgstr ""
 "# apt-get update\n"
 "OK   http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "OK   http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Paketlisten werden gelesen … Fertig\n"
 msgstr ""
 "# apt-get update\n"
 "OK   http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
 "OK   http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Paketlisten werden gelesen … Fertig\n"

-"Abhängigkeitsbaum wird aufgebaut … Fertig"
+"Abhängigkeitsbaum wird aufgebaut … Fertig\n"

 
 

-#. type: <p><taglist>
-#: guide.sgml:120
+#. type: Content of: <book><chapter><para>
+#: guide.dbk

 msgid "Once updated there are several commands that can be used:"
 msgstr "Einmal aktualisiert stehen mehrere Befehl zur Benutzung zur Verfügung:"
 
 msgid "Once updated there are several commands that can be used:"
 msgstr "Einmal aktualisiert stehen mehrere Befehl zur Benutzung zur Verfügung:"
 

-#. type: <tag></tag>
-#: guide.sgml:121
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk

 msgid "upgrade"
 msgstr "upgrade"
 
 msgid "upgrade"
 msgstr "upgrade"
 

-#. type: <p></p>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk

 msgid ""
 "Upgrade will attempt to gently upgrade the whole system. Upgrade will never "
 "install a new package or remove an existing package, nor will it ever "
 "upgrade a package that might cause some other package to break. This can be "
 "used daily to relatively safely upgrade the system. Upgrade will list all of "
 "the packages that it could not upgrade, this usually means that they depend "
 msgid ""
 "Upgrade will attempt to gently upgrade the whole system. Upgrade will never "
 "install a new package or remove an existing package, nor will it ever "
 "upgrade a package that might cause some other package to break. This can be "
 "used daily to relatively safely upgrade the system. Upgrade will list all of "
 "the packages that it could not upgrade, this usually means that they depend "

-"on new packages or conflict with some other package. <prgn>dselect</prgn> or "
-"<tt>apt-get install</tt> can be used to force these packages to install."
+"on new packages or conflict with some other package. <command>dselect</"
+"command> or <literal>apt-get install</literal> can be used to force these "
+"packages to install."

 msgstr ""
 "»Upgrade« wird versuchen, ein behutsames Upgrade des ganzen Systems "
 "durchzuführen. »Upgrade« wird niemals ein neues Paket installieren oder "
 msgstr ""
 "»Upgrade« wird versuchen, ein behutsames Upgrade des ganzen Systems "
 "durchzuführen. »Upgrade« wird niemals ein neues Paket installieren oder "


@@ -8762,17 +9837,17 @@ msgstr ""
 "ein relativ sicheres Upgrade des Systems durchzuführen. »Upgrade« wird alle "
 "Pakete auflisten, von denen es kein Upgrade durchführen kann, was "
 "üblicherweise bedeutet, dass sie von neuen Paketen abhängen oder Konflikte "
 "ein relativ sicheres Upgrade des Systems durchzuführen. »Upgrade« wird alle "
 "Pakete auflisten, von denen es kein Upgrade durchführen kann, was "
 "üblicherweise bedeutet, dass sie von neuen Paketen abhängen oder Konflikte "

-"mit anderen Paketen haben. <prgn>dselect</prgn> oder <tt>apt-get install</"
-"tt> können benutzt werden, um die Installation von diesen Paketen zu "
-"erzwingen."
+"mit anderen Paketen haben. <command>dselect</command> oder <literal>apt-get "
+"install</literal> können benutzt werden, um die Installation von diesen "
+"Paketen zu erzwingen."

 
 

-#. type: <tag></tag>
-#: guide.sgml:131
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk

 msgid "install"
 msgstr "install"
 
 msgid "install"
 msgstr "install"
 

-#. type: <p></p>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk

 msgid ""
 "Install is used to install packages by name. The package is automatically "
 "fetched and installed. This can be useful if you already know the name of "
 msgid ""
 "Install is used to install packages by name. The package is automatically "
 "fetched and installed. This can be useful if you already know the name of "


@@ -8791,21 +9866,22 @@ msgstr ""
 "aufzulösen, wird eine Zusammenfassung ausgeben und nach einer Bestätigung "
 "fragen, wenn sich etwas anderes als dessen Argumente ändert."
 
 "aufzulösen, wird eine Zusammenfassung ausgeben und nach einer Bestätigung "
 "fragen, wenn sich etwas anderes als dessen Argumente ändert."
 

-#. type: <tag></tag>
-#: guide.sgml:140
+#. type: Content of: <book><chapter><variablelist><varlistentry><term>
+#: guide.dbk

 msgid "dist-upgrade"
 msgstr "dist-upgrade"
 
 msgid "dist-upgrade"
 msgstr "dist-upgrade"
 

-#. type: <p></p>
-#: guide.sgml:149
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk

 msgid ""
 "Dist-upgrade is a complete upgrader designed to simplify upgrading between "
 "releases of Debian. It uses a sophisticated algorithm to determine the best "
 "set of packages to install, upgrade and remove to get as much of the system "
 "to the newest release. In some situations it may be desired to use dist-"
 "upgrade rather than spend the time manually resolving dependencies in "
 msgid ""
 "Dist-upgrade is a complete upgrader designed to simplify upgrading between "
 "releases of Debian. It uses a sophisticated algorithm to determine the best "
 "set of packages to install, upgrade and remove to get as much of the system "
 "to the newest release. In some situations it may be desired to use dist-"
 "upgrade rather than spend the time manually resolving dependencies in "

-"<prgn>dselect</prgn>. Once dist-upgrade has completed then <prgn>dselect</"
-"prgn> can be used to install any packages that may have been left out."
+"<command>dselect</command>. Once dist-upgrade has completed then "
+"<command>dselect</command> can be used to install any packages that may have "
+"been left out."

 msgstr ""
 "»Dist-upgrade« führt vollständige Upgrades durch. Es wurde entworfen, um "
 "Upgrades zwischen Releases von Debian zu vereinfachen. Es benutzt einen "
 msgstr ""
 "»Dist-upgrade« führt vollständige Upgrades durch. Es wurde entworfen, um "
 "Upgrades zwischen Releases von Debian zu vereinfachen. Es benutzt einen "


@@ -8813,13 +9889,13 @@ msgstr ""
 "Installieren, für das Upgrade oder zum Entfernen festzulegen, um soviel wie "
 "möglich vom System auf das neuste Release zu bekommen. In einigen "
 "Situationen könnte es eher gewünscht sein, »dist-upgrade« zu benutzen, als "
 "Installieren, für das Upgrade oder zum Entfernen festzulegen, um soviel wie "
 "möglich vom System auf das neuste Release zu bekommen. In einigen "
 "Situationen könnte es eher gewünscht sein, »dist-upgrade« zu benutzen, als "

-"Zeit in das manuelle Auflösen von Abhängigkeiten in <prgn>dselect</prgn> zu "
-"investieren. Ist »Dist-upgrade« erst vollständig, dann kann <prgn>dselect</"
-"prgn> benutzt werden, um einige Pakete zu installieren, die außen vor "
-"geblieben sind."
+"Zeit in das manuelle Auflösen von Abhängigkeiten in <command>dselect</"
+"command> zu investieren. Ist »Dist-upgrade« erst vollständig, dann kann "
+"<command>dselect</command> benutzt werden, um einige Pakete zu installieren, "
+"die außen vor geblieben sind."

 
 

-#. type: <p></p>
-#: guide.sgml:152
+#. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
+#: guide.dbk

 msgid ""
 "It is important to closely look at what dist-upgrade is going to do, its "
 "decisions may sometimes be quite surprising."
 msgid ""
 "It is important to closely look at what dist-upgrade is going to do, its "
 "decisions may sometimes be quite surprising."


@@ -8827,159 +9903,167 @@ msgstr ""
 "Es ist wichtig, genau zu schauen, was »Dist-upgrade« tun wird, seine "
 "Entscheidungen können manchmal ziemlich überraschend sein."
 
 "Es ist wichtig, genau zu schauen, was »Dist-upgrade« tun wird, seine "
 "Entscheidungen können manchmal ziemlich überraschend sein."
 

-#. type: <p></p>
-#: guide.sgml:163
-msgid ""
-"<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
-"option is <tt>-d</tt> which does not install the fetched files. If the "
-"system has to download a large number of package it would be undesired to "
-"start installing them in case something goes wrong. When <tt>-d</tt> is used "
-"the downloaded archives can be installed by simply running the command that "
-"caused them to be downloaded again without <tt>-d</tt>."
-msgstr ""
-"<prgn>apt-get</prgn> hat mehrere Befehlszeilenoptionen, die sich detailliert "
-"in dessen Handbuchseite, <manref name=\"apt-get\" section=\"8\"> finden. Die "
-"nützlichste Option ist <tt>-d</tt>, die die heruntergeladenen Dateien nicht "
-"installiert. Falls das System eine große Anzahl Pakete herunterladen soll, "
-"würde es nicht erwünscht sein, wenn die Installation in dem Fall gestartet "
-"würde, wenn etwas schief läuft. Falls <tt>-d</tt> benutzt wird, können die "
-"heruntergeladenen Archive dadurch installiert werden, indem einfach der "
-"Befehl, der das Herunterladen veranlasste, erneut ohne <tt>-d</tt> ausführt "
-"wird."
-
-#. type: <heading></heading>
-#: guide.sgml:168
+# s/package/packages/
+#. type: Content of: <book><chapter><para>
+#: guide.dbk
+msgid ""
+"<command>apt-get</command> has several command line options that are "
+"detailed in its man page, <citerefentry><refentrytitle>apt-get</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry>. The most useful "
+"option is <literal>-d</literal> which does not install the fetched files. If "
+"the system has to download a large number of package it would be undesired "
+"to start installing them in case something goes wrong. When <literal>-d</"
+"literal> is used the downloaded archives can be installed by simply running "
+"the command that caused them to be downloaded again without <literal>-d</"
+"literal>."
+msgstr ""
+"<command>apt-get</command> hat mehrere Befehlszeilenoptionen, die sich "
+"detailliert in seiner Handbuchseite, <citerefentry><refentrytitle>apt-get</"
+"refentrytitle><manvolnum>8</manvolnum></citerefentry> finden. Die "
+"nützlichste Option ist <literal>-d</literal>, die die heruntergeladenen "
+"Dateien nicht installiert. Falls das System eine große Anzahl Pakete "
+"herunterladen soll, würde es nicht erwünscht sein, wenn die Installation "
+"auch in dem Fall gestartet würde, dass etwas schief läuft. Falls <literal>-"
+"d</literal> benutzt wird, können die heruntergeladenen Archive dadurch "
+"installiert werden, indem einfach der Befehl, der das Herunterladen "
+"veranlasste, erneut ohne <literal>-d</literal> ausgeführt wird."
+
+#. type: Content of: <book><chapter><title>
+#: guide.dbk

 msgid "DSelect"
 msgstr "DSelect"
 
 msgid "DSelect"
 msgstr "DSelect"
 

-#. type: <p></p>
-#: guide.sgml:173
+#. type: Content of: <book><chapter><para>
+#: guide.dbk

 msgid ""
 msgid ""

-"The APT <prgn>dselect</prgn> method provides the complete APT system with "
-"the <prgn>dselect</prgn> package selection GUI. <prgn>dselect</prgn> is used "
-"to select the packages to be installed or removed and APT actually installs "
-"them."
+"The APT <command>dselect</command> method provides the complete APT system "
+"with the <command>dselect</command> package selection GUI. <command>dselect</"
+"command> is used to select the packages to be installed or removed and APT "
+"actually installs them."

 msgstr ""
 msgstr ""

-"Die APT-<prgn>dselect</prgn>-Methode stellt das komplette APT-System mit dem "
-"<prgn>dselect</prgn>-Paketauswahl-GUI bereit. <prgn>dselect</prgn> wird "
-"benutzt, um Pakete zum Installieren oder Entfernen auszuwählen und APT "
-"installiert sie tatsächlich."
+"Die APT-<command>dselect</command>-Methode stellt das komplette APT-System "
+"mit dem <command>dselect</command>-Paketauswahl-GUI bereit. "
+"<command>dselect</command> wird benutzt, um Pakete zum Installieren oder "
+"Entfernen auszuwählen und APT installiert sie tatsächlich."

 
 

-#. type: <p></p>
-#: guide.sgml:184
+#. type: Content of: <book><chapter><para>
+#: guide.dbk

 msgid ""
 msgid ""

-"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
-"and then choose the APT method. You will be prompted for a set of "
-"<em>Sources</em> which are places to fetch archives from. These can be "
-"remote Internet sites, local Debian mirrors or CD-ROMs. Each source can "
-"provide a fragment of the total Debian archive, APT will automatically "
+"To enable the APT method you need to select [A]ccess in <command>dselect</"
+"command> and then choose the APT method. You will be prompted for a set of "
+"<emphasis>Sources</emphasis> which are places to fetch archives from. These "
+"can be remote Internet sites, local Debian mirrors or CD-ROMs. Each source "
+"can provide a fragment of the total Debian archive, APT will automatically "

 "combine them to form a complete set of packages. If you have a CD-ROM then "
 "it is a good idea to specify it first and then specify a mirror so that you "
 "have access to the latest bug fixes. APT will automatically use packages on "
 "your CD-ROM before downloading from the Internet."
 msgstr ""
 "combine them to form a complete set of packages. If you have a CD-ROM then "
 "it is a good idea to specify it first and then specify a mirror so that you "
 "have access to the latest bug fixes. APT will automatically use packages on "
 "your CD-ROM before downloading from the Internet."
 msgstr ""

-"Um die APT-Methode einzuschalten, müssen Sie [Z]ugriff in <prgn>dselect</"
-"prgn> auswählen und dann die APT-Methode wählen. Sie werden nach einer "
-"Zusammenstellung von <em>Quellen</em> gefragt. Dies sind Plätze, von denen "
-"Archive heruntergeladen werden. Dies können ferne Internetsites, lokale "
-"Debian-Spiegel oder CD-ROMs sein. Jede Quelle kann einen Ausschnitt des "
-"gesamten Debian-Archives bereitstellen. APT wird sie automatisch "
+"Um die APT-Methode einzuschalten, müssen Sie [Z]ugriff in <command>dselect</"
+"command> auswählen und dann die APT-Methode wählen. Sie werden nach einer "
+"Zusammenstellung von <emphasis>Quellen</emphasis> gefragt. Dies sind Plätze, "
+"von denen Archive heruntergeladen werden. Dies können ferne Internetsites, "
+"lokale Debian-Spiegel oder CD-ROMs sein. Jede Quelle kann einen Ausschnitt "
+"des gesamten Debian-Archives bereitstellen. APT wird sie automatisch "

 "kombinieren, um eine komplette Zusammenstellung von Paketen zu formen. Falls "
 "Sie eine CD-ROM haben, ist es eine gute Idee, sie als erstes und dann den "
 "Spiegel anzugeben, so dass Sie Zugriff auf die neusten Fehlerbehebungen "
 "haben. APT wird automatisch Pakete auf der CD-ROM benutzen, bevor es sie aus "
 "dem Internet herunterlädt."
 
 "kombinieren, um eine komplette Zusammenstellung von Paketen zu formen. Falls "
 "Sie eine CD-ROM haben, ist es eine gute Idee, sie als erstes und dann den "
 "Spiegel anzugeben, so dass Sie Zugriff auf die neusten Fehlerbehebungen "
 "haben. APT wird automatisch Pakete auf der CD-ROM benutzen, bevor es sie aus "
 "dem Internet herunterlädt."
 

-#. type: <example></example>
-#: guide.sgml:198
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk

 #, no-wrap
 msgid ""
 "   Set up a list of distribution source locations\n"
 #, no-wrap
 msgid ""
 "   Set up a list of distribution source locations\n"

-"\t \n"
+"\n"

 " Please give the base URL of the debian distribution.\n"
 " The access schemes I know about are: http file\n"
 " Please give the base URL of the debian distribution.\n"
 " The access schemes I know about are: http file\n"

-"\t   \n"
+"\n"

 " For example:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"

-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"

 msgstr ""
 "   eine Liste mit Orten von Distributionsquellen einrichten\n"
 msgstr ""
 "   eine Liste mit Orten von Distributionsquellen einrichten\n"

-"\t \n"
+"\n"

 " Bitte geben Sie die Basis-URL der Debian-Distribution an.\n"
 " Die bekannten Zugriffsschemata dafür sind: http file\n"
 " Bitte geben Sie die Basis-URL der Debian-Distribution an.\n"
 " Die bekannten Zugriffsschemata dafür sind: http file\n"

-"\t   \n"
+"\n"

 " Zum Beispiel:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"
 " Zum Beispiel:\n"
 "      file:/mnt/debian,\n"
 "      ftp://ftp.debian.org/debian,\n"
 "      http://ftp.de.debian.org/debian,\n"

-"      \n"
-"      \n"
-" URL [http://llug.sep.bnl.gov/debian]:"
+"\n"
+"\n"
+" URL [http://llug.sep.bnl.gov/debian]:\n"

 
 

-#. type: <p></p>
-#: guide.sgml:205
+#. type: Content of: <book><chapter><para>
+#: guide.dbk

 msgid ""
 msgid ""

-"The <em>Sources</em> setup starts by asking for the base of the Debian "
-"archive, defaulting to a HTTP mirror. Next it asks for the distribution to "
-"get."
+"The <emphasis>Sources</emphasis> setup starts by asking for the base of the "
+"Debian archive, defaulting to a HTTP mirror. Next it asks for the "
+"distribution to get."

 msgstr ""
 msgstr ""

-"Das Einrichten der <em>Quellen</em> beginnt durch das Erfragen der Basis des "
-"Debian-Archives, vorgegeben ist ein HTTP-Spiegel. Als nächstes wird nach der "
-"zu erhaltenden Distribution gefragt."
+"Das Einrichten der <emphasis>Quellen</emphasis> beginnt durch das Erfragen "
+"der Basis des Debian-Archives, vorgegeben ist ein HTTP-Spiegel. Als nächstes "
+"wird nach der zu erhaltenden Distribution gefragt."

 
 

-#. type: <example></example>
-#: guide.sgml:212
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk

 #, no-wrap
 msgid ""
 " Please give the distribution tag to get or a path to the\n"
 " package file ending in a /. The distribution\n"
 " tags are typically something like: stable unstable testing non-US\n"
 #, no-wrap
 msgid ""
 " Please give the distribution tag to get or a path to the\n"
 " package file ending in a /. The distribution\n"
 " tags are typically something like: stable unstable testing non-US\n"

-"   \n"
-" Distribution [stable]:"
-msgstr ""
-" Bitte geben Sie die zu erhaltende Distributionskennzeichnung oder den mit  einem / endenden Pfad zum Paket an. Die Distributionskennzeichnungen sind  normalerweise etwas wie: stable unstable testing non-US\n"
-"   \n"
-" Distribution [stable]:"
-
-#. type: <p></p>
-#: guide.sgml:222
-msgid ""
-"The distribution refers to the Debian version in the archive, <em>stable</"
-"em> refers to the latest released version and <em>unstable</em> refers to "
-"the developmental version. <em>non-US</em> is only available on some mirrors "
-"and refers to packages that contain encryption technology or other things "
-"that cannot be exported from the United States. Importing these packages "
-"into the US is legal however."
-msgstr ""
-"Die Distribution bezieht sich auf die Debian-Version im Archiv, <em>stable</"
-"em> bezieht sich auf die zuletzt veröffentlichte Version und <em>unstable</"
-"em> bezieht sich auf die Entwicklungsversion. <em>non-US</em> ist nur auf "
-"einigen Spiegeln verfügbar und bezieht sich auf Pakete, die "
+"\n"
+" Distribution [stable]:\n"
+msgstr ""
+" Bitte geben Sie die zu erhaltende Distributionskennzeichnung oder den mit\n"
+" einem / endenden Pfad zum Paket an. Die Distributionskennzeichnungen sind\n"
+" normalerweise etwas wie: stable unstable testing non-US\n"
+"\n"
+" Distribution [stable]:\n"
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk
+msgid ""
+"The distribution refers to the Debian version in the archive, "
+"<emphasis>stable</emphasis> refers to the latest released version and "
+"<emphasis>unstable</emphasis> refers to the developmental version. "
+"<emphasis>non-US</emphasis> is only available on some mirrors and refers to "
+"packages that contain encryption technology or other things that cannot be "
+"exported from the United States. Importing these packages into the US is "
+"legal however."
+msgstr ""
+"Die Distribution bezieht sich auf die Debian-Version im Archiv, "
+"<emphasis>stable</emphasis> bezieht sich auf die zuletzt veröffentlichte "
+"Version und <emphasis>unstable</emphasis> bezieht sich auf die "
+"Entwicklungsversion. <emphasis>non-US</emphasis> ist nur auf einigen "
+"Spiegeln verfügbar und bezieht sich auf Pakete, die "

 "Verschlüsselungstechnologie oder andere Dinge enthalten, die nicht aus den "
 "Vereinigten Staaten exportiert werden können. Diese Pakete in die USA zu "
 "importieren ist jedoch legal."
 
 "Verschlüsselungstechnologie oder andere Dinge enthalten, die nicht aus den "
 "Vereinigten Staaten exportiert werden können. Diese Pakete in die USA zu "
 "importieren ist jedoch legal."
 

-#. type: <example></example>
-#: guide.sgml:228
+#. type: Content of: <book><chapter><screen>
+#: guide.dbk

 #, no-wrap
 msgid ""
 " Please give the components to get\n"
 " The components are typically something like: main contrib non-free\n"
 #, no-wrap
 msgid ""
 " Please give the components to get\n"
 " The components are typically something like: main contrib non-free\n"

-"  \n"
-" Components [main contrib non-free]:"
+"\n"
+" Components [main contrib non-free]:\n"

 msgstr ""
 " Bitte geben Sie die Komponenten an, die Sie erhalten möchten\n"
 " Die Komponenten sind normalerweise etwas wie: »main« »contrib« »non-free«\n"
 msgstr ""
 " Bitte geben Sie die Komponenten an, die Sie erhalten möchten\n"
 " Die Komponenten sind normalerweise etwas wie: »main« »contrib« »non-free«\n"

-"  \n"
-" Komponenten [main contrib non-free]:"
+"\n"
+" Komponenten [main contrib non-free]:\n"

 
 

-#. type: <p></p>
-#: guide.sgml:236
+#. type: Content of: <book><chapter><para>
+#: guide.dbk

 msgid ""
 "The components list refers to the list of sub distributions to fetch. The "
 "distribution is split up based on software licenses, main being DFSG free "
 msgid ""
 "The components list refers to the list of sub distributions to fetch. The "
 "distribution is split up based on software licenses, main being DFSG free "


@@ -8992,8 +10076,8 @@ msgstr ""
 "»Contrib« und »Non-free« Dinge enthalten, die verschiedene Einschränkungen "
 "in ihrer Benutzung und ihren Vertrieb haben."
 
 "»Contrib« und »Non-free« Dinge enthalten, die verschiedene Einschränkungen "
 "in ihrer Benutzung und ihren Vertrieb haben."
 

-#. type: <p></p>
-#: guide.sgml:240
+#. type: Content of: <book><chapter><para>
+#: guide.dbk

 msgid ""
 "Any number of sources can be added, the setup script will continue to prompt "
 "until you have specified all that you want."
 msgid ""
 "Any number of sources can be added, the setup script will continue to prompt "
 "until you have specified all that you want."


@@ -9002,24 +10086,24 @@ msgstr ""
 "wird mit Nachfragen fortfahren, bis Sie alles angegeben haben, was Sie "
 "möchten."
 
 "wird mit Nachfragen fortfahren, bis Sie alles angegeben haben, was Sie "
 "möchten."
 

-#. type: <p></p>
-#: guide.sgml:247
+#. type: Content of: <book><chapter><para>
+#: guide.dbk

 msgid ""
 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 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."
+"Before starting to use <command>dselect</command> it is necessary to update "
+"the available list by selecting [U]pdate from the menu. This is a superset "
+"of <literal>apt-get update</literal> that makes the fetched information "
+"available to <command>dselect</command>. [U]pdate must be performed even if "
+"<literal>apt-get update</literal> has been run before."

 msgstr ""
 msgstr ""

-"Bevor sie beginnen, <prgn>dselect</prgn> zu benutzen, ist es notwendig, die "
-"Verfügbarkeitsliste zu aktualisieren, indem sie aus dem Menü [E]rneuern "
-"auswählen. Dies ist eine Obermenge von <tt>apt-get update</tt>, das "
-"<prgn>dselect</prgn> heruntergeladene Informationen zur Verfügung stellt. "
-"[E]rneuern muss auch dann durchgeführt werden, wenn vorher <tt>apt-get "
-"update</tt> ausgeführt wurde."
+"Bevor sie beginnen, <command>dselect</command> zu benutzen, ist es "
+"notwendig, die Verfügbarkeitsliste zu aktualisieren, indem sie aus dem Menü "
+"[E]rneuern auswählen. Dies ist eine Obermenge von <literal>apt-get update</"
+"literal>, das <command>dselect</command> heruntergeladene Informationen zur "
+"Verfügung stellt. [E]rneuern muss auch dann durchgeführt werden, wenn vorher "
+"<literal>apt-get update</literal> ausgeführt wurde."

 
 

-#. type: <p></p>
-#: guide.sgml:253
+#. type: Content of: <book><chapter><para>
+#: guide.dbk

 msgid ""
 "You can then go on and make your selections using [S]elect and then perform "
 "the installation using [I]nstall. When using the APT method the [C]onfig and "
 msgid ""
 "You can then go on and make your selections using [S]elect and then perform "
 "the installation using [I]nstall. When using the APT method the [C]onfig and "


@@ -9031,76 +10115,84 @@ msgstr ""
 "benutzen, haben die Befehle Kon[f]ig. und [L]öschen keine Bedeutung, der "
 "Befehl [I]nstall. führt beides gleichermaßen aus."
 
 "benutzen, haben die Befehle Kon[f]ig. und [L]öschen keine Bedeutung, der "
 "Befehl [I]nstall. führt beides gleichermaßen aus."
 

-#. type: <p></p>
-#: guide.sgml:258
+#. type: Content of: <book><chapter><para>
+#: guide.dbk

 msgid ""
 "By default APT will automatically remove the package (.deb) files once they "
 msgid ""
 "By default APT will automatically remove the package (.deb) files once they "

-"have been successfully installed. To change this behavior place <tt>Dselect::"
-"clean \"prompt\";</tt> in /etc/apt/apt.conf."
+"have been successfully installed. To change this behavior place "
+"<literal>Dselect::clean \"prompt\";</literal> in /etc/apt/apt.conf."

 msgstr ""
 "Standardmäßig wird APT automatisch die Paketdateien (.deb) entfernen, sobald "
 "sie erfolgreich installiert sind. Um dieses Verhalten zu ändern, platzieren "
 msgstr ""
 "Standardmäßig wird APT automatisch die Paketdateien (.deb) entfernen, sobald "
 "sie erfolgreich installiert sind. Um dieses Verhalten zu ändern, platzieren "

-"Sie <tt>Dselect::clean \"prompt\";</tt> in /etc/apt/apt.conf."
+"Sie <literal>Dselect::clean \"prompt\";</literal> in /etc/apt/apt.conf."

 
 

-#. type: <heading></heading>
-#: guide.sgml:264
+#. type: Content of: <book><chapter><title>
+#: guide.dbk

 msgid "The Interface"
 msgstr "Die Schnittstelle"
 
 msgid "The Interface"
 msgstr "Die Schnittstelle"
 

-#. type: <p></p>
-#: guide.sgml:278
+#. type: Content of: <book><chapter><para><footnote><para>
+#: guide.dbk
+msgid ""
+"The <command>dselect</command> method actually is a set of wrapper scripts "
+"to <command>apt-get</command>. The method actually provides more "
+"functionality than is present in <command>apt-get</command> alone."
+msgstr ""
+"Die Methode <command>dselect</command> ist tatsächlich eine Zusammenstellung "
+"von Wrapper-Skripten für <command>apt-get</command>. Die Methode stellt "
+"tatsächlich mehr Funktionalitäten bereit, als in <command>apt-get</command> "
+"allein vorhanden sind."
+
+#. type: Content of: <book><chapter><para>
+#: guide.dbk

 msgid ""
 msgid ""

-"Both that APT <prgn>dselect</prgn> method and <prgn>apt-get</prgn> share the "
-"same interface. It is a simple system that generally tells you what it will "
-"do and then goes and does it. <footnote><p>The <prgn>dselect</prgn> method "
-"actually is a set of wrapper scripts to <prgn>apt-get</prgn>. The method "
-"actually provides more functionality than is present in <prgn>apt-get</prgn> "
-"alone.</p></footnote> After printing out a summary of what will happen APT "
+"Both that APT <command>dselect</command> method and <command>apt-get</"
+"command> share the same interface. It is a simple system that generally "
+"tells you what it will do and then goes and does it. <placeholder type="
+"\"footnote\" id=\"0\"/> After printing out a summary of what will happen APT "

 "then will print out some informative status messages so that you can "
 "estimate how far along it is and how much is left to do."
 msgstr ""
 "then will print out some informative status messages so that you can "
 "estimate how far along it is and how much is left to do."
 msgstr ""

-"Sowohl die APT-Methode <prgn>dselect</prgn>, als auch <prgn>apt-get</prgn> "
-"teilen sich die gleiche Schnittstelle. Es ist ein einfaches System, das "
-"üblicherweise mitteilt, was es tun wird und es dann tut. <footnote><p>Die "
-"Methode <prgn>dselect</prgn> ist tatsächlich eine Zusammenstellung von "
-"Wrapper-Skripten für <prgn>apt-get</prgn>. Die Methode stellt tatsächlich "
-"mehr Funktionalitäten bereit, als in <prgn>apt-get</prgn> allein vorhanden "
-"sind.</p></footnote> Nach der Ausgabe einer Zusammenfassung was passieren "
-"wird, gibt APT einige informative Statusmeldungen aus, so dass Sie "
-"abschätzen können, wie weit es ist und wieviel noch zu tun ist."
-
-#. type: <heading></heading>
-#: guide.sgml:280
+"Sowohl die APT-Methode <command>dselect</command>, als auch <command>apt-"
+"get</command> teilen sich die gleiche Schnittstelle. Es ist ein einfaches "
+"System, das üblicherweise mitteilt, was es tun wird und es dann tut. "
+"<placeholder type=\"footnote\" id=\"0\"/> Nach der Ausgabe einer "
+"Zusammenfassung was passieren wird, gibt APT einige informative "
+"Statusmeldungen aus, so dass Sie abschätzen können, wie weit es ist und "
+"wieviel noch zu tun ist."
+
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk

 msgid "Startup"
 msgstr "Anfang"
 
 msgid "Startup"
 msgstr "Anfang"
 

-#. type: <p></p>
-#: guide.sgml:284
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk

 msgid ""
 "Before all operations except update, APT performs a number of actions to "
 "prepare its internal state. It also does some checks of the system's state. "
 msgid ""
 "Before all operations except update, APT performs a number of actions to "
 "prepare its internal state. It also does some checks of the system's state. "

-"At any time these operations can be performed by running <tt>apt-get check</"
-"tt>."
+"At any time these operations can be performed by running <literal>apt-get "
+"check</literal>."

 msgstr ""
 "Vor allen Operationen, ausgenommen »update«, führt APT eine Reihe von "
 "Aktionen durch, um seinen internen Status vorzubereiten. Es macht außerdem "
 "einige Prüfungen des Systemstatus. Diese Operationen können jederzeit durch "
 msgstr ""
 "Vor allen Operationen, ausgenommen »update«, führt APT eine Reihe von "
 "Aktionen durch, um seinen internen Status vorzubereiten. Es macht außerdem "
 "einige Prüfungen des Systemstatus. Diese Operationen können jederzeit durch "

-"Ausführung von <tt>apt-get check</tt> durchgeführt werden."
+"Ausführung von <literal>apt-get check</literal> durchgeführt werden."

 
 

-#. type: <example></example>
-#: guide.sgml:289
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk

 #, no-wrap
 msgid ""
 "# apt-get check\n"
 "Reading Package Lists... Done\n"
 #, no-wrap
 msgid ""
 "# apt-get check\n"
 "Reading Package Lists... Done\n"

-"Building Dependency Tree... Done"
+"Building Dependency Tree... Done\n"

 msgstr ""
 "# apt-get check\n"
 "Paketlisten werden gelesen … Fertig\n"
 msgstr ""
 "# apt-get check\n"
 "Paketlisten werden gelesen … Fertig\n"

-"Abhängigkeitsbaum wird aufgebaut … Fertig"
+"Abhängigkeitsbaum wird aufgebaut … Fertig\n"

 
 

-#. type: <p></p>
-#: guide.sgml:297
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk

 msgid ""
 "The first thing it does is read all the package files into memory. APT uses "
 "a caching scheme so this operation will be faster the second time it is run. "
 msgid ""
 "The first thing it does is read all the package files into memory. APT uses "
 "a caching scheme so this operation will be faster the second time it is run. "


@@ -9113,22 +10205,22 @@ msgstr ""
 "gefunden werden, werden sie ignoriert und beim Beenden von Apt-get wird eine "
 "Warnung ausgegeben."
 
 "gefunden werden, werden sie ignoriert und beim Beenden von Apt-get wird eine "
 "Warnung ausgegeben."
 

-#. type: <p></p>
-#: guide.sgml:303
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk

 msgid ""
 "The final operation performs a detailed analysis of the system's "
 "dependencies. It checks every dependency of every installed or unpacked "
 "package and considers if it is OK. Should this find a problem then a report "
 msgid ""
 "The final operation performs a detailed analysis of the system's "
 "dependencies. It checks every dependency of every installed or unpacked "
 "package and considers if it is OK. Should this find a problem then a report "

-"will be printed out and <prgn>apt-get</prgn> will refuse to run."
+"will be printed out and <command>apt-get</command> will refuse to run."

 msgstr ""
 "Die letzte Operation führt eine detaillierte Analyse der Abhängigkeiten des "
 "Systems durch. Sie prüft jede Abhängigkeit jedes installierten oder "
 "entpackten Pakets und berücksichtigt, ob es in Ordnung ist. Sollte sie ein "
 msgstr ""
 "Die letzte Operation führt eine detaillierte Analyse der Abhängigkeiten des "
 "Systems durch. Sie prüft jede Abhängigkeit jedes installierten oder "
 "entpackten Pakets und berücksichtigt, ob es in Ordnung ist. Sollte sie ein "

-"Problem finden, dann wird eine Meldung ausgegeben und <prgn>apt-get</prgn> "
-"wird die Ausführung verweigern."
+"Problem finden, dann wird eine Meldung ausgegeben und <command>apt-get</"
+"command> wird die Ausführung verweigern."

 
 

-#. type: <example></example>
-#: guide.sgml:320
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk

 #, no-wrap
 msgid ""
 "# apt-get check\n"
 #, no-wrap
 msgid ""
 "# apt-get check\n"


@@ -9138,14 +10230,14 @@ msgid ""
 "Sorry, but the following packages have unmet dependencies:\n"
 "  9fonts: Depends: xlib6g but it is not installed\n"
 "  uucp: Depends: mailx but it is not installed\n"
 "Sorry, but the following packages have unmet dependencies:\n"
 "  9fonts: Depends: xlib6g but it is not installed\n"
 "  uucp: Depends: mailx but it is not installed\n"

-"  blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+"  blast: Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"

 "  adduser: Depends: perl-base but it is not installed\n"
 "  aumix: Depends: libgpmg1 but it is not installed\n"
 "  debiandoc-sgml: Depends: sgml-base but it is not installed\n"
 "  adduser: Depends: perl-base but it is not installed\n"
 "  aumix: Depends: libgpmg1 but it is not installed\n"
 "  debiandoc-sgml: Depends: sgml-base but it is not installed\n"

-"  bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
+"  bash-builtins: Depends: bash (&gt;= 2.01) but 2.0-3 is installed\n"

 "  cthugha: Depends: svgalibg1 but it is not installed\n"
 "  cthugha: Depends: svgalibg1 but it is not installed\n"

-"           Depends: xlib6g (>= 3.3-5) but it is not installed\n"
-"  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
+"           Depends: xlib6g (&gt;= 3.3-5) but it is not installed\n"
+"  libreadlineg2: Conflicts:libreadline2 (&lt;&lt; 2.1-2.1)\n"

 msgstr ""
 "# apt-get check\n"
 "Paketlisten werden gelesen … Fertig Fertig\n"
 msgstr ""
 "# apt-get check\n"
 "Paketlisten werden gelesen … Fertig Fertig\n"


@@ -9155,17 +10247,17 @@ msgstr ""
 "Die folgenden Pakete haben nichterfüllte Abhängigkeiten:\n"
 "  9fonts: Hängt ab: xlib6g ist aber nicht installiert\n"
 "  uucp: Hängt ab: mailx ist aber nicht installiert\n"
 "Die folgenden Pakete haben nichterfüllte Abhängigkeiten:\n"
 "  9fonts: Hängt ab: xlib6g ist aber nicht installiert\n"
 "  uucp: Hängt ab: mailx ist aber nicht installiert\n"

-"  blast: Hängt ab: xlib6g (>= 3.3-5) ist aber nicht installiert\n"
+"  blast: Hängt ab: xlib6g (&gt;= 3.3-5) ist aber nicht installiert\n"

 "  adduser: Hängt ab: perl-base ist aber nicht installiert\n"
 "  aumix: Hängt ab: libgpmg1 ist aber nicht installiert\n"
 "  debiandoc-sgml: Hängt ab: sgml-base ist aber nicht installiert\n"
 "  adduser: Hängt ab: perl-base ist aber nicht installiert\n"
 "  aumix: Hängt ab: libgpmg1 ist aber nicht installiert\n"
 "  debiandoc-sgml: Hängt ab: sgml-base ist aber nicht installiert\n"

-"  bash-builtins: Hängt ab: bash (>= 2.01) but 2.0-3 ist installiert\n"
+"  bash-builtins: Hängt ab: bash (&gt;= 2.01) but 2.0-3 ist installiert\n"

 "  cthugha: Hängt ab: svgalibg1 ist aber nicht installiert\n"
 "  cthugha: Hängt ab: svgalibg1 ist aber nicht installiert\n"

-"           Hängt ab: xlib6g (>= 3.3-5) ist aber nicht installiert\n"
-"  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
+"           Hängt ab: xlib6g (&gt;= 3.3-5) ist aber nicht installiert\n"
+"  libreadlineg2: Conflicts:libreadline2 (&lt;&lt; 2.1-2.1)\n"

 
 

-#. type: <p></p>
-#: guide.sgml:329
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk

 msgid ""
 "In this example the system has many problems, including a serious problem "
 "with libreadlineg2. For each package that has unmet dependencies a line is "
 msgid ""
 "In this example the system has many problems, including a serious problem "
 "with libreadlineg2. For each package that has unmet dependencies a line is "


@@ -9179,87 +10271,98 @@ msgstr ""
 "Problem anzeigt und die Abhängigkeiten, die nicht erfüllt sind. Eine kurze "
 "Erklärung, warum das Paket ein Abhängigkeitsproblem hat, ist inbegriffen."
 
 "Problem anzeigt und die Abhängigkeiten, die nicht erfüllt sind. Eine kurze "
 "Erklärung, warum das Paket ein Abhängigkeitsproblem hat, ist inbegriffen."
 

-#. type: <p></p>
-#: guide.sgml:337
+#. type: Content of: <book><chapter><section><para><footnote><para>
+#: guide.dbk
+msgid ""
+"APT however considers all known dependencies and attempts to prevent broken "
+"packages"
+msgstr ""
+"APT berücksichtigt jedoch alle bekannten Abhängigkeiten und versucht, "
+"kaputte Pakete zu vermeiden"
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk

 msgid ""
 "There are two ways a system can get into a broken state like this. The first "
 msgid ""
 "There are two ways a system can get into a broken state like this. The first "

-"is caused by <prgn>dpkg</prgn> missing some subtle relationships between "
-"packages when performing upgrades. <footnote><p>APT however considers all "
-"known dependencies and attempts to prevent broken packages</p></footnote>. "
-"The second is if a package installation fails during an operation. In this "
-"situation a package may have been unpacked without its dependents being "
-"installed."
+"is caused by <command>dpkg</command> missing some subtle relationships "
+"between packages when performing upgrades. <placeholder type=\"footnote\" id="
+"\"0\"/>. The second is if a package installation fails during an operation. "
+"In this situation a package may have been unpacked without its dependents "
+"being installed."

 msgstr ""
 "Es gibt zwei Möglichkeiten, wie ein System in einen kaputten Status wie "
 msgstr ""
 "Es gibt zwei Möglichkeiten, wie ein System in einen kaputten Status wie "

-"diesen kommen kann. Die erste wird dadurch verursacht, dass <prgn>dpkg</"
-"prgn> einige feine Beziehungen zwischen Paketen übersieht, wenn Upgrades "
-"durchgeführt werden. <footnote><p>APT berücksichtigt jedoch alle bekannten "
-"Abhängigkeiten und versucht, kaputte Pakete zu vermeiden</p></footnote>. Die "
-"zweite tritt auf, falls eine Paketinstallation während der Ausführung "
-"fehlschlägt. In dieser Situation könnte ein Paket entpackt worden sein, ohne "
-"dass die von ihm Abhängigen installiert sind."
+"diesen kommen kann. Die erste wird dadurch verursacht, dass <command>dpkg</"
+"command> einige feine Beziehungen zwischen Paketen übersieht, wenn Upgrades "
+"durchgeführt werden. <placeholder type=\"footnote\" id=\"0\"/>. Die zweite "
+"tritt auf, falls eine Paketinstallation während der Ausführung fehlschlägt. "
+"In dieser Situation könnte ein Paket entpackt worden sein, ohne dass die von "
+"ihm Abhängigen installiert sind."

 
 

-#. type: <p></p>
-#: guide.sgml:345
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk

 msgid ""
 "The second situation is much less serious than the first because APT places "
 "certain constraints on the order that packages are installed. In both cases "
 msgid ""
 "The second situation is much less serious than the first because APT places "
 "certain constraints on the order that packages are installed. In both cases "

-"supplying the <tt>-f</tt> option to <prgn>apt-get</prgn> will cause APT to "
-"deduce a possible solution to the problem and then continue on. The APT "
-"<prgn>dselect</prgn> method always supplies the <tt>-f</tt> option to allow "
-"for easy continuation of failed maintainer scripts."
+"supplying the <literal>-f</literal> option to <command>apt-get</command> "
+"will cause APT to deduce a possible solution to the problem and then "
+"continue on. The APT <command>dselect</command> method always supplies the "
+"<literal>-f</literal> option to allow for easy continuation of failed "
+"maintainer scripts."

 msgstr ""
 "Die zweite Situation ist weit weniger ernst als die erste, weil APT "
 "bestimmte Beschränkungen in der Reihenfolge setzt, in der Pakete installiert "
 msgstr ""
 "Die zweite Situation ist weit weniger ernst als die erste, weil APT "
 "bestimmte Beschränkungen in der Reihenfolge setzt, in der Pakete installiert "

-"werden. In beiden Fällen veranlasst die Option <tt>-f</tt> <prgn>apt-get</"
-"prgn>, eine mögliche Lösung für das Problem zu folgern und dann "
-"fortzufahren. Die APT-Methode <prgn>dselect</prgn> liefert immer die Option "
-"<tt>-f</tt>, zum einfachen Fortfahren von gescheiterten Betreuerskripten."
-
-#. type: <p></p>
-#: guide.sgml:351
-msgid ""
-"However, if the <tt>-f</tt> option is used to correct a seriously broken "
-"system caused by the first case then it is possible that it will either fail "
-"immediately or the installation sequence will fail. In either case it is "
-"necessary to manually use dpkg (possibly with forcing options) to correct "
-"the situation enough to allow APT to proceed."
-msgstr ""
-"Falls jedoch die Option <tt>-f</tt> benutzt wird, um ein ernsthaft kaputtes "
-"System zu korrigieren, das vom ersten Fall verursacht wurde, dann ist es "
-"möglich, dass es entweder sofort fehlschlägt oder die Installationsabfolge "
-"fehlschlagen wird. In beiden Fällen ist es nötig, Dpkg (möglicherweise mit "
-"erzwingenden Optionen) manuell zu benutzen, um die Situation ausreichend zu "
-"korrigieren, so dass es APT ermöglicht wird, fortzufahren."
-
-#. type: <heading></heading>
-#: guide.sgml:356
+"werden. In beiden Fällen veranlasst die Option <literal>-f</literal> "
+"<command>apt-get</command>, eine mögliche Lösung für das Problem zu folgern "
+"und dann fortzufahren. Die APT-Methode <command>dselect</command> liefert "
+"immer die Option <literal>-f</literal>, zum einfachen Fortfahren von "
+"gescheiterten Betreuerskripten."
+
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk
+msgid ""
+"However, if the <literal>-f</literal> option is used to correct a seriously "
+"broken system caused by the first case then it is possible that it will "
+"either fail immediately or the installation sequence will fail. In either "
+"case it is necessary to manually use dpkg (possibly with forcing options) to "
+"correct the situation enough to allow APT to proceed."
+msgstr ""
+"Falls jedoch die Option <literal>-f</literal> benutzt wird, um ein ernsthaft "
+"kaputtes System zu korrigieren, das vom ersten Fall verursacht wurde, dann "
+"ist es möglich, dass es entweder sofort fehlschlägt oder die "
+"Installationsabfolge fehlschlagen wird. In beiden Fällen ist es nötig, Dpkg "
+"(möglicherweise mit erzwingenden Optionen) manuell zu benutzen, um die "
+"Situation ausreichend zu korrigieren, so dass es APT ermöglicht wird, "
+"fortzufahren."
+
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk

 msgid "The Status Report"
 msgstr "Der Statusbericht"
 
 msgid "The Status Report"
 msgstr "Der Statusbericht"
 

-#. type: <p></p>
-#: guide.sgml:363
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk

 msgid ""
 msgid ""

-"Before proceeding <prgn>apt-get</prgn> will present a report on what will "
-"happen. Generally the report reflects the type of operation being performed "
-"but there are several common elements. In all cases the lists reflect the "
-"final state of things, taking into account the <tt>-f</tt> option and any "
-"other relevant activities to the command being executed."
+"Before proceeding <command>apt-get</command> will present a report on what "
+"will happen. Generally the report reflects the type of operation being "
+"performed but there are several common elements. In all cases the lists "
+"reflect the final state of things, taking into account the <literal>-f</"
+"literal> option and any other relevant activities to the command being "
+"executed."

 msgstr ""
 msgstr ""

-"Bevor es fortfährt, wird <prgn>apt-get</prgn> einen Bericht darüber "
+"Bevor es fortfährt, wird <command>apt-get</command> einen Bericht darüber "

 "präsentieren, was geschehen wird. Im Allgemeinen spiegelt der Bericht den "
 "Typ der Operation, die ausgeführt wird, wider, aber es gibt auch mehrere "
 "geläufige Elemente. Auf jeden Fall spiegelt die Liste den Endstatus der "
 "präsentieren, was geschehen wird. Im Allgemeinen spiegelt der Bericht den "
 "Typ der Operation, die ausgeführt wird, wider, aber es gibt auch mehrere "
 "geläufige Elemente. Auf jeden Fall spiegelt die Liste den Endstatus der "

-"Dinge wider, bezieht die Option <tt>-f</tt> in Betracht und alle andere "
-"relevante Aktivitäten zum Befehl, der ausgeführt wird."
+"Dinge wider, bezieht die Option <literal>-f</literal> in Betracht und alle "
+"andere relevante Aktivitäten zum Befehl, der ausgeführt wird."

 
 

-#. type: <heading></heading>
-#: guide.sgml:364
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk

 msgid "The Extra Package list"
 msgstr "Die zusätzliche Paketliste"
 
 msgid "The Extra Package list"
 msgstr "Die zusätzliche Paketliste"
 

-#. type: <example></example>
-#: guide.sgml:372
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk

 #, no-wrap
 msgid ""
 "The following extra packages will be installed:\n"
 #, no-wrap
 msgid ""
 "The following extra packages will be installed:\n"


@@ -9267,87 +10370,87 @@ msgid ""
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"

-"  ssh"
+"  ssh\n"

 msgstr ""
 "Die folgenden Pakete werden zusätzlich installiert:\n"
 "  libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n"
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"
 msgstr ""
 "Die folgenden Pakete werden zusätzlich installiert:\n"
 "  libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n"
 "  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
 "  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
 "  squake pgp-i python-base debmake ldso perl libreadlineg2\n"

-"  ssh"
+"  ssh\n"

 
 

-#. type: <p></p>
-#: guide.sgml:379
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk

 msgid ""
 "The Extra Package list shows all of the packages that will be installed or "
 "upgraded in excess of the ones mentioned on the command line. It is only "
 msgid ""
 "The Extra Package list shows all of the packages that will be installed or "
 "upgraded in excess of the ones mentioned on the command line. It is only "

-"generated for an <tt>install</tt> command. The listed packages are often the "
-"result of an Auto Install."
+"generated for an <literal>install</literal> command. The listed packages are "
+"often the result of an Auto Install."

 msgstr ""
 "Die zusätzliche Paketliste zeigt alle Pakete, die installiert werden oder "
 "von denen ein Upgrade durchgeführt wird, zusätzlich zu den auf der "
 msgstr ""
 "Die zusätzliche Paketliste zeigt alle Pakete, die installiert werden oder "
 "von denen ein Upgrade durchgeführt wird, zusätzlich zu den auf der "

-"Befehlszeile angegebenen. Sie wird nur für einen <tt>install</tt>-Befehl "
-"generiert. Die aufgelisteten Pakete sind häufig das Ergebnis einer "
+"Befehlszeile angegebenen. Sie wird nur für einen <literal>install</literal>-"
+"Befehl generiert. Die aufgelisteten Pakete sind häufig das Ergebnis einer "

 "automatischen Installation."
 
 "automatischen Installation."
 

-#. type: <heading></heading>
-#: guide.sgml:382
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk

 msgid "The Packages to Remove"
 msgstr "Die zu entfernenden Pakete"
 
 msgid "The Packages to Remove"
 msgstr "Die zu entfernenden Pakete"
 

-#. type: <example></example>
-#: guide.sgml:389
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk

 #, no-wrap
 msgid ""
 "The following packages will be REMOVED:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
 #, no-wrap
 msgid ""
 "The following packages will be REMOVED:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"

-"  nas xpilot xfig"
+"  nas xpilot xfig\n"

 msgstr ""
 "Die folgenden Pakete werden ENTFERNT:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
 msgstr ""
 "Die folgenden Pakete werden ENTFERNT:\n"
 "  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
 "  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
 "  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"

-"  nas xpilot xfig"
+"  nas xpilot xfig\n"

 
 

-#. type: <p></p>
-#: guide.sgml:399
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk

 msgid ""
 "The Packages to Remove list shows all of the packages that will be removed "
 "from the system. It can be shown for any of the operations and should be "
 "given a careful inspection to ensure nothing important is to be taken off. "
 msgid ""
 "The Packages to Remove list shows all of the packages that will be removed "
 "from the system. It can be shown for any of the operations and should be "
 "given a careful inspection to ensure nothing important is to be taken off. "

-"The <tt>-f</tt> option is especially good at generating packages to remove "
-"so extreme care should be used in that case. The list may contain packages "
-"that are going to be removed because they are only partially installed, "
-"possibly due to an aborted installation."
+"The <literal>-f</literal> option is especially good at generating packages "
+"to remove so extreme care should be used in that case. The list may contain "
+"packages that are going to be removed because they are only partially "
+"installed, possibly due to an aborted installation."

 msgstr ""
 "Die Liste der zu entfernenden Pakete zeigt all die Pakete, die vom System "
 "entfernt werden. Sie kann für jede der Operationen angezeigt werden und "
 "sollte einer sorgfältige Überprüfung unterzogen werden, um sicherzustellen, "
 msgstr ""
 "Die Liste der zu entfernenden Pakete zeigt all die Pakete, die vom System "
 "entfernt werden. Sie kann für jede der Operationen angezeigt werden und "
 "sollte einer sorgfältige Überprüfung unterzogen werden, um sicherzustellen, "

-"dass nichts Wichtiges weggenommen wird. Die Option <tt>-f</tt> ist "
+"dass nichts Wichtiges weggenommen wird. Die Option <literal>-f</literal> ist "

 "insbesondere gut darin, Pakete zum Entfernen vorzumerken, so dass in diesem "
 "Fall mit extremer Vorsicht vorgegangen werden sollte. Die Liste könnte "
 "Pakete enthalten, die entfernt werden, weil sie nur teilweise installiert "
 "sind, möglicherweise aufgrund einer abgebrochenen Installation."
 
 "insbesondere gut darin, Pakete zum Entfernen vorzumerken, so dass in diesem "
 "Fall mit extremer Vorsicht vorgegangen werden sollte. Die Liste könnte "
 "Pakete enthalten, die entfernt werden, weil sie nur teilweise installiert "
 "sind, möglicherweise aufgrund einer abgebrochenen Installation."
 

-#. type: <heading></heading>
-#: guide.sgml:402
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk

 msgid "The New Packages list"
 msgstr "Die Liste neuer Pakete"
 
 msgid "The New Packages list"
 msgstr "Die Liste neuer Pakete"
 

-#. type: <example></example>
-#: guide.sgml:406
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk

 #, no-wrap
 msgid ""
 "The following NEW packages will installed:\n"
 #, no-wrap
 msgid ""
 "The following NEW packages will installed:\n"

-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"

 msgstr ""
 "Die folgenden NEUEN Pakete werden zusätzlich installiert:\n"
 msgstr ""
 "Die folgenden NEUEN Pakete werden zusätzlich installiert:\n"

-"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
+"  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base\n"

 
 

-#. type: <p></p>
-#: guide.sgml:411
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk

 msgid ""
 "The New Packages list is simply a reminder of what will happen. The packages "
 "listed are not presently installed in the system but will be when APT is "
 msgid ""
 "The New Packages list is simply a reminder of what will happen. The packages "
 "listed are not presently installed in the system but will be when APT is "


@@ -9357,58 +10460,58 @@ msgstr ""
 "aufgelisteten Pakete sind zurzeit nicht auf dem System installiert, werden "
 "es aber sein, wenn APT fertig ist."
 
 "aufgelisteten Pakete sind zurzeit nicht auf dem System installiert, werden "
 "es aber sein, wenn APT fertig ist."
 

-#. type: <heading></heading>
-#: guide.sgml:414
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk

 msgid "The Kept Back list"
 msgstr "Die Liste zurückgehaltener Pakete"
 
 msgid "The Kept Back list"
 msgstr "Die Liste zurückgehaltener Pakete"
 

-#. type: <example></example>
-#: guide.sgml:419
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk

 #, no-wrap
 msgid ""
 "The following packages have been kept back\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
 #, no-wrap
 msgid ""
 "The following packages have been kept back\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"

-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"

 msgstr ""
 "Die folgenden Pakete werden zurückgehalten:\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"
 msgstr ""
 "Die folgenden Pakete werden zurückgehalten:\n"
 "  compface man-db tetex-base msql libpaper svgalib1\n"

-"  gs snmp arena lynx xpat2 groff xscreensaver"
+"  gs snmp arena lynx xpat2 groff xscreensaver\n"

 
 

-#. type: <p></p>
-#: guide.sgml:428
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk

 msgid ""
 "Whenever the whole system is being upgraded there is the possibility that "
 "new versions of packages cannot be installed because they require new things "
 "or conflict with already installed things. In this case the package will "
 "appear in the Kept Back list. The best way to convince packages listed there "
 msgid ""
 "Whenever the whole system is being upgraded there is the possibility that "
 "new versions of packages cannot be installed because they require new things "
 "or conflict with already installed things. In this case the package will "
 "appear in the Kept Back list. The best way to convince packages listed there "

-"to install is with <tt>apt-get install</tt> or by using <prgn>dselect</prgn> "
-"to resolve their problems."
+"to install is with <literal>apt-get install</literal> or by using "
+"<command>dselect</command> to resolve their problems."

 msgstr ""
 "Jedesmal, wenn ein Upgrade des ganzen Systems durchgeführt wird, besteht die "
 "Möglichkeit, dass neue Versionen von Paketen nicht installiert werden "
 "können, weil sie neue Dinge benötigen oder einen Konflikt mit bereits "
 "installierten Dingen haben. In diesem Fall wird das Paket auf der Liste "
 "zurückgehaltener Pakete erscheinen. Der beste Weg dort aufgeführte Pakete "
 msgstr ""
 "Jedesmal, wenn ein Upgrade des ganzen Systems durchgeführt wird, besteht die "
 "Möglichkeit, dass neue Versionen von Paketen nicht installiert werden "
 "können, weil sie neue Dinge benötigen oder einen Konflikt mit bereits "
 "installierten Dingen haben. In diesem Fall wird das Paket auf der Liste "
 "zurückgehaltener Pakete erscheinen. Der beste Weg dort aufgeführte Pakete "

-"zur Installation zu bewegen, ist per <tt>apt-get install</tt> oder indem "
-"<prgn>dselect</prgn> zum Lösen ihrer Probleme benutzt wird."
+"zur Installation zu bewegen, ist per <literal>apt-get install</literal> oder "
+"indem <command>dselect</command> zum Lösen ihrer Probleme benutzt wird."

 
 

-#. type: <heading></heading>
-#: guide.sgml:431
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk

 msgid "Held Packages warning"
 msgstr "Warnung wegen zurückgehaltener Pakete"
 
 msgid "Held Packages warning"
 msgstr "Warnung wegen zurückgehaltener Pakete"
 

-#. type: <example></example>
-#: guide.sgml:435
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk

 #, no-wrap
 msgid ""
 "The following held packages will be changed:\n"
 #, no-wrap
 msgid ""
 "The following held packages will be changed:\n"

-"  cvs"
+"  cvs\n"

 msgstr ""
 "Die folgenden zurückgehaltenen Pakete werden geändert:\n"
 msgstr ""
 "Die folgenden zurückgehaltenen Pakete werden geändert:\n"

-"  cvs"
+"  cvs\n"

 
 

-#. type: <p></p>
-#: guide.sgml:441
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk

 msgid ""
 "Sometimes you can ask APT to install a package that is on hold, in such a "
 "case it prints out a warning that the held package is going to be changed. "
 msgid ""
 "Sometimes you can ask APT to install a package that is on hold, in such a "
 "case it prints out a warning that the held package is going to be changed. "


@@ -9419,33 +10522,33 @@ msgstr ""
 "zurückgehaltene Paket geändert wird. Dies sollte nur während »Dist-upgrade« "
 "oder »Install« vorkommen."
 
 "zurückgehaltene Paket geändert wird. Dies sollte nur während »Dist-upgrade« "
 "oder »Install« vorkommen."
 

-#. type: <heading></heading>
-#: guide.sgml:444
+#. type: Content of: <book><chapter><section><section><title>
+#: guide.dbk

 msgid "Final summary"
 msgstr "Abschließende Zusammenfassung"
 
 msgid "Final summary"
 msgstr "Abschließende Zusammenfassung"
 

-#. type: <p></p>
-#: guide.sgml:447
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk

 msgid ""
 "Finally, APT will print out a summary of all the changes that will occur."
 msgstr ""
 "Abschließend wird APT eine Zusammenfassung aller Änderungen ausgeben, die "
 "auftreten werden."
 
 msgid ""
 "Finally, APT will print out a summary of all the changes that will occur."
 msgstr ""
 "Abschließend wird APT eine Zusammenfassung aller Änderungen ausgeben, die "
 "auftreten werden."
 

-#. type: <example></example>
-#: guide.sgml:452
+#. type: Content of: <book><chapter><section><section><screen>
+#: guide.dbk

 #, no-wrap
 msgid ""
 "206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.\n"
 "12 packages not fully installed or removed.\n"
 #, no-wrap
 msgid ""
 "206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.\n"
 "12 packages not fully installed or removed.\n"

-"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
+"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used.\n"

 msgstr ""
 "206 Pakete aktualisiert, 8 zusätzlich installiert, 23 werden entfernt und 51 nicht aktualisiert.\n"
 "12 Pakete nicht vollständig installiert oder entfernt.\n"
 msgstr ""
 "206 Pakete aktualisiert, 8 zusätzlich installiert, 23 werden entfernt und 51 nicht aktualisiert.\n"
 "12 Pakete nicht vollständig installiert oder entfernt.\n"

-"Muss 65,7MB/66,7MB an Archiven herunterladen. Nach dem Entpacken werden 26,5MB zusätzlich belegt sein."
+"Muss 65,7MB/66,7MB an Archiven herunterladen. Nach dem Entpacken werden 26,5MB zusätzlich belegt sein.\n"

 
 

-#. type: <p></p>
-#: guide.sgml:470
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk

 msgid ""
 "The first line of the summary simply is a reduced version of all of the "
 "lists and includes the number of upgrades - that is packages already "
 msgid ""
 "The first line of the summary simply is a reduced version of all of the "
 "lists and includes the number of upgrades - that is packages already "


@@ -9475,8 +10578,8 @@ msgstr ""
 "Speicher nachdem alles erledigt ist. Wenn eine große Anzahl Pakete entfernt "
 "wird, dann kann der Wert den Betrag des freiwerdenden Speichers anzeigen."
 
 "Speicher nachdem alles erledigt ist. Wenn eine große Anzahl Pakete entfernt "
 "wird, dann kann der Wert den Betrag des freiwerdenden Speichers anzeigen."
 

-#. type: <p></p>
-#: guide.sgml:473
+#. type: Content of: <book><chapter><section><section><para>
+#: guide.dbk

 msgid ""
 "Some other reports can be generated by using the -u option to show packages "
 "to upgrade, they are similar to the previous examples."
 msgid ""
 "Some other reports can be generated by using the -u option to show packages "
 "to upgrade, they are similar to the previous examples."


@@ -9485,13 +10588,13 @@ msgstr ""
 "werden, um Pakete anzuzeigen, von denen ein Upgrade durchgeführt werden "
 "soll. Dies ist den vorherigen Beispielen ähnlich."
 
 "werden, um Pakete anzuzeigen, von denen ein Upgrade durchgeführt werden "
 "soll. Dies ist den vorherigen Beispielen ähnlich."
 

-#. type: <heading></heading>
-#: guide.sgml:477
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk

 msgid "The Status Display"
 msgstr "Der Anzeigestatus"
 
 msgid "The Status Display"
 msgstr "Der Anzeigestatus"
 

-#. type: <p></p>
-#: guide.sgml:481
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk

 msgid ""
 "During the download of archives and package files APT prints out a series of "
 "status messages."
 msgid ""
 "During the download of archives and package files APT prints out a series of "
 "status messages."


@@ -9499,8 +10602,8 @@ msgstr ""
 "Während des Herunterladens von Archiven und Paketdateien gibt APT eine Reihe "
 "von Statusmeldungen aus."
 
 "Während des Herunterladens von Archiven und Paketdateien gibt APT eine Reihe "
 "von Statusmeldungen aus."
 

-#. type: <example></example>
-#: guide.sgml:490
+#. type: Content of: <book><chapter><section><screen>
+#: guide.dbk

 #, no-wrap
 msgid ""
 "# apt-get update\n"
 #, no-wrap
 msgid ""
 "# apt-get update\n"


@@ -9509,7 +10612,7 @@ msgid ""
 "Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
 "Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"

-"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s\n"

 msgstr ""
 "# apt-get update\n"
 "Hole:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"
 msgstr ""
 "# apt-get update\n"
 "Hole:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"


@@ -9517,69 +10620,71 @@ msgstr ""
 "Treffer http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Hole:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Hole:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
 "Treffer http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
 "Hole:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
 "Hole:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"

-"11% [5 testing/non-free 'Warte auf Datei' 0/32.1k 0%] 2203b/s 1m52s"
+"11% [5 testing/non-free 'Warte auf Datei' 0/32.1k 0%] 2203b/s 1m52s\n"

 
 

-#. type: <p></p>
-#: guide.sgml:500
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk

 msgid ""
 msgid ""

-"The lines starting with <em>Get</em> are printed out when APT begins to "
-"fetch a file while the last line indicates the progress of the download. The "
-"first percent value on the progress line indicates the total percent done of "
-"all files. Unfortunately since the size of the Package files is unknown "
-"<tt>apt-get update</tt> estimates the percent done which causes some "
-"inaccuracies."
+"The lines starting with <emphasis>Get</emphasis> are printed out when APT "
+"begins to fetch a file while the last line indicates the progress of the "
+"download. The first percent value on the progress line indicates the total "
+"percent done of all files. Unfortunately since the size of the Package files "
+"is unknown <literal>apt-get update</literal> estimates the percent done "
+"which causes some inaccuracies."

 msgstr ""
 msgstr ""

-"Die Zeilen, die mit <em>Hole</em> beginnen, werden ausgegeben, wenn APT "
-"anfängt, eine Datei herunterzuladen, während die letzte Zeile den "
+"Die Zeilen, die mit <emphasis>Hole</emphasis> beginnen, werden ausgegeben, "
+"wenn APT anfängt, eine Datei herunterzuladen, während die letzte Zeile den "

 "Fortschritt des Herunterladens anzeigt. Die erste Prozentzahl der "
 "Fortschrittszeile zeigt die gesamt erledigte Prozentzahl aller Dateien an. "
 "Fortschritt des Herunterladens anzeigt. Die erste Prozentzahl der "
 "Fortschrittszeile zeigt die gesamt erledigte Prozentzahl aller Dateien an. "

-"Unglücklicherweise schätzt <tt>apt-get update</tt> die erledigte "
+"Unglücklicherweise schätzt <literal>apt-get update</literal> die erledigte "

 "Prozentzahl, da die Größe der Pakete unbekannt ist, was einige "
 "Ungenauigkeiten bewirkt."
 
 "Prozentzahl, da die Größe der Pakete unbekannt ist, was einige "
 "Ungenauigkeiten bewirkt."
 

-#. type: <p></p>
-#: guide.sgml:509
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk

 msgid ""
 "The next section of the status line is repeated once for each download "
 "thread and indicates the operation being performed and some useful "
 "information about what is happening. Sometimes this section will simply read "
 msgid ""
 "The next section of the status line is repeated once for each download "
 "thread and indicates the operation being performed and some useful "
 "information about what is happening. Sometimes this section will simply read "

-"<em>Forking</em> which means the OS is loading the download module. The "
-"first word after the [ is the fetch number as shown on the history lines. "
-"The next word is the short form name of the object being downloaded. For "
-"archives it will contain the name of the package that is being fetched."
+"<emphasis>Forking</emphasis> which means the OS is loading the download "
+"module. The first word after the [ is the fetch number as shown on the "
+"history lines. The next word is the short form name of the object being "
+"downloaded. For archives it will contain the name of the package that is "
+"being fetched."

 msgstr ""
 "Der nächste Abschnitt der Statuszeile wird für jeden Download-Thread "
 "wiederholt und zeigt die durchgeführte Operation, sowie einige nützliche "
 "Informationen darüber an was geschieht. Manchmal wird dieser Abschnitt "
 msgstr ""
 "Der nächste Abschnitt der Statuszeile wird für jeden Download-Thread "
 "wiederholt und zeigt die durchgeführte Operation, sowie einige nützliche "
 "Informationen darüber an was geschieht. Manchmal wird dieser Abschnitt "

-"einfach nur <em>Forking</em> darstellen, was bedeutet, dass das "
+"einfach nur <emphasis>Forking</emphasis> darstellen, was bedeutet, dass das "

 "Betriebssystem das Download-Modul am Laden ist. Das erste Wort nach dem »[« "
 "ist die Ladenummer, wie sie auf den Verlaufszeilen angezeigt wird. Das "
 "nächste Wort ist Name in Kurzform des Ojektes, das heruntergeladen wird. Für "
 "Archive wird es den Namen des Paketes enthalten, das heruntergeladen wird."
 
 "Betriebssystem das Download-Modul am Laden ist. Das erste Wort nach dem »[« "
 "ist die Ladenummer, wie sie auf den Verlaufszeilen angezeigt wird. Das "
 "nächste Wort ist Name in Kurzform des Ojektes, das heruntergeladen wird. Für "
 "Archive wird es den Namen des Paketes enthalten, das heruntergeladen wird."
 

-#. type: <p></p>
-#: guide.sgml:524
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk

 msgid ""
 "Inside of the single quote is an informative string indicating the progress "
 "of the negotiation phase of the download. Typically it progresses from "
 msgid ""
 "Inside of the single quote is an informative string indicating the progress "
 "of the negotiation phase of the download. Typically it progresses from "

-"<em>Connecting</em> to <em>Waiting for file</em> to <em>Downloading</em> or "
-"<em>Resuming</em>. The final value is the number of bytes downloaded from "
-"the remote site. Once the download begins this is represented as "
-"<tt>102/10.2k</tt> indicating that 102 bytes have been fetched and 10.2 "
-"kilobytes is expected. The total size is always shown in 4 figure notation "
-"to preserve space. After the size display is a percent meter for the file "
-"itself. The second last element is the instantaneous average speed. This "
-"values is updated every 5 seconds and reflects the rate of data transfer for "
-"that period. Finally is shown the estimated transfer time. This is updated "
-"regularly and reflects the time to complete everything at the shown transfer "
-"rate."
+"<emphasis>Connecting</emphasis> to <emphasis>Waiting for file</emphasis> to "
+"<emphasis>Downloading</emphasis> or <emphasis>Resuming</emphasis>. The final "
+"value is the number of bytes downloaded from the remote site. Once the "
+"download begins this is represented as <literal>102/10.2k</literal> "
+"indicating that 102 bytes have been fetched and 10.2 kilobytes is expected. "
+"The total size is always shown in 4 figure notation to preserve space. After "
+"the size display is a percent meter for the file itself. The second last "
+"element is the instantaneous average speed. This values is updated every 5 "
+"seconds and reflects the rate of data transfer for that period. Finally is "
+"shown the estimated transfer time. This is updated regularly and reflects "
+"the time to complete everything at the shown transfer rate."

 msgstr ""
 "Innerhalb von einzelnen Anführungszeichen folgt eine informative "
 "Zeichenkette, die den Fortschritt der Übertragungsphase des Downloads "
 msgstr ""
 "Innerhalb von einzelnen Anführungszeichen folgt eine informative "
 "Zeichenkette, die den Fortschritt der Übertragungsphase des Downloads "

-"anzeigt. Normalerweise schreitet sie fort von <em>Verbinde</em> zu <em>Warte "
-"auf Datei</em> zu <em>Lade herunter</em> oder <em>Nehme wieder auf</em>. Der "
-"letzte Wert ist die Anzahl der von der fernen Site heruntergeladenen Bytes. "
-"Sobald der Download beginnt, zeigt sich dies wie <tt>102/10.2k</tt> was "
+"anzeigt. Normalerweise schreitet sie fort von <emphasis>Verbinde</emphasis> "
+"zu <emphasis>Warte auf Datei</emphasis> zu <emphasis>Lade herunter</"
+"emphasis> oder <emphasis>Nehme wieder auf</emphasis>. Der letzte Wert ist "
+"die Anzahl der von der fernen Site heruntergeladenen Bytes. Sobald der "
+"Download beginnt, zeigt sich dies wie <literal>102/10.2k</literal> was "

 "anzeigt, dass 102 Bytes heruntergeladen und 10,2 Kilobytes erwartet werden. "
 "Die Gesamtgröße wird immer in vierstelliger Schreibweise dargestellt, um "
 "Platz zu sparen. Nach der Größenanzeige ist eine Prozentangabe für die Datei "
 "anzeigt, dass 102 Bytes heruntergeladen und 10,2 Kilobytes erwartet werden. "
 "Die Gesamtgröße wird immer in vierstelliger Schreibweise dargestellt, um "
 "Platz zu sparen. Nach der Größenanzeige ist eine Prozentangabe für die Datei "


@@ -9590,57 +10695,52 @@ msgstr ""
 "wird regelmäßig aktualisiert und spiegelt die Zeit zum Vervollständigen bei "
 "der angezeigten Datenübertragungsgeschwindigkeit wider."
 
 "wird regelmäßig aktualisiert und spiegelt die Zeit zum Vervollständigen bei "
 "der angezeigten Datenübertragungsgeschwindigkeit wider."
 

-#. type: <p></p>
-#: guide.sgml:530
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk

 msgid ""
 "The status display updates every half second to provide a constant feedback "
 "on the download progress while the Get lines scroll back whenever a new file "
 "is started. Since the status display is constantly updated it is unsuitable "
 msgid ""
 "The status display updates every half second to provide a constant feedback "
 "on the download progress while the Get lines scroll back whenever a new file "
 "is started. Since the status display is constantly updated it is unsuitable "

-"for logging to a file, use the <tt>-q</tt> option to remove the status "
-"display."
+"for logging to a file, use the <literal>-q</literal> option to remove the "
+"status display."

 msgstr ""
 "Die Statusanzeige aktualisiert sich alle halbe Sekunde, um eine gleichmäßige "
 "Rückmeldung über den Download-Fortschritt bereitzustellen, während die "
 "»Hole«-Zeilen bei jeder gestarteten neuen Datei zurückscrollen. Da die "
 "Statusanzeige ständig aktualisiert wird, ist sie für die Protokollierung in "
 msgstr ""
 "Die Statusanzeige aktualisiert sich alle halbe Sekunde, um eine gleichmäßige "
 "Rückmeldung über den Download-Fortschritt bereitzustellen, während die "
 "»Hole«-Zeilen bei jeder gestarteten neuen Datei zurückscrollen. Da die "
 "Statusanzeige ständig aktualisiert wird, ist sie für die Protokollierung in "

-"eine Datei ungeeignet. Benutzen Sie die Option <tt>-q</tt>, um die "
+"eine Datei ungeeignet. Benutzen Sie die Option <literal>-q</literal>, um die "

 "Statusanzeige zu entfernen."
 
 "Statusanzeige zu entfernen."
 

-#. type: <heading></heading>
-#: guide.sgml:535
+#. type: Content of: <book><chapter><section><title>
+#: guide.dbk

 msgid "Dpkg"
 msgstr "Dpkg"
 
 msgid "Dpkg"
 msgstr "Dpkg"
 

-#. type: <p></p>
-#: guide.sgml:542
-msgid ""
-"APT uses <prgn>dpkg</prgn> for installing the archives and will switch over "
-"to the <prgn>dpkg</prgn> interface once downloading is completed. "
-"<prgn>dpkg</prgn> will also ask a number of questions as it processes the "
-"packages and the packages themselves may also ask several questions. Before "
-"each question there is usually a description of what it is asking and the "
-"questions are too varied to discuss completely here."
-msgstr ""
-"APT benutzt <prgn>dpkg</prgn>, um die Archive zu installieren und wird zu "
-"der <prgn>dpkg</prgn>-Schnittstelle herüberschalten, sobald der Download "
-"vollständig ist. <prgn>dpkg</prgn> wird außerdem eine Reihe von Fragen "
-"stellen, während es die Pakete abarbeitet und die Pakete können auch mehrere "
-"Fragen stellen . Vor jeder Frage ist üblicherweise eine Beschreibung des "
-"Gefragten und die Fragen sind zu vielfältig, um sie vollständig hier zu "
-"besprechen."
-
-#. type: <title></title>
-#: offline.sgml:4
+#. type: Content of: <book><chapter><section><para>
+#: guide.dbk
+msgid ""
+"APT uses <command>dpkg</command> for installing the archives and will switch "
+"over to the <command>dpkg</command> interface once downloading is completed. "
+"<command>dpkg</command> will also ask a number of questions as it processes "
+"the packages and the packages themselves may also ask several questions. "
+"Before each question there is usually a description of what it is asking and "
+"the questions are too varied to discuss completely here."
+msgstr ""
+"APT benutzt <command>dpkg</command>, um die Archive zu installieren und wird "
+"zu der <command>dpkg</command>-Schnittstelle herüberschalten, sobald der "
+"Download vollständig ist. <command>dpkg</command> wird außerdem eine Reihe "
+"von Fragen stellen, während es die Pakete abarbeitet und die Pakete können "
+"auch mehrere Fragen stellen . Vor jeder Frage ist üblicherweise eine "
+"Beschreibung des Gefragten und die Fragen sind zu vielfältig, um sie "
+"vollständig hier zu besprechen."
+
+#. type: Content of: <book><title>
+#: offline.dbk

 msgid "Using APT Offline"
 msgstr "APT offline verwenden"
 
 msgid "Using APT Offline"
 msgstr "APT offline verwenden"
 

-#. type: <version></version>
-#: offline.sgml:7
-msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-msgstr "$Id: offline.sgml,v 1.8 12.02.2003 15:06:41 doogie Exp $"
-
-#. type: <abstract></abstract>
-#: offline.sgml:12
+#. type: Content of: <book><bookinfo><abstract><para>
+#: offline.dbk

 msgid ""
 "This document describes how to use APT in a non-networked environment, "
 "specifically a 'sneaker-net' approach for performing upgrades."
 msgid ""
 "This document describes how to use APT in a non-networked environment, "
 "specifically a 'sneaker-net' approach for performing upgrades."


@@ -9649,23 +10749,25 @@ msgstr ""
 "speziell einem »Turnschuhnetzwerk«, an die Durchführung von Upgrades "
 "herangeht."
 
 "speziell einem »Turnschuhnetzwerk«, an die Durchführung von Upgrades "
 "herangeht."
 

-#. type: <copyrightsummary></copyrightsummary>
-#: offline.sgml:16
-msgid "Copyright &copy; Jason Gunthorpe, 1999."
-msgstr "Copyright &copy; Jason Gunthorpe, 1999."
+#. type: Content of: <book><bookinfo>
+#: offline.dbk
+msgid ""
+"<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
+msgstr ""
+"<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"

 
 

-#. type: <heading></heading>
-#: offline.sgml:32
+#. type: Content of: <book><chapter><title>
+#: offline.dbk

 msgid "Introduction"
 msgstr "Einleitung"
 
 msgid "Introduction"
 msgstr "Einleitung"
 

-#. type: <heading></heading>
-#: offline.sgml:34 offline.sgml:65 offline.sgml:180
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk

 msgid "Overview"
 msgstr "Übersicht"
 
 msgid "Overview"
 msgstr "Übersicht"
 

-#. type: <p></p>
-#: offline.sgml:40
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk

 msgid ""
 "Normally APT requires direct access to a Debian archive, either from a local "
 "media or through a network. Another common complaint is that a Debian "
 msgid ""
 "Normally APT requires direct access to a Debian archive, either from a local "
 "media or through a network. Another common complaint is that a Debian "


@@ -9678,8 +10780,8 @@ msgstr ""
 "wie einem Modem, hängt und eine andere Maschine eine sehr schnelle "
 "Verbindung hat, sie jedoch physisch fern sind."
 
 "wie einem Modem, hängt und eine andere Maschine eine sehr schnelle "
 "Verbindung hat, sie jedoch physisch fern sind."
 

-#. type: <p></p>
-#: offline.sgml:51
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk

 msgid ""
 "The solution to this is to use large removable media such as a Zip disc or a "
 "SuperDisk disc. These discs are not large enough to store the entire Debian "
 msgid ""
 "The solution to this is to use large removable media such as a Zip disc or a "
 "SuperDisk disc. These discs are not large enough to store the entire Debian "


@@ -9687,9 +10789,9 @@ msgid ""
 "to use APT to generate a list of packages that are required and then fetch "
 "them onto the disc using another machine with good connectivity. It is even "
 "possible to use another Debian machine with APT or to use a completely "
 "to use APT to generate a list of packages that are required and then fetch "
 "them onto the disc using another machine with good connectivity. It is even "
 "possible to use another Debian machine with APT or to use a completely "

-"different OS and a download tool like wget. Let <em>remote host</em> mean "
-"the machine downloading the packages, and <em>target host</em> the one with "
-"bad or no connection."
+"different OS and a download tool like wget. Let <emphasis>remote host</"
+"emphasis> mean the machine downloading the packages, and <emphasis>target "
+"host</emphasis> the one with bad or no connection."

 msgstr ""
 "Die Lösung dazu besteht darin, große Wechselmedien, wie eine Zip-Platte oder "
 "eine SuperDisk zu benutzen. Diese Platten sind nicht groß genug, um ein "
 msgstr ""
 "Die Lösung dazu besteht darin, große Wechselmedien, wie eine Zip-Platte oder "
 "eine SuperDisk zu benutzen. Diese Platten sind nicht groß genug, um ein "


@@ -9700,16 +10802,22 @@ msgstr ""
 "herunterzuladen. Es ist sogar möglich, eine andere Debian-Maschine mit APT "
 "oder ein komplett unterschiedliches Betriebssystem und ein Download-Werkzeug "
 "wie Wget zu benutzen. Nennen wir die Maschine, die die Pakete herunterlädt "
 "herunterzuladen. Es ist sogar möglich, eine andere Debian-Maschine mit APT "
 "oder ein komplett unterschiedliches Betriebssystem und ein Download-Werkzeug "
 "wie Wget zu benutzen. Nennen wir die Maschine, die die Pakete herunterlädt "

-"<em>ferner Rechner</em> und die mit der schlechten oder fehlenden Verbindung "
-"<em>Zielrechner</em>."
+"<emphasis>ferner Rechner</emphasis> und die mit der schlechten oder "
+"fehlenden Verbindung <emphasis>Zielrechner</emphasis>."

 
 

-#. type: <p></p>
-#: offline.sgml:57
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk
+#, fuzzy
+#| msgid ""
+#| "This is achieved by creatively manipulating the APT configuration file. "
+#| "The 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."

 msgid ""
 "This is achieved by creatively manipulating the APT configuration file. The "
 "essential premise to tell APT to look on a disc for it's archive files. Note "
 msgid ""
 "This is achieved by creatively manipulating the APT configuration file. The "
 "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."
+"that the disc should be formatted with a filesystem that can handle long "
+"file names such as ext2, fat32 or vfat."

 msgstr ""
 "Dies wird durch kreatives Manipulieren der APT-Konfigurationsdatei erreicht. "
 "Die wesentliche Voraussetzung besteht darin, APT mitzuteilen, dass es für "
 msgstr ""
 "Dies wird durch kreatives Manipulieren der APT-Konfigurationsdatei erreicht. "
 "Die wesentliche Voraussetzung besteht darin, APT mitzuteilen, dass es für "


@@ -9717,13 +10825,13 @@ msgstr ""
 "Platte mit einem Dateisystem formatiert sein sollte, das mit langen "
 "Dateinamen umgehen kann, so wie ext2, fat32 oder vfat."
 
 "Platte mit einem Dateisystem formatiert sein sollte, das mit langen "
 "Dateinamen umgehen kann, so wie ext2, fat32 oder vfat."
 

-#. type: <heading></heading>
-#: offline.sgml:63
+#. type: Content of: <book><chapter><title>
+#: offline.dbk

 msgid "Using APT on both machines"
 msgstr "APT auf beiden Maschinen benutzen"
 
 msgid "Using APT on both machines"
 msgstr "APT auf beiden Maschinen benutzen"
 

-#. type: <p><example>
-#: offline.sgml:71
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk

 msgid ""
 "APT being available on both machines gives the simplest configuration. The "
 "basic idea is to place a copy of the status file on the disc and use the "
 msgid ""
 "APT being available on both machines gives the simplest configuration. The "
 "basic idea is to place a copy of the status file on the disc and use the "


@@ -9736,8 +10844,8 @@ msgstr ""
 "Paketdateien herunterzuladen und zu entscheiden, welche Pakete "
 "heruntergeladen werden. Die Plattenverzeichnisstruktur sollte so aussehen:"
 
 "Paketdateien herunterzuladen und zu entscheiden, welche Pakete "
 "heruntergeladen werden. Die Plattenverzeichnisstruktur sollte so aussehen:"
 

-#. type: <example></example>
-#: offline.sgml:80
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk

 #, no-wrap
 msgid ""
 "  /disc/\n"
 #, no-wrap
 msgid ""
 "  /disc/\n"


@@ -9747,7 +10855,7 @@ msgid ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
 "       partial/\n"
 "    status\n"
 "    sources.list\n"

-"    apt.conf"
+"    apt.conf\n"

 msgstr ""
 "  /Platte/\n"
 "    Archive/\n"
 msgstr ""
 "  /Platte/\n"
 "    Archive/\n"


@@ -9756,42 +10864,43 @@ msgstr ""
 "       partial/\n"
 "    status\n"
 "    sources.list\n"
 "       partial/\n"
 "    status\n"
 "    sources.list\n"

-"    apt.conf"
+"    apt.conf\n"

 
 

-#. type: <heading></heading>
-#: offline.sgml:88
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk

 msgid "The configuration file"
 msgstr "Die Konfigurationsdatei"
 
 msgid "The configuration file"
 msgstr "Die Konfigurationsdatei"
 

-#. type: <p></p>
-#: offline.sgml:96
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk

 msgid ""
 "The configuration file should tell APT to store its files on the disc and to "
 "use the configuration files on the disc as well. The sources.list should "
 "contain the proper sites that you wish to use from the remote machine, and "
 msgid ""
 "The configuration file should tell APT to store its files on the disc and to "
 "use the configuration files on the disc as well. The sources.list should "
 "contain the proper sites that you wish to use from the remote machine, and "

-"the status file should be a copy of <em>/var/lib/dpkg/status</em> from the "
-"<em>target host</em>. Please note, if you are using a local archive you must "
-"use copy URIs, the syntax is identical to file URIs."
+"the status file should be a copy of <emphasis>/var/lib/dpkg/status</"
+"emphasis> from the <emphasis>target host</emphasis>. Please note, if you are "
+"using a local archive you must use copy URIs, the syntax is identical to "
+"file URIs."

 msgstr ""
 "Die Konfigurationsdatei sollte APT mitteilen, dass es seine Dateien auf der "
 "Platte speichert und obendrein die Konfigurationsdateien auf der Platte "
 "benutzt. Die »sources.list« sollte genau die Sites enthalten, die Sie auf "
 "der fernen Maschine benutzen möchten und die Statusdatei sollte eine Kopie "
 msgstr ""
 "Die Konfigurationsdatei sollte APT mitteilen, dass es seine Dateien auf der "
 "Platte speichert und obendrein die Konfigurationsdateien auf der Platte "
 "benutzt. Die »sources.list« sollte genau die Sites enthalten, die Sie auf "
 "der fernen Maschine benutzen möchten und die Statusdatei sollte eine Kopie "

-"von <em>/var/lib/dpkg/status</em> vom <em>Zielrechner</em> sein. Bitte "
-"beachten Sie, falls Sie lokale Archive benutzen, dass Sie »copy«-URIs "
-"benutzen müssen. Die Syntax entspricht der von »file«-URIs."
+"von <emphasis>/var/lib/dpkg/status</emphasis> vom <emphasis>Zielrechner</"
+"emphasis> sein. Bitte beachten Sie, falls Sie lokale Archive benutzen, dass "
+"Sie »copy«-URIs benutzen müssen. Die Syntax entspricht der von »file«-URIs."

 
 

-#. type: <p><example>
-#: offline.sgml:100
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk

 msgid ""
 msgid ""

-"<em>apt.conf</em> must contain the necessary information to make APT use the "
-"disc:"
+"<emphasis>apt.conf</emphasis> must contain the necessary information to make "
+"APT use the disc:"

 msgstr ""
 msgstr ""

-"<em>apt.conf</em> muss die nötigen Informationen enthalten, damit APT die "
-"Platte benutzt:"
+"<emphasis>apt.conf</emphasis> muss die nötigen Informationen enthalten, "
+"damit APT die Platte benutzt:"

 
 

-#. type: <example></example>
-#: offline.sgml:124
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk

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


@@ -9799,10 +10908,10 @@ msgid ""
 "   /* This is not necessary if the two machines are the same arch, it tells\n"
 "      the remote APT what architecture the target machine is */\n"
 "   Architecture \"i386\";\n"
 "   /* This is not necessary if the two machines are the same arch, it tells\n"
 "      the remote APT what architecture the target machine is */\n"
 "   Architecture \"i386\";\n"

-"   \n"
+"\n"

 "   Get::Download-Only \"true\";\n"
 " };\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"

-" \n"
+"\n"

 " Dir\n"
 " {\n"
 "   /* Use the disc for state information and redirect the status file from\n"
 " Dir\n"
 " {\n"
 "   /* Use the disc for state information and redirect the status file from\n"


@@ -9813,10 +10922,10 @@ msgid ""
 "   // Binary caches will be stored locally\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
 "   // Binary caches will be stored locally\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"

-"   \n"
+"\n"

 "   // Location of the source list.\n"
 "   Etc \"/disc/\";\n"
 "   // Location of the source list.\n"
 "   Etc \"/disc/\";\n"

-" };"
+" };\n"

 msgstr ""
 " APT\n"
 " {\n"
 msgstr ""
 " APT\n"
 " {\n"


@@ -9824,10 +10933,10 @@ msgstr ""
 "      Architektur haben. Es teilt dem fernen APT mit, welche Architektur die\n"
 "      Zielmaschine hat */\n"
 "   Architecture \"i386\";\n"
 "      Architektur haben. Es teilt dem fernen APT mit, welche Architektur die\n"
 "      Zielmaschine hat */\n"
 "   Architecture \"i386\";\n"

-"   \n"
+"\n"

 "   Get::Download-Only \"true\";\n"
 " };\n"
 "   Get::Download-Only \"true\";\n"
 " };\n"

-" \n"
+"\n"

 " Dir\n"
 " {\n"
 "   /* Die Platte für Statusinformationen benutzen und die Statusdatei\n"
 " Dir\n"
 " {\n"
 "   /* Die Platte für Statusinformationen benutzen und die Statusdatei\n"


@@ -9838,68 +10947,72 @@ msgstr ""
 "   // Programmzwischenspeicher werden lokal gespeichert\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"
 "   // Programmzwischenspeicher werden lokal gespeichert\n"
 "   Cache::archives \"/disc/archives/\";\n"
 "   Cache \"/tmp/\";\n"

-"   \n"
+"\n"

 "   // Ort der Quellenliste.\n"
 "   Etc \"/disc/\";\n"
 "   // Ort der Quellenliste.\n"
 "   Etc \"/disc/\";\n"

-" };"
+" };\n"

 
 

-#. type: </example></p>
-#: offline.sgml:129
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk

 msgid ""
 "More details can be seen by examining the apt.conf man page and the sample "
 msgid ""
 "More details can be seen by examining the apt.conf man page and the sample "

-"configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>."
+"configuration file in <emphasis>/usr/share/doc/apt/examples/apt.conf</"
+"emphasis>."

 msgstr ""
 "Weitere Details finden sich in der apt.conf-Handbuchseite und der "
 msgstr ""
 "Weitere Details finden sich in der apt.conf-Handbuchseite und der "

-"Musterkonfigurationsdatei in <em>/usr/share/doc/apt/examples/apt.conf</em>."
+"Musterkonfigurationsdatei in <emphasis>/usr/share/doc/apt/examples/apt.conf</"
+"emphasis>."

 
 

-#. type: <p><example>
-#: offline.sgml:136
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk

 msgid ""
 msgid ""

-"On the target machine the first thing to do is mount the disc and copy <em>/"
-"var/lib/dpkg/status</em> to it. You will also need to create the directories "
-"outlined in the Overview, <em>archives/partial/</em> and <em>lists/partial/</"
-"em>. Then take the disc to the remote machine and configure the sources."
-"list. On the remote machine execute the following:"
+"On the target machine the first thing to do is mount the disc and copy "
+"<emphasis>/var/lib/dpkg/status</emphasis> to it. You will also need to "
+"create the directories outlined in the Overview, <emphasis>archives/partial/"
+"</emphasis> and <emphasis>lists/partial/</emphasis>. Then take the disc to "
+"the remote machine and configure the sources.list. On the remote machine "
+"execute the following:"

 msgstr ""
 "Das Erste, was auf der Zielmaschine getan werden muss, ist das Einhängen der "
 msgstr ""
 "Das Erste, was auf der Zielmaschine getan werden muss, ist das Einhängen der "

-"Platte und das Kopieren von <em>/var/lib/dpkg/status</em> dorthin. Sie "
-"werden außerdem die in der Übersicht umrissenen Verzeichnisse <em>archives/"
-"partial/</em> und <em>lists/partial/</em> erstellen müssen. Dann bringen Sie "
-"die Platte zu der fernen Maschine und konfigurieren Sie die »sources.list«. "
-"Führen Sie das folgende aus:"
-
-#. type: <example></example>
-#: offline.sgml:142
+"Platte und das Kopieren von <emphasis>/var/lib/dpkg/status</emphasis> "
+"dorthin. Sie werden außerdem die in der Übersicht umrissenen Verzeichnisse "
+"<emphasis>archives/partial/</emphasis> und <emphasis>lists/partial/</"
+"emphasis> erstellen müssen. Dann bringen Sie die Platte zu der fernen "
+"Maschine und konfigurieren Sie die »sources.list«. Führen Sie das folgende "
+"aus:"
+
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk

 #, no-wrap
 msgid ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT fetches the package files ]\n"
 " # apt-get dist-upgrade\n"
 #, no-wrap
 msgid ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT fetches the package files ]\n"
 " # apt-get dist-upgrade\n"

-" [ APT fetches all the packages needed to upgrade the target machine ]"
+" [ APT fetches all the packages needed to upgrade the target machine ]\n"

 msgstr ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT lädt die Paketdateien herunter ]\n"
 " # apt-get dist-upgrade\n"
 " [ APT lädt all die Pakete herunter, die die Zielmaschine benötigt, um ein\n"
 msgstr ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
 " # apt-get update\n"
 " [ APT lädt die Paketdateien herunter ]\n"
 " # apt-get dist-upgrade\n"
 " [ APT lädt all die Pakete herunter, die die Zielmaschine benötigt, um ein\n"

-"   Upgrade durchzuführen ]"
+"   Upgrade durchzuführen ]\n"

 
 

-#. type: </example></p>
-#: offline.sgml:149
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk

 msgid ""
 "The dist-upgrade command can be replaced with any other standard APT "
 "commands, particularly dselect-upgrade. You can even use an APT front end "
 msgid ""
 "The dist-upgrade command can be replaced with any other standard APT "
 "commands, particularly dselect-upgrade. You can even use an APT front end "

-"such as <em>dselect</em>. However this presents a problem in communicating "
-"your selections back to the local computer."
+"such as <emphasis>dselect</emphasis>. However this presents a problem in "
+"communicating your selections back to the local computer."

 msgstr ""
 "Der Befehl »dist-upgrade« kann durch alle anderen Standard-APT-Befehle "
 "ersetzt werden, insbesondere »dselect-upgrade«. Sie können sogar eine APT-"
 msgstr ""
 "Der Befehl »dist-upgrade« kann durch alle anderen Standard-APT-Befehle "
 "ersetzt werden, insbesondere »dselect-upgrade«. Sie können sogar eine APT-"

-"Oberfläche, wie <em>dselect</em>, benutzen. Jedoch stellt dies ein Problem "
-"dar, Ihre Auswahl zurück an den lokalen Rechner zu kommunizieren."
+"Oberfläche, wie <emphasis>dselect</emphasis>, benutzen. Jedoch stellt dies "
+"ein Problem dar, Ihre Auswahl zurück an den lokalen Rechner zu kommunizieren."

 
 

-#. type: <p><example>
-#: offline.sgml:153
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk

 msgid ""
 "Now the disc contains all of the index files and archives needed to upgrade "
 "the target machine. Take the disc back and run:"
 msgid ""
 "Now the disc contains all of the index files and archives needed to upgrade "
 "the target machine. Take the disc back and run:"


@@ -9908,24 +11021,24 @@ msgstr ""
 "Upgrade der Zielmaschine druchzuführen. Bringen Sie die Platte zurück und "
 "starten Sie:"
 
 "Upgrade der Zielmaschine druchzuführen. Bringen Sie die Platte zurück und "
 "starten Sie:"
 

-#. type: <example></example>
-#: offline.sgml:159
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk

 #, no-wrap
 msgid ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT generates a local copy of the cache files ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
 #, no-wrap
 msgid ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT generates a local copy of the cache files ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"

-"  [ Or any other APT command ]"
+"  [ Or any other APT command ]\n"

 msgstr ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT generiert eine lokale Kopie der Zwischenspeicherdateien ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
 msgstr ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
 "  # apt-get check\n"
 "  [ APT generiert eine lokale Kopie der Zwischenspeicherdateien ]\n"
 "  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"

-"  [ Oder irgendeinen anderen APT-Befehl ]"
+"  [ Oder irgendeinen anderen APT-Befehl ]\n"

 
 

-#. type: <p></p>
-#: offline.sgml:165
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk

 msgid ""
 "It is necessary for proper function to re-specify the status file to be the "
 "local one. This is very important!"
 msgid ""
 "It is necessary for proper function to re-specify the status file to be the "
 "local one. This is very important!"


@@ -9933,8 +11046,8 @@ msgstr ""
 "Es ist für ordentliches Funktionieren notwendig, die Statusdatei erneut als "
 "die lokale anzugeben. Dies ist sehr wichtig!"
 
 "Es ist für ordentliches Funktionieren notwendig, die Statusdatei erneut als "
 "die lokale anzugeben. Dies ist sehr wichtig!"
 

-#. type: <p></p>
-#: offline.sgml:172
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk

 msgid ""
 "If you are using dselect you can do the very risky operation of copying disc/"
 "status to /var/lib/dpkg/status so that any selections you made on the remote "
 msgid ""
 "If you are using dselect you can do the very risky operation of copying disc/"
 "status to /var/lib/dpkg/status so that any selections you made on the remote "


@@ -9950,24 +11063,25 @@ msgstr ""
 "die Statusdatei NICHT, falls Dpkg oder APT in der Zwischenzeit benutzt "
 "wurden!"
 
 "die Statusdatei NICHT, falls Dpkg oder APT in der Zwischenzeit benutzt "
 "wurden!"
 

-#. type: <heading></heading>
-#: offline.sgml:178
+#. type: Content of: <book><chapter><title>
+#: offline.dbk

 msgid "Using APT and wget"
 msgstr "APT und Wget benutzen"
 
 msgid "Using APT and wget"
 msgstr "APT und Wget benutzen"
 

-#. type: <p></p>
-#: offline.sgml:185
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk

 msgid ""
 msgid ""

-"<em>wget</em> is a popular and portable download tool that can run on nearly "
-"any machine. Unlike the method above this requires that the Debian machine "
-"already has a list of available packages."
+"<emphasis>wget</emphasis> is a popular and portable download tool that can "
+"run on nearly any machine. Unlike the method above this requires that the "
+"Debian machine already has a list of available packages."

 msgstr ""
 msgstr ""

-"<em>wget</em> ist eine populäres und portierbares Download-Werkzeug, das auf "
-"nahezu jeder Maschine laufen kann. Anders als die Methode oben wird hierfür "
-"benötigt, dass die Debian-Maschine bereits eine Liste verfügbarer Pakete hat."
+"<emphasis>wget</emphasis> ist eine populäres und portierbares Download-"
+"Werkzeug, das auf nahezu jeder Maschine laufen kann. Anders als die Methode "
+"oben wird hierfür benötigt, dass die Debian-Maschine bereits eine Liste "
+"verfügbarer Pakete hat."

 
 

-#. type: <p></p>
-#: offline.sgml:190
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk

 msgid ""
 "The basic idea is to create a disc that has only the archive files "
 "downloaded from the remote site. This is done by using the --print-uris "
 msgid ""
 "The basic idea is to create a disc that has only the archive files "
 "downloaded from the remote site. This is done by using the --print-uris "


@@ -9980,13 +11094,13 @@ msgstr ""
 "Vorbereiten eines Wget-Skripts getan, um die eigentlichen Pakete "
 "herunterzuladen."
 
 "Vorbereiten eines Wget-Skripts getan, um die eigentlichen Pakete "
 "herunterzuladen."
 

-#. type: <heading></heading>
-#: offline.sgml:196
+#. type: Content of: <book><chapter><section><title>
+#: offline.dbk

 msgid "Operation"
 msgstr "Betrieb"
 
 msgid "Operation"
 msgstr "Betrieb"
 

-#. type: <p><example>
-#: offline.sgml:200
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk

 msgid ""
 "Unlike the previous technique no special configuration files are required. "
 "We merely use the standard APT commands to generate the file list."
 msgid ""
 "Unlike the previous technique no special configuration files are required. "
 "We merely use the standard APT commands to generate the file list."


@@ -9995,23 +11109,23 @@ msgstr ""
 "Konfigurationsdateien benötigt. Es werden lediglich die Standard-APT-Befehle "
 "benutzt, um die Dateiliste zu erstellen."
 
 "Konfigurationsdateien benötigt. Es werden lediglich die Standard-APT-Befehle "
 "benutzt, um die Dateiliste zu erstellen."
 

-#. type: <example></example>
-#: offline.sgml:205
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk

 #, no-wrap
 msgid ""
 #, no-wrap
 msgid ""

-" # apt-get dist-upgrade \n"
+" # apt-get dist-upgrade\n"

 " [ Press no when prompted, make sure you are happy with the actions ]\n"
 " [ Press no when prompted, make sure you are happy with the actions ]\n"

-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /disc/wget-script\n"

 msgstr ""
 " # apt-get dist-upgrade \n"
 " [ Antworten Sie »nein« auf gestellte Fragen, wenn Sie mit den Aktionen\n"
 "   zufrieden sind ]\n"
 msgstr ""
 " # apt-get dist-upgrade \n"
 " [ Antworten Sie »nein« auf gestellte Fragen, wenn Sie mit den Aktionen\n"
 "   zufrieden sind ]\n"

-" # apt-get -qq --print-uris dist-upgrade > uris\n"
-" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /Platte/wget-script"
+" # apt-get -qq --print-uris dist-upgrade &gt; uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' &lt; uris &gt; /Platte/wget-script\n"

 
 

-#. type: </example></p>
-#: offline.sgml:210
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk

 msgid ""
 "Any command other than dist-upgrade could be used here, including dselect-"
 "upgrade."
 msgid ""
 "Any command other than dist-upgrade could be used here, including dselect-"
 "upgrade."


@@ -10019,8 +11133,8 @@ msgstr ""
 "Jeder andere Befehl als »dist-upgrade« könnte hier benutzt werden, "
 "einschließlich »upgrade«."
 
 "Jeder andere Befehl als »dist-upgrade« könnte hier benutzt werden, "
 "einschließlich »upgrade«."
 

-#. type: <p></p>
-#: offline.sgml:216
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk

 msgid ""
 "The /disc/wget-script file will now contain a list of wget commands to "
 "execute in order to fetch the necessary archives. This script should be run "
 msgid ""
 "The /disc/wget-script file will now contain a list of wget commands to "
 "execute in order to fetch the necessary archives. This script should be run "


@@ -10032,25 +11146,25 @@ msgstr ""
 "sollte mit dem aktuellen Verzeichnis als Platteneinhängepunkt ausgeführt "
 "werden, so dass die Ausgabe auf die Platte gespeichert wird."
 
 "sollte mit dem aktuellen Verzeichnis als Platteneinhängepunkt ausgeführt "
 "werden, so dass die Ausgabe auf die Platte gespeichert wird."
 

-#. type: <p><example>
-#: offline.sgml:219
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk

 msgid "The remote machine would do something like"
 msgstr "Die ferne Maschine würde etwas wie das folgende tun"
 
 msgid "The remote machine would do something like"
 msgstr "Die ferne Maschine würde etwas wie das folgende tun"
 

-#. type: <example></example>
-#: offline.sgml:223
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk

 #, no-wrap
 msgid ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"
 #, no-wrap
 msgid ""
 "  # cd /disc\n"
 "  # sh -x ./wget-script\n"

-"  [ wait.. ]"
+"  [ wait.. ]\n"

 msgstr ""
 "  # cd /Platte\n"
 "  # sh -x ./wget-script\n"
 msgstr ""
 "  # cd /Platte\n"
 "  # sh -x ./wget-script\n"

-"  [ warten … Fertig ]"
+"  [ warten … Fertig ]\n"

 
 

-#. type: </example><example>
-#: offline.sgml:228
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk

 msgid ""
 "Once the archives are downloaded and the disc returned to the Debian machine "
 "installation can proceed using,"
 msgid ""
 "Once the archives are downloaded and the disc returned to the Debian machine "
 "installation can proceed using,"


@@ -10058,97 +11172,315 @@ msgstr ""
 "Sobald die Archive heruntergeladen und die Platte zur Debian-Maschine "
 "zurückgekehrt ist, kann die Installation fortfahren durch Benutzung von "
 
 "Sobald die Archive heruntergeladen und die Platte zur Debian-Maschine "
 "zurückgekehrt ist, kann die Installation fortfahren durch Benutzung von "
 

-#. type: <example></example>
-#: offline.sgml:230
+#. type: Content of: <book><chapter><section><screen>
+#: offline.dbk

 #, no-wrap
 #, no-wrap

-msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
-msgstr "  # apt-get -o dir::cache::archives=\"/Platte/\" dist-upgrade"
+msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
+msgstr "  # apt-get -o dir::cache::archives=\"/Platte/\" dist-upgrade\n"

 
 

-#. type: </example></p>
-#: offline.sgml:234
+#. type: Content of: <book><chapter><section><para>
+#: offline.dbk

 msgid "Which will use the already fetched archives on the disc."
 msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen."
 
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen."
 

-#~ msgid "apt"
-#~ msgstr "apt"
+#~ msgid ""
+#~ "This is a space separated list of all the architectures that appear under "
+#~ "search section. The special architecture 'source' is used to indicate "
+#~ "that this tree has a source archive."
+#~ msgstr ""
+#~ "Dies ist eine durch Leerzeichen getrennte Liste aller Architekturen, die "
+#~ "unter dem Suchabschnitt erscheinen. Die spezielle Architektur »source« "
+#~ "wird benutzt, um anzugeben, dass dieser Baum ein Quellarchiv besitzt."
+
+#~ msgid ""
+#~ "<command>apt</command> (Advanced Package Tool) is the command-line tool "
+#~ "for handling packages. It provides a commandline interface for the "
+#~ "package management of the system.  See also &apt-get; and &apt-cache; for "
+#~ "more low-level command options."
+#~ msgstr ""
+#~ "<command>apt</command> (Advanced Package Tool) ist das "
+#~ "Befehlszeilenwerkzeug für den Umgang mit Paketen. Es stellt eine "
+#~ "Befehlszeilenschnittstelle zur Verwaltung von Paketen auf dem System "
+#~ "bereit. Tiefer ansetzende Befehlsoptionen finden sie unter &apt-get; und "
+#~ "&apt-cache;."
+
+#~ msgid ""
+#~ "<literal>search</literal> searches for the given term(s) and display "
+#~ "matching packages."
+#~ msgstr ""
+#~ "<literal>search</literal> sucht nach angegebenen Begriffen und zeigt "
+#~ "passende Pakete an."
+
+#~ msgid ""
+#~ "<literal>show</literal> shows the package information for the given "
+#~ "package(s)."
+#~ msgstr ""
+#~ "<literal>show</literal> zeigt die Paketinformationen für die angegebenen "
+#~ "Pakete."
+
+#~ msgid ""
+#~ "<literal>install</literal> is followed by one or more package names "
+#~ "desired for installation or upgrading."
+#~ msgstr ""
+#~ "<literal>install</literal> wird ergänzt mit einem oder mehreren "
+#~ "Paketnamen, von denen eine Installation oder ein Upgrade gewünscht wird."

 
 

-#~ msgid "16 June 1998"
-#~ msgstr "16. Juni 1998"
+#~ msgid ""
+#~ "<literal>update</literal> is used to resynchronize the package index "
+#~ "files from their sources."
+#~ msgstr ""
+#~ "<literal>update</literal> wird benutzt, um die Paketindexdateien wieder "
+#~ "mit ihren Quellen in Einklang zu bringen."

 
 

-#~ msgid "Debian"
-#~ msgstr "Debian"
+#~ msgid "Script usage"
+#~ msgstr "Skriptaufruf"

 
 

-#~ msgid "NAME"
-#~ msgstr "NAME"
+#~ msgid "Differences to &apt-get;"
+#~ msgstr "Unterschiede zu &apt-get;"

 
 

-#~ msgid "apt - Advanced Package Tool"
-#~ msgstr "apt - Fortschrittliches Paketwerkzeug (Advanced Package Tool)"
+#~ msgid ""
+#~ "The <command>apt</command> command is meant to be pleasant for end users "
+#~ "and does not need to be backward compatible like &apt-get;. Therefore "
+#~ "some options are different:"
+#~ msgstr ""
+#~ "Der Befehl <command>apt</command> ist dazu gedacht, dem Endanwender die "
+#~ "Arbeit zu erleichtern und benötigt keine Abwärtskompatibilität wie &apt-"
+#~ "get;. Daher unterscheiden sich einige Optionen:"

 
 

-#~ msgid "SYNOPSIS"
-#~ msgstr "ÜBERSICHT"
+#~ msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
+#~ msgstr "Die Option <literal>DPkg::Progress-Fancy</literal> ist aktiviert."

 
 

-#~ msgid "B<apt>"
-#~ msgstr "B<apt>"
+#~ msgid "The option <literal>APT::Color</literal> is enabled."
+#~ msgstr "Die Option <literal>APT::Color</literal> ist aktiviert."

 
 

-#~ msgid "DESCRIPTION"
-#~ msgstr "BESCHREIBUNG"
+#~ msgid ""
+#~ "A new <literal>list</literal> command is available similar to "
+#~ "<literal>dpkg --list</literal>."
+#~ msgstr ""
+#~ "Ein neuer <literal>list</literal>-Befehl ist verfügbar. Er ist "
+#~ "<literal>dpkg --list</literal> ähnlich."

 
 

-#, fuzzy
-#~| msgid ""
-#~| "APT is a management system for software packages. For normal day to day "
-#~| "package management there are several frontends available, such as "
-#~| "B<aptitude>(8)  for the command line or B<synaptic>(8)  for the X Window "
-#~| "System. Some options are only implemented in B<apt-get>(8)  though."

 #~ msgid ""
 #~ msgid ""

-#~ "For normal day to day package management there are several frontends "
-#~ "available, such as B<aptitude>(8)  for the command line or "
-#~ "B<synaptic>(8)  for the X Window System. Some options are only "
-#~ "implemented in B<apt-get>(8)  though."
+#~ "The option <literal>upgrade</literal> has <literal>--with-new-pkgs</"
+#~ "literal> enabled by default."

 #~ msgstr ""
 #~ msgstr ""

-#~ "APT ist ein Verwaltungssystem für Softwarepakete. Für normale alltägliche "
-#~ "Paketverwaltung sind mehrere Oberflächen, wie B<aptitude>(8) für die "
-#~ "Befehlszeile oder B<synaptic>(8) für das X-Window-System, verfügbar. "
-#~ "Einige Optionen sind jedoch nur in B<apt-get>(8) implementiert."
+#~ "Bei der Option <literal>upgrade</literal> ist standardmäßig <literal>--"
+#~ "with-new-pkgs</literal> aktiviert."

 
 

-#~ msgid "SEE ALSO"
-#~ msgstr "SIEHE AUCH"
+#~ msgid ""
+#~ "Pass advanced options to gpg. With adv --recv-key you can download the "
+#~ "public key."
+#~ msgstr ""
+#~ "leitet erweitere Optionen an gpg weiter. Mit adv --recv-key können Sie "
+#~ "den öffentlichen Schlüssel herunterladen."
+
+#~ msgid "mark/unmark a package as being automatically-installed"
+#~ msgstr ""
+#~ "ein Paket als automatisch installiert markieren oder diese Markierung "
+#~ "entfernen"
+
+#~ msgid ""
+#~ "<command>apt-mark</command> will change whether a package has been marked "
+#~ "as being automatically installed."
+#~ msgstr ""
+#~ "<command>apt-mark</command> wird ändern, ob ein Paket als automatisch "
+#~ "installiert markiert ist."
+
+#~ msgid ""
+#~ "<literal>hold</literal> is used to mark a package as held back, which "
+#~ "will prevent the package from being automatically installed, upgraded or "
+#~ "removed.  The command is only a wrapper around <command>dpkg --set-"
+#~ "selections</command> and the state is therefore maintained by &dpkg; and "
+#~ "not affected by the <option>--file</option> option."
+#~ msgstr ""
+#~ "<literal>hold</literal> wird benutzt, um ein Paket als zurückgehalten zu "
+#~ "markieren, was verhindert, dass das Paket automatisch installiert, ein "
+#~ "Upgrade davon durchgeführt oder es entfernt wird. Der Befehl ist nur ein "
+#~ "Wrapper um <command>dpkg --set-selections</command> und der Status wird "
+#~ "daher durch &dpkg; verwaltet und nicht durch die Option <option>--file</"
+#~ "option>."
+
+#~ msgid ""
+#~ "If a package comes from a archive without a signature, or with a "
+#~ "signature that apt does not have a key for, that package is considered "
+#~ "untrusted, and installing it will result in a big warning. <command>apt-"
+#~ "get</command> will currently only warn for unsigned archives; future "
+#~ "releases might force all sources to be verified before downloading "
+#~ "packages from them."
+#~ msgstr ""
+#~ "Wenn ein Paket aus einem Archiv ohne Signatur stammt oder einem mit "
+#~ "Signatur, für das APT keinen Schlüssel hat, wird dieses Paket als nicht "
+#~ "vertrauenswürdig angesehen und es zu installieren, führt zu einer großen "
+#~ "Warnung. <command>apt-get</command> wird aktuell nur bei nicht signierten "
+#~ "Archiven warnen, zukünftige Releases könnten die Prüfung aller Quellen "
+#~ "vor dem Herunterladen von Paketen von dort erzwingen."
+
+#~ msgid ""
+#~ "No action; perform a simulation of events that would occur but do not "
+#~ "actually change the system.  Configuration Item: <literal>APT::Get::"
+#~ "Simulate</literal>."
+#~ msgstr ""
+#~ "keine Aktion; führt eine Simulation von Ereignissen aus, die eintreten "
+#~ "würden, aber das aktuelle System nicht verändern. Konfigurationselement: "
+#~ "<literal>APT::Get::Simulate</literal>."
+
+#~ msgid ""
+#~ "Simulated runs performed as a user will automatically deactivate locking "
+#~ "(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::"
+#~ "Get::Show-User-Simulation-Note</literal> is set (as it is by default) a "
+#~ "notice will also be displayed indicating that this is only a simulation. "
+#~ "Runs performed as root do not trigger either NoLocking or the notice - "
+#~ "superusers should know what they are doing without further warnings from "
+#~ "<literal>apt-get</literal>."
+#~ msgstr ""
+#~ "Simulierte Durchläufe als Benutzer werden automatisch das Sperren "
+#~ "deaktivieren (<literal>Debug::NoLocking</literal>) und falls die Option "
+#~ "<literal>APT::Get::Show-User-Simulation-Note</literal> gesetzt ist (was "
+#~ "standardmäßig der Fall ist), wird außerdem eine Benachrichtigung "
+#~ "angezeigt, die angibt, dass es sich hierbei nur um eine Simulation "
+#~ "handelt. Simulierte Durchläufe als Root lösen weder NoLocking noch die "
+#~ "Benachrichtigung aus – Superuser sollten ohne vorherige Warnung von "
+#~ "<literal>apt-get</literal> wissen, was sie tun."
+
+#~ msgid ""
+#~ "Ignore if packages can't be authenticated and don't prompt about it.  "
+#~ "This is useful for tools like pbuilder.  Configuration Item: "
+#~ "<literal>APT::Get::AllowUnauthenticated</literal>."
+#~ msgstr ""
+#~ "Ignoriert, wenn Pakete nicht authentifiziert werden können und nicht "
+#~ "danach fragen. Dies ist für Werkzeuge wie pbuilder nützlich. "
+#~ "Konfigurationselement: <literal>APT::Get::AllowUnauthenticated</literal>."
+
+#~ msgid ""
+#~ "Version 2 of this protocol dumps more information, including the protocol "
+#~ "version, the APT configuration space and the packages, files and versions "
+#~ "being changed. Version 3 adds the architecture and <literal>MultiArch</"
+#~ "literal> flag to each version being dumped."
+#~ msgstr ""
+#~ "Version 2 dieses Protokolls gibt mehr Informationen aus, einschließlich "
+#~ "der Protokollversion, dem APT-Konfigurationsraum und den Paketen, Dateien "
+#~ "und den Versionen, die geändert werden. Version 3 fügt jeder ausgegebenen "
+#~ "Version die Architektur und den <literal>MultiArch</literal>-Schalter "
+#~ "hinzu."
+
+#~ msgid ""
+#~ "to the versions that are not installed and do not belong to the target "
+#~ "release."
+#~ msgstr ""
+#~ "zu den Versionen, die nicht installiert sind und die nicht zum Ziel-"
+#~ "Release gehören."

 
 

-#, fuzzy
-#~| msgid ""
-#~| "B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
-#~| "B<apt_preferences>(5), B<apt-secure>(8)"

 #~ msgid ""
 #~ msgid ""

-#~ "B<apt>(8), B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources."
-#~ "list>(5), B<apt_preferences>(5), B<apt-secure>(8)"
+#~ "Each line specifying a source starts with type (e.g. <literal>deb-src</"
+#~ "literal>)  followed by options and arguments for this type.  Individual "
+#~ "entries cannot be continued onto a following line. Empty lines are "
+#~ "ignored, and a <literal>#</literal> character anywhere on a line marks "
+#~ "the remainder of that line as a comment."

 #~ msgstr ""
 #~ msgstr ""

-#~ "B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), "
-#~ "B<apt_preferences>(5), B<apt-secure>(8)"
+#~ "Jede Zeile, die eine Quelle angibt, beginnt mit den Typ (z.B. "
+#~ "<literal>deb-src</literal>) gefolgt von Optionen und Argumenten für "
+#~ "diesen Typ. Einzelne Einträge können nicht auf einer folgenden Zeile "
+#~ "fortgesetzt werden. Leere Zeilen werden ignoriert und ein <literal>#</"
+#~ "literal>-Zeichen irgendwo in einer Zeile kennzeichnet den Rest dieser "
+#~ "Zeile als Kommentar."

 
 

-#~ msgid "DIAGNOSTICS"
-#~ msgstr "DIAGNOSE"
+#~ msgid "deb [ options ] uri suite [component1] [component2] [...]"
+#~ msgstr "deb [ Optionen ] URI Suite [Komponente1] [Komponente2] […]"

 
 

-#~ msgid "apt returns zero on normal operation, decimal 100 on error."
+#~ msgid ""
+#~ "     Types: deb deb-src\n"
+#~ "     URIs: http://example.com\n"
+#~ "     Suites: stable testing\n"
+#~ "     Sections: component1 component2\n"
+#~ "     Description: short\n"
+#~ "      long long long\n"
+#~ "     [option1]: [option1-value]\n"
+#~ "\n"
+#~ "     Types: deb\n"
+#~ "     URIs: http://another.example.com\n"
+#~ "     Suites: experimental\n"
+#~ "     Sections: component1 component2\n"
+#~ "     Enabled: no\n"
+#~ "     Description: short\n"
+#~ "      long long long\n"
+#~ "     [option1]: [option1-value]\n"
+#~ "   "

 #~ msgstr ""
 #~ msgstr ""

-#~ "APT gibt bei normalen Operationen 0 zurück, dezimal 100 bei Fehlern."
+#~ "     Types: deb deb-src\n"
+#~ "     URIs: http://example.com\n"
+#~ "     Suites: stable testing\n"
+#~ "     Sections: Komponente1 Komponente2\n"
+#~ "     Description: short\n"
+#~ "      long long long\n"
+#~ "     [Option1]: [Option1-Wert]\n"
+#~ "\n"
+#~ "     Types: deb\n"
+#~ "     URIs: http://another.example.com\n"
+#~ "     Suites: experimental\n"
+#~ "     Sections: Komponente1 Komponente2\n"
+#~ "     Enabled: no\n"
+#~ "     Description: short\n"
+#~ "      long long long\n"
+#~ "     [Option1]: [Option1-Wert]\n"
+#~ "   "

 
 

-#~ msgid "BUGS"
-#~ msgstr "FEHLER"
+#~ msgid ""
+#~ "<literal>options</literal> is always optional and needs to be surrounded "
+#~ "by square brackets. It can consist of multiple settings in the form "
+#~ "<literal><replaceable>setting</replaceable>=<replaceable>value</"
+#~ "replaceable></literal>.  Multiple settings are separated by spaces. The "
+#~ "following settings are supported by APT (note however that unsupported "
+#~ "settings will be ignored silently):"
+#~ msgstr ""
+#~ "<literal>options</literal> ist immer optional und muss in eckige Klammern "
+#~ "eingeschlossen werden. Es kann aus mehreren Einstellungen in der Form "
+#~ "<literal><replaceable>Einstellung</replaceable>=<replaceable>Wert</"
+#~ "replaceable></literal> bestehen. Mehrere Einstellungen werden durch "
+#~ "Leerzeichen getrennt. Die folgenden Einstellungen werden von APT "
+#~ "unterstützt. Beachten Sie allerdings, dass nicht unterstützte "
+#~ "Einstellungen stillschweigend ignoriert werden."

 
 

-#~ msgid "This manpage isn't even started."
-#~ msgstr "Diese Handbuchseite wurde noch nicht mal begonnen."
+#~ msgid ""
+#~ "<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+#~ "replaceable>,…</literal> and <literal>arch-=<replaceable>arch1</"
+#~ "replaceable>,<replaceable>arch2</replaceable>,…</literal> which can be "
+#~ "used to add/remove architectures from the set which will be downloaded."
+#~ msgstr ""
+#~ "<literal>arch+=<replaceable>Architektur1</replaceable>,"
+#~ "<replaceable>Architektur2</replaceable>, …</literal> und <literal>arch-"
+#~ "=<replaceable>Architektur1</replaceable>,<replaceable>Architektur2</"
+#~ "replaceable>, …</literal>, die benutzt werden können, um der "
+#~ "Zusammenstellung, die heruntergeladen werden soll, Architekturen "
+#~ "hinzuzufügen oder zu entfernen."

 
 #~ msgid ""
 
 #~ msgid ""

-#~ "See E<lt>http://bugs.debian.org/aptE<gt>.  If you wish to report a bug in "
-#~ "B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the "
-#~ "B<reportbug>(1)  command."
+#~ "<literal>trusted=yes</literal> can be set to indicate that packages from "
+#~ "this source are always authenticated even if the <filename>Release</"
+#~ "filename> file is not signed or the signature can't be checked. This "
+#~ "disables parts of &apt-secure; and should therefore only be used in a "
+#~ "local and trusted context. <literal>trusted=no</literal> is the opposite "
+#~ "which handles even correctly authenticated sources as not authenticated."

 #~ msgstr ""
 #~ msgstr ""

-#~ "siehe auch E<lt>http://bugs.debian.org/aptE<gt>. Wenn Sie einen Fehler in "
-#~ "B<apt> berichten möchten, sehen Sie sich bitte I</usr/share/doc/debian/"
-#~ "bug-reporting.txt> oder den Befehl B<reportbug>(1) an."
+#~ "<literal>trusted=yes</literal> kann gesetzt werden, um anzuzeigen, dass "
+#~ "Pakete aus dieser Quelle immer authentifiziert sind, sogar, falls die "
+#~ "Datei <filename>Release</filename> nicht signiert ist oder die Signatur "
+#~ "nicht geprüft werden kann. Dies deaktiviert Teile von &apt-secure; und "
+#~ "sollte daher nur in lokalem und vertrauenswürdigem Kontext benutzt "
+#~ "werden. <literal>trusted=no</literal> ist das Gegenteil davon. Es "
+#~ "handhabt sogar korrekt authentifizierte Quellen als nicht authentifiziert."

 
 

-#~ msgid "AUTHOR"
-#~ msgstr "AUTOR"
+#~ msgid "Some examples:"
+#~ msgstr "Einige Beispiele:"

 
 

-#~ msgid "apt was written by the APT team E<lt>apt@packages.debian.orgE<gt>."
+#~ msgid ""
+#~ "deb http://ftp.debian.org/debian &debian-stable-codename; main contrib "
+#~ "non-free\n"
+#~ "deb http://security.debian.org/ &debian-stable-codename;/updates main "
+#~ "contrib non-free\n"
+#~ "   "

 #~ msgstr ""
 #~ msgstr ""

-#~ "APT wurde vom APT-Team E<lt>apt@packages.debian.orgE<gt> geschrieben."
+#~ "deb http://ftp.debian.org/debian &debian-stable-codename; main contrib "
+#~ "non-free\n"
+#~ "deb http://security.debian.org/ &debian-stable-codename;/updates main "
+#~ "contrib non-free\n"
+#~ "   "