releasing version 0.9.7.7ubuntu2

1 files changed, 865 insertions, 827 deletions

diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 8961e3002..0e190fa13 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt-doc 0.9.7.5\n"
+"Project-Id-Version: apt-doc 0.9.7.7ubuntu1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-10-15 09:49+0300\n"
+"POT-Creation-Date: 2013-03-02 01:57+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -63,7 +63,8 @@ msgid ""
 "<!-- Boiler plate Author section -->\n"
 "<!ENTITY manauthor \"\n"
 " <refsect1><title>Author</title>\n"
-"   <para>APT was written by the APT team <email>apt@packages.debian.org</email>.\n"
+"   <para>APT was written by the APT team "
+"<email>apt@packages.debian.org</email>.\n"
 "   </para>\n"
 " </refsect1>\n"
 "\">\n"
@@ -104,10 +105,13 @@ msgid ""
 "     <varlistentry>\n"
 "      <term><option>-c</option></term>\n"
 "      <term><option>--config-file</option></term>\n"
-"     <listitem><para>Configuration File; Specify a configuration file to use. \n"
+"     <listitem><para>Configuration File; Specify a configuration file to "
+"use. \n"
 "     The program will read the default configuration file and then this \n"
-"     configuration file. If configuration settings need to be set before the\n"
-"     default configuration files are parsed specify a file with the <envar>APT_CONFIG</envar>\n"
+"     configuration file. If configuration settings need to be set before "
+"the\n"
+"     default configuration files are parsed specify a file with the "
+"<envar>APT_CONFIG</envar>\n"
 "     environment variable. See &apt-conf; for syntax information.\n"
 "     </para>\n"
 "     </listitem>\n"
@@ -121,9 +125,12 @@ msgid ""
 "     <varlistentry>\n"
 "      <term><option>-o</option></term>\n"
 "      <term><option>--option</option></term>\n"
-"     <listitem><para>Set a Configuration Option; This will set an arbitrary\n"
-"      configuration option. The syntax is <option>-o Foo::Bar=bar</option>.\n"
-"      <option>-o</option> and <option>--option</option> can be used multiple\n"
+"     <listitem><para>Set a Configuration Option; This will set an "
+"arbitrary\n"
+"      configuration option. The syntax is <option>-o "
+"Foo::Bar=bar</option>.\n"
+"      <option>-o</option> and <option>--option</option> can be used "
+"multiple\n"
 "      times to set different options.\n"
 "     </para>\n"
 "     </listitem>\n"
@@ -138,7 +145,8 @@ msgid ""
 "<!-- Should be used within the option section of the text to\n"
 "     put in the blurb about -h, -v, -c and -o -->\n"
 "<!ENTITY apt-cmdblurb \"\n"
-"   <para>All command line options may be set using the configuration file, the\n"
+"   <para>All command line options may be set using the configuration file, "
+"the\n"
 "   descriptions indicate the configuration option to set. For boolean\n"
 "   options you can override the config file by using something like \n"
 "   <option>-f-</option>,<option>--no-f</option>, <option>-f=no</option>\n"
@@ -154,7 +162,8 @@ msgid ""
 "<!ENTITY file-aptconf \"\n"
 "     <varlistentry><term><filename>/etc/apt/apt.conf</filename></term>\n"
 "     <listitem><para>APT configuration file.\n"
-"     Configuration Item: <literal>Dir::Etc::Main</literal>.</para></listitem>\n"
+"     Configuration Item: "
+"<literal>Dir::Etc::Main</literal>.</para></listitem>\n"
 "     </varlistentry>\n"
 msgstr ""
 
@@ -164,7 +173,8 @@ msgstr ""
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
 "     <listitem><para>APT configuration file fragments.\n"
-"     Configuration Item: <literal>Dir::Etc::Parts</literal>.</para></listitem>\n"
+"     Configuration Item: "
+"<literal>Dir::Etc::Parts</literal>.</para></listitem>\n"
 "     </varlistentry>\n"
 "\">\n"
 msgstr ""
@@ -176,7 +186,8 @@ msgid ""
 "<!ENTITY file-cachearchives \"\n"
 "     <varlistentry><term><filename>&cachedir;/archives/</filename></term>\n"
 "     <listitem><para>Storage area for retrieved package files.\n"
-"     Configuration Item: <literal>Dir::Cache::Archives</literal>.</para></listitem>\n"
+"     Configuration Item: "
+"<literal>Dir::Cache::Archives</literal>.</para></listitem>\n"
 "     </varlistentry>\n"
 msgstr ""
 
@@ -184,9 +195,12 @@ msgstr ""
 #: apt.ent:109
 #, no-wrap
 msgid ""
-"     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
+"     "
+"<varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
 "     <listitem><para>Storage area for package files in transit.\n"
-"     Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended)</para></listitem>\n"
+"     Configuration Item: <literal>Dir::Cache::Archives</literal> "
+"(<filename>partial</filename> will be implicitly "
+"appended)</para></listitem>\n"
 "     </varlistentry>\n"
 "\">\n"
 msgstr ""
@@ -202,7 +216,8 @@ msgid ""
 "     i.e. a preference to get certain packages\n"
 "     from a separate source\n"
 "     or from a different version of a distribution.\n"
-"     Configuration Item: <literal>Dir::Etc::Preferences</literal>.</para></listitem>\n"
+"     Configuration Item: "
+"<literal>Dir::Etc::Preferences</literal>.</para></listitem>\n"
 "     </varlistentry>\n"
 msgstr ""
 
@@ -210,9 +225,11 @@ msgstr ""
 #: apt.ent:125
 #, no-wrap
 msgid ""
-"     <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
+"     "
+"<varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
 "     <listitem><para>File fragments for the version preferences.\n"
-"     Configuration Item: <literal>Dir::Etc::PreferencesParts</literal>.</para></listitem>\n"
+"     Configuration Item: "
+"<literal>Dir::Etc::PreferencesParts</literal>.</para></listitem>\n"
 "     </varlistentry>\n"
 "\">\n"
 msgstr ""
@@ -224,7 +241,8 @@ msgid ""
 "<!ENTITY file-sourceslist \"\n"
 "     <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n"
 "     <listitem><para>Locations to fetch packages from.\n"
-"     Configuration Item: <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n"
+"     Configuration Item: "
+"<literal>Dir::Etc::SourceList</literal>.</para></listitem>\n"
 "     </varlistentry>\n"
 msgstr ""
 
@@ -232,9 +250,11 @@ msgstr ""
 #: apt.ent:137
 #, no-wrap
 msgid ""
-"     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
+"     "
+"<varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
 "     <listitem><para>File fragments for locations to fetch packages from.\n"
-"     Configuration Item: <literal>Dir::Etc::SourceParts</literal>.</para></listitem>\n"
+"     Configuration Item: "
+"<literal>Dir::Etc::SourceParts</literal>.</para></listitem>\n"
 "     </varlistentry>\n"
 "\">\n"
 msgstr ""
@@ -245,9 +265,11 @@ msgstr ""
 msgid ""
 "<!ENTITY file-statelists \"\n"
 "     <varlistentry><term><filename>&statedir;/lists/</filename></term>\n"
-"     <listitem><para>Storage area for state information for each package resource specified in\n"
+"     <listitem><para>Storage area for state information for each package "
+"resource specified in\n"
 "     &sources-list;\n"
-"     Configuration Item: <literal>Dir::State::Lists</literal>.</para></listitem>\n"
+"     Configuration Item: "
+"<literal>Dir::State::Lists</literal>.</para></listitem>\n"
 "     </varlistentry>\n"
 msgstr ""
 
@@ -255,9 +277,12 @@ msgstr ""
 #: apt.ent:150
 #, no-wrap
 msgid ""
-"     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
+"     "
+"<varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
 "     <listitem><para>Storage area for state information in transit.\n"
-"     Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended)</para></listitem>\n"
+"     Configuration Item: <literal>Dir::State::Lists</literal> "
+"(<filename>partial</filename> will be implicitly "
+"appended)</para></listitem>\n"
 "     </varlistentry>\n"
 "\">\n"
 msgstr ""
@@ -268,8 +293,10 @@ msgstr ""
 msgid ""
 "<!ENTITY file-trustedgpg \"\n"
 "     <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n"
-"     <listitem><para>Keyring of local trusted keys, new keys will be added here.\n"
-"     Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n"
+"     <listitem><para>Keyring of local trusted keys, new keys will be added "
+"here.\n"
+"     Configuration Item: "
+"<literal>Dir::Etc::Trusted</literal>.</para></listitem>\n"
 "     </varlistentry>\n"
 msgstr ""
 
@@ -277,10 +304,13 @@ msgstr ""
 #: apt.ent:163
 #, no-wrap
 msgid ""
-"     <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
-"     <listitem><para>File fragments for the trusted keys, additional keyrings can\n"
+"     "
+"<varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
+"     <listitem><para>File fragments for the trusted keys, additional "
+"keyrings can\n"
 "     be stored here (by other packages or the administrator).\n"
-"     Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n"
+"     Configuration Item "
+"<literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n"
 "     </varlistentry>\n"
 "\">\n"
 msgstr ""
@@ -290,7 +320,8 @@ msgstr ""
 #, no-wrap
 msgid ""
 "<!ENTITY file-extended_states \"\n"
-"      <varlistentry><term><filename>/var/lib/apt/extended_states</filename></term>\n"
+"      "
+"<varlistentry><term><filename>/var/lib/apt/extended_states</filename></term>\n"
 "      <listitem><para>Status list of auto-installed packages.\n"
 "      Configuration Item: <literal>Dir::State::extended_states</literal>.\n"
 "      </para></listitem>\n"
@@ -302,8 +333,10 @@ msgstr ""
 #: apt.ent:175
 #, no-wrap
 msgid ""
-"<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
-"     to the other headers like NAME and DESCRIPTION and should therefore be uppercase. -->\n"
+"<!-- TRANSLATOR: This is the section header for the following paragraphs - "
+"comparable\n"
+"     to the other headers like NAME and DESCRIPTION and should therefore be "
+"uppercase. -->\n"
 "<!ENTITY translation-title \"TRANSLATION\">\n"
 msgstr ""
 
@@ -311,13 +344,18 @@ msgstr ""
 #: apt.ent:184
 #, no-wrap
 msgid ""
-"<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
-"     to the translation in the past, who is responsible now and maybe further information\n"
+"<!-- TRANSLATOR: This is a placeholder. You should write here who has "
+"contributed\n"
+"     to the translation in the past, who is responsible now and maybe "
+"further information\n"
 "     specially related to your translation. -->\n"
 "<!ENTITY translation-holder \"\n"
-"     The english translation was done by John Doe <email>john@doe.org</email> in 2009,\n"
-"     2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together with the\n"
-"     Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>.\n"
+"     The english translation was done by John Doe "
+"<email>john@doe.org</email> in 2009,\n"
+"     2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together "
+"with the\n"
+"     Debian Dummy l10n Team "
+"<email>debian-l10n-dummy@lists.debian.org</email>.\n"
 "\">\n"
 msgstr ""
 
@@ -325,10 +363,14 @@ msgstr ""
 #: apt.ent:195
 #, no-wrap
 msgid ""
-"<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
-"     in a shipped manpage newer/modified paragraphs will maybe appear in english in\n"
-"     the generated manpage. This sentence is therefore here to tell the reader that this\n"
-"     is not a mistake by the translator - obviously the target is that at least for stable\n"
+"<!-- TRANSLATOR: As a translation is allowed to have 20% of "
+"untranslated/fuzzy strings\n"
+"     in a shipped manpage newer/modified paragraphs will maybe appear in "
+"english in\n"
+"     the generated manpage. This sentence is therefore here to tell the "
+"reader that this\n"
+"     is not a mistake by the translator - obviously the target is that at "
+"least for stable\n"
 "     releases this sentence is not needed. :) -->\n"
 "<!ENTITY translation-english \"\n"
 "     Note that this translated document may contain untranslated parts.\n"
@@ -340,8 +382,9 @@ msgstr ""
 #. type: Plain text
 #: apt.ent:198
 msgid ""
-"<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
-"pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
+"<!-- TRANSLATOR: used as in -o=config_string "
+"e.g. -o=Debug::pkgProblemResolver=1 --> <!ENTITY synopsis-config-string "
+"\"config_string\">"
 msgstr ""
 
 #. type: Plain text
@@ -354,8 +397,8 @@ msgstr ""
 #. type: Plain text
 #: apt.ent:204
 msgid ""
-"<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release e.g. -"
-"t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
+"<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release "
+"e.g. -t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
 "\"target_release\">"
 msgstr ""
 
@@ -376,8 +419,8 @@ msgstr ""
 #. type: Plain text
 #: apt.ent:213
 msgid ""
-"<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> <!"
-"ENTITY synopsis-pkg-ver-number \"pkg_version_number\">"
+"<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> "
+"<!ENTITY synopsis-pkg-ver-number \"pkg_version_number\">"
 msgstr ""
 
 #. type: Plain text
@@ -397,15 +440,15 @@ msgstr ""
 #. type: Plain text
 #: apt.ent:222
 msgid ""
-"<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
-"d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
+"<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom "
+"-d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
 msgstr ""
 
 #. type: Plain text
 #: apt.ent:225
 msgid ""
-"<!-- TRANSLATOR: used as in apt-extracttemplates -t=temporary_directory e.g. "
-"apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "
+"<!-- TRANSLATOR: used as in apt-extracttemplates -t=temporary_directory "
+"e.g. apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "
 "\"temporary_directory\">"
 msgstr ""
 
@@ -454,16 +497,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt-get.8.xml:26 apt-cache.8.xml:26 apt-key.8.xml:25 apt-mark.8.xml:26
-#: apt-secure.8.xml:25 apt-cdrom.8.xml:25 apt-config.8.xml:26
+#: apt-get.8.xml:26 apt-cache.8.xml:26 apt-key.8.xml:25 apt-mark.8.xml:26 apt-secure.8.xml:25 apt-cdrom.8.xml:25 apt-config.8.xml:26
 msgid "8"
 msgstr ""
 
 #. type: Content of: <refentry><refmeta><refmiscinfo>
-#: apt-get.8.xml:27 apt-cache.8.xml:27 apt-key.8.xml:26 apt-mark.8.xml:27
-#: apt-secure.8.xml:26 apt-cdrom.8.xml:26 apt-config.8.xml:27
-#: apt.conf.5.xml:32 apt_preferences.5.xml:26 sources.list.5.xml:27
-#: apt-extracttemplates.1.xml:27 apt-sortpkgs.1.xml:27 apt-ftparchive.1.xml:27
+#: apt-get.8.xml:27 apt-cache.8.xml:27 apt-key.8.xml:26 apt-mark.8.xml:27 apt-secure.8.xml:26 apt-cdrom.8.xml:26 apt-config.8.xml:27 apt.conf.5.xml:32 apt_preferences.5.xml:26 sources.list.5.xml:27 apt-extracttemplates.1.xml:27 apt-sortpkgs.1.xml:27 apt-ftparchive.1.xml:27
 msgid "APT"
 msgstr ""
 
@@ -473,10 +512,7 @@ msgid "APT package handling utility -- command-line interface"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:38 apt-cache.8.xml:38 apt-key.8.xml:37 apt-mark.8.xml:38
-#: apt-secure.8.xml:50 apt-cdrom.8.xml:37 apt-config.8.xml:38
-#: apt.conf.5.xml:41 apt_preferences.5.xml:36 sources.list.5.xml:36
-#: apt-extracttemplates.1.xml:38 apt-sortpkgs.1.xml:38 apt-ftparchive.1.xml:38
+#: apt-get.8.xml:38 apt-cache.8.xml:38 apt-key.8.xml:37 apt-mark.8.xml:38 apt-secure.8.xml:50 apt-cdrom.8.xml:37 apt-config.8.xml:38 apt.conf.5.xml:41 apt_preferences.5.xml:36 sources.list.5.xml:36 apt-extracttemplates.1.xml:38 apt-sortpkgs.1.xml:38 apt-ftparchive.1.xml:38
 msgid "Description"
 msgstr ""
 
@@ -490,8 +526,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:44 apt-cache.8.xml:44 apt-cdrom.8.xml:51 apt-config.8.xml:44
-#: apt-ftparchive.1.xml:54
+#: apt-get.8.xml:44 apt-cache.8.xml:44 apt-cdrom.8.xml:51 apt-config.8.xml:44 apt-ftparchive.1.xml:54
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."
@@ -506,9 +541,10 @@ msgid ""
 "example, when using a Debian archive, this command retrieves and scans the "
 "<filename>Packages.gz</filename> files, so that information about new and "
 "updated packages is available. An <literal>update</literal> should always be "
-"performed before an <literal>upgrade</literal> or <literal>dist-upgrade</"
-"literal>. Please be aware that the overall progress meter will be incorrect "
-"as the size of the package files cannot be known in advance."
+"performed before an <literal>upgrade</literal> or "
+"<literal>dist-upgrade</literal>. Please be aware that the overall progress "
+"meter will be incorrect as the size of the package files cannot be known in "
+"advance."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -522,8 +558,9 @@ msgid ""
 "already installed retrieved and installed. New versions of currently "
 "installed packages that cannot be upgraded without changing the install "
 "status of another package will be left at their current version. An "
-"<literal>update</literal> must be performed first so that <command>apt-get</"
-"command> knows that new versions of packages are available."
+"<literal>update</literal> must be performed first so that "
+"<command>apt-get</command> knows that new versions of packages are "
+"available."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -536,8 +573,8 @@ msgid ""
 "important packages at the expense of less important ones if necessary.  The "
 "<literal>dist-upgrade</literal> command may therefore remove some packages.  "
 "The <filename>/etc/apt/sources.list</filename> file contains a list of "
-"locations from which to retrieve desired package files.  See also &apt-"
-"preferences; for a mechanism for overriding the general settings for "
+"locations from which to retrieve desired package files.  See also "
+"&apt-preferences; for a mechanism for overriding the general settings for "
 "individual packages."
 msgstr ""
 
@@ -545,11 +582,11 @@ msgstr ""
 #: apt-get.8.xml:87
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
-"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
-"literal> follows the changes made by &dselect; to the <literal>Status</"
-"literal> field of available packages, and performs the actions necessary to "
-"realize that state (for instance, the removal of old and the installation of "
-"new packages)."
+"traditional Debian packaging front-end, "
+"&dselect;. <literal>dselect-upgrade</literal> follows the changes made by "
+"&dselect; to the <literal>Status</literal> field of available packages, and "
+"performs the actions necessary to realize that state (for instance, the "
+"removal of old and the installation of new packages)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -557,16 +594,16 @@ msgstr ""
 msgid ""
 "<literal>install</literal> is followed by one or more packages desired for "
 "installation or upgrading.  Each package is a package name, not a fully "
-"qualified filename (for instance, in a Debian system, <package>apt-utils</"
-"package> would be the argument provided, not <filename>apt-utils_&apt-"
-"product-version;_amd64.deb</filename>). All packages required by the package"
-"(s) specified for installation will also be retrieved and installed.  The "
-"<filename>/etc/apt/sources.list</filename> file is used to locate the "
-"desired packages. If a hyphen is appended to the package name (with no "
-"intervening space), the identified package will be removed if it is "
-"installed.  Similarly a plus sign can be used to designate a package to "
-"install. These latter features may be used to override decisions made by apt-"
-"get's conflict resolution system."
+"qualified filename (for instance, in a Debian system, "
+"<package>apt-utils</package> would be the argument provided, not "
+"<filename>apt-utils_&apt-product-version;_amd64.deb</filename>). All "
+"packages required by the package(s) specified for installation will also be "
+"retrieved and installed.  The <filename>/etc/apt/sources.list</filename> "
+"file is used to locate the desired packages. If a hyphen is appended to the "
+"package name (with no intervening space), the identified package will be "
+"removed if it is installed.  Similarly a plus sign can be used to designate "
+"a package to install. These latter features may be used to override "
+"decisions made by apt-get's conflict resolution system."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -574,10 +611,10 @@ msgstr ""
 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)."
+"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 ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -590,13 +627,13 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:126
 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. "
-"Unlike the \"upgrade\" target, which installs the newest version of all "
-"currently installed packages, \"install\" will install the newest version of "
-"only the package(s)  specified. Simply provide the name of the package(s) "
-"you wish to upgrade, and if a newer version is available, it (and its "
-"dependencies, as described above) will be downloaded and installed."
+"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. Unlike the \"upgrade\" target, which installs the newest version of "
+"all currently installed packages, \"install\" will install the newest "
+"version of only the package(s)  specified. Simply provide the name of the "
+"package(s) you wish to upgrade, and if a newer version is available, it (and "
+"its dependencies, as described above) will be downloaded and installed."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -643,19 +680,19 @@ msgid ""
 "packages. APT will examine the available packages to decide which source "
 "package to fetch. It will then find and download into the current directory "
 "the newest available version of that source package while respecting the "
-"default release, set with the option <literal>APT::Default-Release</"
-"literal>, the <option>-t</option> option or per package with the "
-"<literal>pkg/release</literal> syntax, if possible."
+"default release, set with the option "
+"<literal>APT::Default-Release</literal>, the <option>-t</option> option or "
+"per package with the <literal>pkg/release</literal> syntax, if possible."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:172
 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 "
-"need to add such a line for each repository you want to get sources from; "
-"otherwise you will probably get either the wrong (too old/too new) source "
-"versions or none at all."
+"Source packages are tracked separately from binary packages via "
+"<literal>deb-src</literal> lines in the &sources-list; file. This means that "
+"you will need to add such a line for each repository you want to get sources "
+"from; otherwise you will probably get either the wrong (too old/too new) "
+"source versions or none at all."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -674,8 +711,8 @@ 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 "
 "for the package files. This enables exact matching of the source package "
-"name and version, implicitly enabling the <literal>APT::Get::Only-Source</"
-"literal> option."
+"name and version, implicitly enabling the "
+"<literal>APT::Get::Only-Source</literal> option."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -692,8 +729,8 @@ 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 "
 "the dependencies are satisfied to build the package natively. If desired a "
-"host-architecture can be specified with the <option>--host-architecture</"
-"option> option instead."
+"host-architecture can be specified with the "
+"<option>--host-architecture</option> option instead."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -715,11 +752,11 @@ msgstr ""
 msgid ""
 "<literal>clean</literal> clears out the local repository of retrieved "
 "package files. It removes everything but the lock file from "
-"<filename>&cachedir;/archives/</filename> and <filename>&cachedir;/archives/"
-"partial/</filename>. When APT is used as a &dselect; method, <literal>clean</"
-"literal> is run automatically.  Those who do not use dselect will likely "
-"want to run <literal>apt-get clean</literal> from time to time to free up "
-"disk space."
+"<filename>&cachedir;/archives/</filename> and "
+"<filename>&cachedir;/archives/partial/</filename>. When APT is used as a "
+"&dselect; method, <literal>clean</literal> is run automatically.  Those who "
+"do not use dselect will likely want to run <literal>apt-get clean</literal> "
+"from time to time to free up disk space."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -729,9 +766,9 @@ msgid ""
 "local repository of retrieved package files. The difference is that it only "
 "removes package files that can no longer be downloaded, and are largely "
 "useless. This allows a cache to be maintained over a long period without it "
-"growing out of control. The configuration option <literal>APT::Clean-"
-"Installed</literal> will prevent installed packages from being erased if it "
-"is set to off."
+"growing out of control. The configuration option "
+"<literal>APT::Clean-Installed</literal> will prevent installed packages from "
+"being erased if it is set to off."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -748,18 +785,17 @@ 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 "
+"variable (e.g. <ulink "
+"url=\"http://packages.debian.org/changelogs\">packages.debian.org/changelogs</ulink> "
+"for Debian or <ulink "
+"url=\"http://changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> "
+"for Ubuntu).  By default it displays the changelog for the version that is "
 "installed.  However, you can specify the same options as for the "
 "<option>install</option> command."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:258 apt-cache.8.xml:248 apt-mark.8.xml:108
-#: apt-config.8.xml:84 apt-extracttemplates.1.xml:52 apt-sortpkgs.1.xml:48
-#: apt-ftparchive.1.xml:504
+#: apt-get.8.xml:258 apt-cache.8.xml:248 apt-mark.8.xml:108 apt-config.8.xml:84 apt-extracttemplates.1.xml:52 apt-sortpkgs.1.xml:48 apt-ftparchive.1.xml:504
 msgid "options"
 msgstr ""
 
@@ -795,9 +831,9 @@ msgid ""
 "dependencies to exist on a system. It is possible that a system's dependency "
 "structure can be so corrupt as to require manual intervention (which usually "
 "means using &dselect; or <command>dpkg --remove</command> to eliminate some "
-"of the offending packages). Use of this option together with <option>-m</"
-"option> may produce an error in some situations.  Configuration Item: "
-"<literal>APT::Get::Fix-Broken</literal>."
+"of the offending packages). Use of this option together with "
+"<option>-m</option> may produce an error in some situations.  Configuration "
+"Item: <literal>APT::Get::Fix-Broken</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -805,19 +841,20 @@ msgstr ""
 msgid ""
 "Ignore missing packages; if packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
-"packages and handle the result. Use of this option together with <option>-f</"
-"option> may produce an error in some situations. If a package is selected "
-"for installation (particularly if it is mentioned on the command line) and "
-"it could not be downloaded then it will be silently held back.  "
+"packages and handle the result. Use of this option together with "
+"<option>-f</option> may produce an error in some situations. If a package is "
+"selected for installation (particularly if it is mentioned on the command "
+"line) and it could not be downloaded then it will be silently held back.  "
 "Configuration Item: <literal>APT::Get::Fix-Missing</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:304
 msgid ""
-"Disables downloading of packages. This is best used with <option>--ignore-"
-"missing</option> to force APT to use only the .debs it has already "
-"downloaded.  Configuration Item: <literal>APT::Get::Download</literal>."
+"Disables downloading of packages. This is best used with "
+"<option>--ignore-missing</option> to force APT to use only the .debs it has "
+"already downloaded.  Configuration Item: "
+"<literal>APT::Get::Download</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -836,20 +873,20 @@ msgstr ""
 #: apt-get.8.xml:326
 msgid ""
 "No action; perform a simulation of events that would occur but do not "
-"actually change the system.  Configuration Item: <literal>APT::Get::"
-"Simulate</literal>."
+"actually change the system.  Configuration Item: "
+"<literal>APT::Get::Simulate</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:330
 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>."
+"(<literal>Debug::NoLocking</literal>), and if the option "
+"<literal>APT::Get::Show-User-Simulation-Note</literal> is set (as it is by "
+"default) a notice will also be displayed indicating that this is only a "
+"simulation. Runs performed as root do not trigger either NoLocking or the "
+"notice - superusers should know what they are doing without further warnings "
+"from <literal>apt-get</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -857,9 +894,9 @@ msgstr ""
 msgid ""
 "Simulated runs print out a series of lines, each representing a "
 "<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
-"remove (<literal>Remv</literal>)  or unpack (<literal>Inst</literal>). "
-"Square brackets indicate broken packages, and empty square brackets indicate "
-"breaks that are of no consequence (rare)."
+"remove (<literal>Remv</literal>)  or unpack "
+"(<literal>Inst</literal>). Square brackets indicate broken packages, and "
+"empty square brackets indicate breaks that are of no consequence (rare)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -875,8 +912,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:354
 msgid ""
-"Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
-"Assume-No</literal>."
+"Automatic \"no\" to all prompts.  Configuration Item: "
+"<literal>APT::Get::Assume-No</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -896,12 +933,12 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:371
 msgid ""
-"This option controls the architecture packages are built for by <command>apt-"
-"get source --compile</command> and how cross-builddependencies are "
-"satisfied. By default is it not set which means that the host architecture "
-"is the same as the build architecture (which is defined by <literal>APT::"
-"Architecture</literal>).  Configuration Item: <literal>APT::Get::Host-"
-"Architecture</literal>"
+"This option controls the architecture packages are built for by "
+"<command>apt-get source --compile</command> and how cross-builddependencies "
+"are satisfied. By default is it not set which means that the host "
+"architecture is the same as the build architecture (which is defined by "
+"<literal>APT::Architecture</literal>).  Configuration Item: "
+"<literal>APT::Get::Host-Architecture</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -923,19 +960,20 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:393
 msgid ""
-"Do not upgrade packages; when used in conjunction with <literal>install</"
-"literal>, <literal>no-upgrade</literal> will prevent packages on the command "
-"line from being upgraded if they are already installed.  Configuration Item: "
-"<literal>APT::Get::Upgrade</literal>."
+"Do not upgrade packages; when used in conjunction with "
+"<literal>install</literal>, <literal>no-upgrade</literal> will prevent "
+"packages on the command line from being upgraded if they are already "
+"installed.  Configuration Item: <literal>APT::Get::Upgrade</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:400
 msgid ""
-"Do not install new packages; when used in conjunction with <literal>install</"
-"literal>, <literal>only-upgrade</literal> will install upgrades for already "
-"installed packages only and ignore requests to install new packages.  "
-"Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."
+"Do not install new packages; when used in conjunction with "
+"<literal>install</literal>, <literal>only-upgrade</literal> will install "
+"upgrades for already installed packages only and ignore requests to install "
+"new packages.  Configuration Item: "
+"<literal>APT::Get::Only-Upgrade</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -943,9 +981,9 @@ msgstr ""
 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>."
+"not be used except in very special situations. Using "
+"<literal>force-yes</literal> can potentially destroy your system! "
+"Configuration Item: <literal>APT::Get::force-yes</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -955,19 +993,20 @@ msgid ""
 "will have the path, the destination file name, the size and the expected MD5 "
 "hash. Note that the file name to write to will not always match the file "
 "name on the remote site! This also works with the <literal>source</literal> "
-"and <literal>update</literal> commands. When used with the <literal>update</"
-"literal> command the MD5 and size are not included, and it is up to the user "
-"to decompress any compressed files.  Configuration Item: <literal>APT::Get::"
-"Print-URIs</literal>."
+"and <literal>update</literal> commands. When used with the "
+"<literal>update</literal> command the MD5 and size are not included, and it "
+"is up to the user to decompress any compressed files.  Configuration Item: "
+"<literal>APT::Get::Print-URIs</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:427
 msgid ""
 "Use purge instead of remove for anything that would be removed.  An asterisk "
-"(\"*\") will be displayed next to packages which are scheduled to be purged. "
-"<option>remove --purge</option> is equivalent to the <option>purge</option> "
-"command.  Configuration Item: <literal>APT::Get::Purge</literal>."
+"(\"*\") will be displayed next to packages which are scheduled to be "
+"purged. <option>remove --purge</option> is equivalent to the "
+"<option>purge</option> command.  Configuration Item: "
+"<literal>APT::Get::Purge</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -984,8 +1023,8 @@ msgid ""
 "turn it off. When it is on, <command>apt-get</command> will automatically "
 "manage the contents of <filename>&statedir;/lists</filename> to ensure that "
 "obsolete files are erased.  The only reason to turn it off is if you "
-"frequently change your sources list.  Configuration Item: <literal>APT::Get::"
-"List-Cleanup</literal>."
+"frequently change your sources list.  Configuration Item: "
+"<literal>APT::Get::List-Cleanup</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -993,22 +1032,24 @@ msgstr ""
 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 "
-"overrides the general settings in <filename>/etc/apt/preferences</"
-"filename>.  Specifically pinned packages are not affected by the value of "
-"this option. In short, this option lets you have simple control over which "
-"distribution packages will be retrieved from. Some common examples might be "
-"<option>-t '2.1*'</option>, <option>-t unstable</option> or <option>-t sid</"
-"option>.  Configuration Item: <literal>APT::Default-Release</literal>; see "
-"also the &apt-preferences; manual page."
+"overrides the general settings in "
+"<filename>/etc/apt/preferences</filename>.  Specifically pinned packages are "
+"not affected by the value of this option. In short, this option lets you "
+"have simple control over which distribution packages will be retrieved "
+"from. Some common examples might be <option>-t '2.1*'</option>, <option>-t "
+"unstable</option> or <option>-t sid</option>.  Configuration Item: "
+"<literal>APT::Default-Release</literal>; see also the &apt-preferences; "
+"manual page."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:465
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
-"related to <option>--assume-yes</option>; where <option>--assume-yes</"
-"option> will answer yes to any prompt, <option>--trivial-only</option> will "
-"answer no.  Configuration Item: <literal>APT::Get::Trivial-Only</literal>."
+"related to <option>--assume-yes</option>; where "
+"<option>--assume-yes</option> will answer yes to any prompt, "
+"<option>--trivial-only</option> will answer no.  Configuration Item: "
+"<literal>APT::Get::Trivial-Only</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1021,30 +1062,31 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:478
 msgid ""
-"If the command is either <literal>install</literal> or <literal>remove</"
-"literal>, then this option acts like running the <literal>autoremove</"
-"literal> command, removing unused dependency packages. Configuration Item: "
-"<literal>APT::Get::AutomaticRemove</literal>."
+"If the command is either <literal>install</literal> or "
+"<literal>remove</literal>, then this option acts like running the "
+"<literal>autoremove</literal> command, removing unused dependency "
+"packages. Configuration Item: <literal>APT::Get::AutomaticRemove</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:485
 msgid ""
-"Only has meaning for the <literal>source</literal> and <literal>build-dep</"
-"literal> commands.  Indicates that the given source names are not to be "
-"mapped through the binary table.  This means that if this option is "
-"specified, these commands will only accept source package names as "
-"arguments, rather than accepting binary package names and looking up the "
-"corresponding source package.  Configuration Item: <literal>APT::Get::Only-"
-"Source</literal>."
+"Only has meaning for the <literal>source</literal> and "
+"<literal>build-dep</literal> commands.  Indicates that the given source "
+"names are not to be mapped through the binary table.  This means that if "
+"this option is specified, these commands will only accept source package "
+"names as arguments, rather than accepting binary package names and looking "
+"up the corresponding source package.  Configuration Item: "
+"<literal>APT::Get::Only-Source</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:496
 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
-"Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</"
-"literal>, and <literal>APT::Get::Tar-Only</literal>."
+"Item: <literal>APT::Get::Diff-Only</literal>, "
+"<literal>APT::Get::Dsc-Only</literal>, and "
+"<literal>APT::Get::Tar-Only</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1058,22 +1100,17 @@ msgstr ""
 #: apt-get.8.xml:507
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
-"is useful for tools like pbuilder.  Configuration Item: <literal>APT::Get::"
-"AllowUnauthenticated</literal>."
+"is useful for tools like pbuilder.  Configuration Item: "
+"<literal>APT::Get::AllowUnauthenticated</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125
-#: apt.conf.5.xml:1156 apt_preferences.5.xml:698
+#: apt-get.8.xml:518 apt-cache.8.xml:343 apt-key.8.xml:174 apt-mark.8.xml:125 apt.conf.5.xml:1156 apt_preferences.5.xml:698
 msgid "Files"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131
-#: apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109
-#: apt.conf.5.xml:1162 apt_preferences.5.xml:705 sources.list.5.xml:252
-#: apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63
-#: apt-ftparchive.1.xml:607
+#: apt-get.8.xml:528 apt-cache.8.xml:350 apt-key.8.xml:195 apt-mark.8.xml:131 apt-secure.8.xml:191 apt-cdrom.8.xml:144 apt-config.8.xml:109 apt.conf.5.xml:1162 apt_preferences.5.xml:705 sources.list.5.xml:252 apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607
 msgid "See Also"
 msgstr ""
 
@@ -1081,14 +1118,12 @@ msgstr ""
 #: apt-get.8.xml:529
 msgid ""
 "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
-"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-"
-"preferences;, the APT Howto."
+"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, "
+"&apt-preferences;, the APT Howto."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:534 apt-cache.8.xml:355 apt-mark.8.xml:135
-#: apt-cdrom.8.xml:149 apt-config.8.xml:114 apt-extracttemplates.1.xml:74
-#: apt-sortpkgs.1.xml:67 apt-ftparchive.1.xml:611
+#: apt-get.8.xml:534 apt-cache.8.xml:355 apt-mark.8.xml:135 apt-cdrom.8.xml:149 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 apt-sortpkgs.1.xml:67 apt-ftparchive.1.xml:611
 msgid "Diagnostics"
 msgstr ""
 
@@ -1121,9 +1156,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:53 apt-cache.8.xml:142 apt-cache.8.xml:163
-#: apt-cache.8.xml:185 apt-cache.8.xml:190 apt-cache.8.xml:206
-#: apt-cache.8.xml:224 apt-cache.8.xml:236
+#: apt-cache.8.xml:53 apt-cache.8.xml:142 apt-cache.8.xml:163 apt-cache.8.xml:185 apt-cache.8.xml:190 apt-cache.8.xml:206 apt-cache.8.xml:224 apt-cache.8.xml:236
 msgid "&synopsis-pkg;"
 msgstr ""
 
@@ -1135,9 +1168,9 @@ msgid ""
 "versions and reverse dependencies of each package listed are listed, as well "
 "as forward dependencies for each version. Forward (normal)  dependencies are "
 "those packages upon which the package in question depends; reverse "
-"dependencies are those packages that depend upon the package in question. "
-"Thus, forward dependencies must be satisfied for a package, but reverse "
-"dependencies need not be.  For instance, <command>apt-cache showpkg "
+"dependencies are those packages that depend upon the package in "
+"question. Thus, forward dependencies must be satisfied for a package, but "
+"reverse dependencies need not be.  For instance, <command>apt-cache showpkg "
 "libreadline2</command> would produce output similar to the following:"
 msgstr ""
 
@@ -1259,8 +1292,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:149
 msgid ""
-"<literal>dump</literal> shows a short listing of every package in the cache. "
-"It is primarily for debugging."
+"<literal>dump</literal> shows a short listing of every package in the "
+"cache. It is primarily for debugging."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1280,8 +1313,9 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:164
 msgid ""
-"<literal>show</literal> performs a function similar to <command>dpkg --print-"
-"avail</command>; it displays the package records for the named packages."
+"<literal>show</literal> performs a function similar to <command>dpkg "
+"--print-avail</command>; it displays the package records for the named "
+"packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
@@ -1334,8 +1368,8 @@ msgid ""
 "This command prints the name of each package APT knows. The optional "
 "argument is a prefix match to filter the name list. The output is suitable "
 "for use in a shell tab complete function and the output is generated "
-"extremely quickly. This command is best used with the <option>--generate</"
-"option> option."
+"extremely quickly. This command is best used with the "
+"<option>--generate</option> option."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1350,13 +1384,13 @@ msgstr ""
 #: apt-cache.8.xml:207
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
-"generates output suitable for use by dotty from the <ulink url=\"http://www."
-"research.att.com/sw/tools/graphviz/\">GraphViz</ulink> package. The result "
-"will be a set of nodes and edges representing the relationships between the "
-"packages. By default the given packages will trace out all dependent "
-"packages; this can produce a very large graph.  To limit the output to only "
-"the packages listed on the command line, set the <literal>APT::Cache::"
-"GivenOnly</literal> option."
+"generates output suitable for use by dotty from the <ulink "
+"url=\"http://www.research.att.com/sw/tools/graphviz/\">GraphViz</ulink> "
+"package. The result will be a set of nodes and edges representing the "
+"relationships between the packages. By default the given packages will trace "
+"out all dependent packages; this can produce a very large graph.  To limit "
+"the output to only the packages listed on the command line, set the "
+"<literal>APT::Cache::GivenOnly</literal> option."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1376,8 +1410,9 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:225
 msgid ""
-"The same as <literal>dotty</literal>, only for xvcg from the <ulink url="
-"\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>."
+"The same as <literal>dotty</literal>, only for xvcg from the <ulink "
+"url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG "
+"tool</ulink>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -1402,16 +1437,16 @@ msgid ""
 "archive management tool, <literal>madison</literal>.  It displays available "
 "versions of a package in a tabular format.  Unlike the original "
 "<literal>madison</literal>, it can only display information for the "
-"architecture for which APT has retrieved package lists (<literal>APT::"
-"Architecture</literal>)."
+"architecture for which APT has retrieved package lists "
+"(<literal>APT::Architecture</literal>)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:253
 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
-"cache used by all operations.  Configuration Item: <literal>Dir::Cache::"
-"pkgcache</literal>."
+"cache used by all operations.  Configuration Item: "
+"<literal>Dir::Cache::pkgcache</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1446,9 +1481,9 @@ msgstr ""
 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>."
+"the specified dependency type.  Configuration Item: "
+"<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></literal> "
+"e.g. <literal>APT::Cache::ShowRecommends</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1462,19 +1497,20 @@ msgstr ""
 #: apt-cache.8.xml:300
 msgid ""
 "Print full records for all available versions. This is the default; to turn "
-"it off, use <option>--no-all-versions</option>.  If <option>--no-all-"
-"versions</option> is specified, only the candidate version will be displayed "
-"(the one which would be selected for installation).  This option is only "
-"applicable to the <literal>show</literal> command.  Configuration Item: "
-"<literal>APT::Cache::AllVersions</literal>."
+"it off, use <option>--no-all-versions</option>.  If "
+"<option>--no-all-versions</option> is specified, only the candidate version "
+"will be displayed (the one which would be selected for installation).  This "
+"option is only applicable to the <literal>show</literal> command.  "
+"Configuration Item: <literal>APT::Cache::AllVersions</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:309
 msgid ""
 "Perform automatic package cache regeneration, rather than use the cache as "
-"it is. This is the default; to turn it off, use <option>--no-generate</"
-"option>.  Configuration Item: <literal>APT::Cache::Generate</literal>."
+"it is. This is the default; to turn it off, use "
+"<option>--no-generate</option>.  Configuration Item: "
+"<literal>APT::Cache::Generate</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1488,8 +1524,8 @@ msgstr ""
 #: apt-cache.8.xml:320
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
-"and missing dependencies.  Configuration Item: <literal>APT::Cache::"
-"AllNames</literal>."
+"and missing dependencies.  Configuration Item: "
+"<literal>APT::Cache::AllNames</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1503,9 +1539,9 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:333
 msgid ""
-"Limit the output of <literal>depends</literal> and <literal>rdepends</"
-"literal> to packages which are currently installed.  Configuration Item: "
-"<literal>APT::Cache::Installed</literal>."
+"Limit the output of <literal>depends</literal> and "
+"<literal>rdepends</literal> to packages which are currently installed.  "
+"Configuration Item: <literal>APT::Cache::Installed</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -1584,8 +1620,8 @@ 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 "
 "shipped in the <literal>archive-keyring</literal> package of your "
-"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
-"Debian."
+"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
+"Ubuntu."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1595,8 +1631,8 @@ msgid ""
 "above, but get the archive keyring from a URI instead and validate it "
 "against a master key.  This requires an installed &wget; and an APT build "
 "configured to have a server to fetch from and a master keyring to validate.  "
-"APT in Debian does not support this command, relying on <command>update</"
-"command> instead, but Ubuntu's APT does."
+"APT in Debian does not support this command, relying on "
+"<command>update</command> instead, but Ubuntu's APT does."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
@@ -1617,9 +1653,9 @@ 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 "
 "<filename>trusted.gpg</filename> file as well as on all parts in the "
-"<filename>trusted.gpg.d</filename> directory, though <filename>trusted.gpg</"
-"filename> is the primary keyring which means that e.g. new keys are added to "
-"this one."
+"<filename>trusted.gpg.d</filename> directory, though "
+"<filename>trusted.gpg</filename> is the primary keyring which means that "
+"e.g. new keys are added to this one."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -1634,23 +1670,22 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-key.8.xml:183
-msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:184
-msgid "Keyring of Debian archive trusted keys."
+msgid "Keyring of Ubuntu archive trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-key.8.xml:187
-msgid ""
-"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:188
-msgid "Keyring of Debian archive removed trusted keys."
+msgid "Keyring of Ubuntu archive removed trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -1701,9 +1736,9 @@ msgstr ""
 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."
+"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 ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1829,8 +1864,8 @@ msgid ""
 "files are then computed and put into the Release file. The Release file is "
 "then signed by the archive key for this Debian release, and distributed "
 "alongside the packages and the Packages files on Debian mirrors. The keys "
-"are in the Debian archive keyring available in the <package>debian-archive-"
-"keyring</package> package."
+"are in the Debian archive keyring available in the "
+"<package>debian-archive-keyring</package> package."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -1872,8 +1907,8 @@ msgstr ""
 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."
+"sign the Release files. In any case, this mechanism can complement a "
+"per-package signature."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
@@ -1895,10 +1930,10 @@ msgstr ""
 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 "
-"it with <command>apt-key</command> and then run <command>apt-get update</"
-"command> so that apt can download and verify the <filename>InRelease</"
-"filename> or <filename>Release.gpg</filename> files from the archives you "
-"have configured."
+"it with <command>apt-key</command> and then run <command>apt-get "
+"update</command> so that apt can download and verify the "
+"<filename>InRelease</filename> or <filename>Release.gpg</filename> files "
+"from the archives you have configured."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
@@ -1917,16 +1952,16 @@ msgstr ""
 #: apt-secure.8.xml:169
 msgid ""
 "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
-"already. You can do this by running <command>apt-ftparchive release</"
-"command> (provided in apt-utils)."
+"already. You can do this by running <command>apt-ftparchive "
+"release</command> (provided in apt-utils)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: apt-secure.8.xml:174
 msgid ""
-"<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
-"clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
-"gpg Release</command>."
+"<emphasis>Sign it</emphasis>. You can do this by running <command>gpg "
+"--clearsign -o InRelease Release</command> and <command>gpg -abs -o "
+"Release.gpg Release</command>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
@@ -1955,12 +1990,12 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:197
 msgid ""
-"For more background information you might want to review the <ulink url="
-"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
+"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."
+"(available also in the harden-doc package) and the <ulink "
+"url=\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong "
+"Distribution HOWTO</ulink> by V. Alex Brennen."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
@@ -1985,8 +2020,8 @@ msgstr ""
 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 "
-"the structure of the disc as well as correcting for several possible mis-"
-"burns and verifying the index files."
+"the structure of the disc as well as correcting for several possible "
+"mis-burns and verifying the index files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -2011,8 +2046,8 @@ msgstr ""
 #: apt-cdrom.8.xml:64
 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</"
-"filename>"
+"maintains a database of these IDs in "
+"<filename>&statedir;/cdroms.list</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2042,8 +2077,8 @@ msgstr ""
 #: apt-cdrom.8.xml:103
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
-"unmounting the mount point.  Configuration Item: <literal>APT::CDROM::"
-"NoMount</literal>."
+"unmounting the mount point.  Configuration Item: "
+"<literal>APT::CDROM::NoMount</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2100,11 +2135,11 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-config.8.xml:51
 msgid ""
-"shell is used to access the configuration information from a shell script. "
-"It is given pairs of arguments, the first being a shell variable and the "
-"second the configuration value to query. As output it lists shell assignment "
-"commands for each value present.  In a shell script it should be used as "
-"follows:"
+"shell is used to access the configuration information from a shell "
+"script. It is given pairs of arguments, the first being a shell variable and "
+"the second the configuration value to query. As output it lists shell "
+"assignment commands for each value present.  In a shell script it should be "
+"used as follows:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
@@ -2119,8 +2154,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-config.8.xml:64
 msgid ""
-"This will set the shell environment variable $OPTS to the value of MyApp::"
-"options with a default of <option>-f</option>."
+"This will set the shell environment variable $OPTS to the value of "
+"MyApp::options with a default of <option>-f</option>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2139,8 +2174,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-config.8.xml:90
 msgid ""
-"Include options which have an empty value. This is the default, so use --no-"
-"empty to remove them from the output."
+"Include options which have an empty value. This is the default, so use "
+"--no-empty to remove them from the output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
@@ -2160,8 +2195,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:110 apt-extracttemplates.1.xml:71 apt-sortpkgs.1.xml:64
-#: apt-ftparchive.1.xml:608
+#: apt-config.8.xml:110 apt-extracttemplates.1.xml:71 apt-sortpkgs.1.xml:64 apt-ftparchive.1.xml:608
 msgid "&apt-conf;"
 msgstr ""
 
@@ -2222,15 +2256,14 @@ msgid ""
 "order which have either no or \"<literal>conf</literal>\" as filename "
 "extension and which only contain alphanumeric, hyphen (-), underscore (_) "
 "and period (.) characters.  Otherwise APT will print a notice that it has "
-"ignored a file, unless that file matches a pattern in the <literal>Dir::"
-"Ignore-Files-Silently</literal> configuration list - in which case it will "
-"be silently ignored."
+"ignored a file, unless that file matches a pattern in the "
+"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in which "
+"case it will be silently ignored."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
 #: apt.conf.5.xml:59
-msgid ""
-"the main configuration file specified by <literal>Dir::Etc::main</literal>"
+msgid "the main configuration file specified by <literal>Dir::Etc::main</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
@@ -2260,11 +2293,11 @@ msgstr ""
 msgid ""
 "Syntactically the configuration language is modeled after what the ISC tools "
 "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
-"treated as comments (ignored), as well as all text between <literal>/*</"
-"literal> and <literal>*/</literal>, just like C/C++ comments.  Each line is "
-"of the form <literal>APT::Get::Assume-Yes \"true\";</literal>.  The "
-"quotation marks and trailing semicolon are required.  The value must be on "
-"one line, and there is no kind of string concatenation.  Values must not "
+"treated as comments (ignored), as well as all text between "
+"<literal>/*</literal> and <literal>*/</literal>, just like C/C++ comments.  "
+"Each line is of the form <literal>APT::Get::Assume-Yes \"true\";</literal>.  "
+"The quotation marks and trailing semicolon are required.  The value must be "
+"on one line, and there is no kind of string concatenation.  Values must not "
 "include backslashes or extra quotation marks.  Option names are made up of "
 "alphanumeric characters and the characters \"/-:._+\".  A new scope can be "
 "opened with curly braces, like this:"
@@ -2299,8 +2332,9 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:101
 msgid ""
-"In general the sample configuration file in <filename>&docdir;examples/apt."
-"conf</filename> &configureindex; is a good guide for how it should look."
+"In general the sample configuration file in "
+"<filename>&docdir;examples/apt.conf</filename> &configureindex; is a good "
+"guide for how it should look."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -2365,10 +2399,10 @@ msgid ""
 "like every other option with a name. This introduces many problems; for one "
 "thing, users who write multiple lines in this <emphasis>wrong</emphasis> "
 "syntax in the hope of appending to a list will achieve the opposite, as only "
-"the last assignment for this option \"<literal>::</literal>\" will be used. "
-"Future versions of APT will raise errors and stop working if they encounter "
-"this misuse, so please correct such statements now while APT doesn't "
-"explicitly complain about them."
+"the last assignment for this option \"<literal>::</literal>\" will be "
+"used. Future versions of APT will raise errors and stop working if they "
+"encounter this misuse, so please correct such statements now while APT "
+"doesn't explicitly complain about them."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
@@ -2399,9 +2433,10 @@ msgid ""
 "instruction set are also able to execute binaries compiled for the "
 "<literal>i386</literal> (<literal>x86</literal>) instruction set. This list "
 "is used when fetching files and parsing package lists. The initial default "
-"is always the system's native architecture (<literal>APT::Architecture</"
-"literal>), and foreign architectures are added to the default list when they "
-"are registered via <command>dpkg --add-architecture</command>."
+"is always the system's native architecture "
+"(<literal>APT::Architecture</literal>), and foreign architectures are added "
+"to the default list when they are registered via <command>dpkg "
+"--add-architecture</command>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2499,10 +2534,11 @@ msgid ""
 "of 1048576 (~1 MB) how much the cache size will be increased in the event "
 "the space defined by <literal>Cache-Start</literal> is not enough. This "
 "value will be applied again and again until either the cache is big enough "
-"to store all information or the size of the cache reaches the <literal>Cache-"
-"Limit</literal>.  The default of <literal>Cache-Limit</literal> is 0 which "
-"stands for no limit.  If <literal>Cache-Grow</literal> is set to 0 the "
-"automatic growth of the cache is disabled."
+"to store all information or the size of the cache reaches the "
+"<literal>Cache-Limit</literal>.  The default of "
+"<literal>Cache-Limit</literal> is 0 which stands for no limit.  If "
+"<literal>Cache-Grow</literal> is set to 0 the automatic growth of the cache "
+"is disabled."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2575,10 +2611,10 @@ 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."
+"(local) mirror of a more frequently updated archive with a "
+"<literal>Valid-Until</literal> header instead of completely disabling the "
+"expiration date checking.  Archive specific settings can and should be used "
+"by appending the label of the archive to the option name."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2594,20 +2630,21 @@ msgstr ""
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: "
 "<literal>FileLimit</literal> can be used to specify a maximum number of "
-"PDiff files should be downloaded to update a file. <literal>SizeLimit</"
-"literal> on the other hand is the maximum percentage of the size of all "
-"patches compared to the size of the targeted file. If one of these limits is "
-"exceeded the complete file is downloaded instead of the patches."
+"PDiff files should be downloaded to update a "
+"file. <literal>SizeLimit</literal> on the other hand is the maximum "
+"percentage of the size of all patches compared to the size of the targeted "
+"file. If one of these limits is exceeded the complete file is downloaded "
+"instead of the patches."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:341
 msgid ""
-"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
-"literal> or <literal>access</literal> which determines how APT parallelizes "
-"outgoing connections. <literal>host</literal> means that one connection per "
-"target host will be opened, <literal>access</literal> means that one "
-"connection per URI type will be opened."
+"Queuing mode; <literal>Queue-Mode</literal> can be one of "
+"<literal>host</literal> or <literal>access</literal> which determines how "
+"APT parallelizes outgoing connections. <literal>host</literal> means that "
+"one connection per target host will be opened, <literal>access</literal> "
+"means that one connection per URI type will be opened."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2627,9 +2664,10 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:359
 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]/</"
-"literal>.  Per host proxies can also be specified by using the form "
+"<literal>http::Proxy</literal> sets the default proxy to use for HTTP "
+"URIs. It is in the standard form of "
+"<literal>http://[[user][:pass]@]host[:port]/</literal>.  Per host proxies "
+"can also be specified by using the form "
 "<literal>http::Proxy::&lt;host&gt;</literal> with the special keyword "
 "<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
 "settings is specified, <envar>http_proxy</envar> environment variable will "
@@ -2659,12 +2697,12 @@ msgstr ""
 #: apt.conf.5.xml:380
 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."
+"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial "
+"e.g. on high-latency connections. It specifies how many requests are sent in "
+"a pipeline.  Previous APT versions had a default of 10 for this setting, but "
+"the default value is now 0 (= disabled) to avoid problems with the "
+"ever-growing amount of webservers and proxies which choose to not conform to "
+"the HTTP/1.1 specification."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2677,11 +2715,11 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:390
 msgid ""
-"The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
-"literal> which accepts integer values in kilobytes. The default value is 0 "
-"which deactivates the limit and tries to use all available bandwidth (note "
-"that this option implicitly disables downloading from multiple servers at "
-"the same time.)"
+"The used bandwidth can be limited with "
+"<literal>Acquire::http::Dl-Limit</literal> which accepts integer values in "
+"kilobytes. The default value is 0 which deactivates the limit and tries to "
+"use all available bandwidth (note that this option implicitly disables "
+"downloading from multiple servers at the same time.)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2710,38 +2748,42 @@ msgid ""
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
 "corresponding per-host option.  <literal>Verify-Peer</literal> boolean "
 "suboption determines whether or not the server's host certificate should be "
-"verified against trusted certificates.  <literal>&lt;host&gt;::Verify-Peer</"
-"literal> is the corresponding per-host option.  <literal>Verify-Host</"
-"literal> boolean suboption determines whether or not the server's hostname "
-"should be verified.  <literal>&lt;host&gt;::Verify-Host</literal> is the "
-"corresponding per-host option.  <literal>SslCert</literal> determines what "
-"certificate to use for client authentication. <literal>&lt;host&gt;::"
-"SslCert</literal> is the corresponding per-host option.  <literal>SslKey</"
-"literal> determines what private key to use for client authentication. "
-"<literal>&lt;host&gt;::SslKey</literal> is the corresponding per-host "
-"option.  <literal>SslForceVersion</literal> overrides default SSL version to "
-"use.  It can contain either of the strings '<literal>TLSv1</literal>' or "
-"'<literal>SSLv3</literal>'.  <literal>&lt;host&gt;::SslForceVersion</"
-"literal> is the corresponding per-host option."
+"verified against trusted certificates.  "
+"<literal>&lt;host&gt;::Verify-Peer</literal> is the corresponding per-host "
+"option.  <literal>Verify-Host</literal> boolean suboption determines whether "
+"or not the server's hostname should be verified.  "
+"<literal>&lt;host&gt;::Verify-Host</literal> is the corresponding per-host "
+"option.  <literal>SslCert</literal> determines what certificate to use for "
+"client authentication. <literal>&lt;host&gt;::SslCert</literal> is the "
+"corresponding per-host option.  <literal>SslKey</literal> determines what "
+"private key to use for client "
+"authentication. <literal>&lt;host&gt;::SslKey</literal> is the corresponding "
+"per-host option.  <literal>SslForceVersion</literal> overrides default SSL "
+"version to use.  It can contain either of the strings "
+"'<literal>TLSv1</literal>' or '<literal>SSLv3</literal>'.  "
+"<literal>&lt;host&gt;::SslForceVersion</literal> is the corresponding "
+"per-host option."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:432
 msgid ""
 "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
-"It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
-"literal>.  Per host proxies can also be specified by using the form "
+"It is in the standard form of "
+"<literal>ftp://[[user][:pass]@]host[:port]/</literal>.  Per host proxies can "
+"also be specified by using the form "
 "<literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
 "<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
 "settings is specified, <envar>ftp_proxy</envar> environment variable will be "
-"used. To use an FTP proxy you will have to set the <literal>ftp::ProxyLogin</"
-"literal> script in the configuration file. This entry specifies the commands "
-"to send to tell the proxy server what to connect to. Please see "
-"&configureindex; for an example of how to do this. The substitution "
-"variables representing the corresponding URI component are <literal>"
-"$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, <literal>"
-"$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</"
-"literal> and <literal>$(SITE_PORT)</literal>."
+"used. To use an FTP proxy you will have to set the "
+"<literal>ftp::ProxyLogin</literal> script in the configuration file. This "
+"entry specifies the commands to send to tell the proxy server what to "
+"connect to. Please see &configureindex; for an example of how to do "
+"this. The substitution variables representing the corresponding URI "
+"component are <literal>$(PROXY_USER)</literal>, "
+"<literal>$(PROXY_PASS)</literal>, <literal>$(SITE_USER)</literal>, "
+"<literal>$(SITE_PASS)</literal>, <literal>$(SITE)</literal> and "
+"<literal>$(SITE_PORT)</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2757,10 +2799,11 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:459
 msgid ""
-"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
-"envar> environment variable to an HTTP URL - see the discussion of the http "
-"method above for syntax. You cannot set this in the configuration file and "
-"it is not recommended to use FTP over HTTP due to its low efficiency."
+"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 method above for syntax. You cannot set this in the "
+"configuration file and it is not recommended to use FTP over HTTP due to its "
+"low efficiency."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2795,14 +2838,17 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:486
 msgid ""
-"For GPGV URIs the only configurable option is <literal>gpgv::Options</"
-"literal>, which passes additional parameters to gpgv."
+"For GPGV URIs the only configurable option is "
+"<literal>gpgv::Options</literal>, which passes additional parameters to "
+"gpgv."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
 #: apt.conf.5.xml:497
 #, no-wrap
-msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
+msgid ""
+"Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> "
+"\"<replaceable>Methodname</replaceable>\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2811,10 +2857,10 @@ msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
 "compression formats.  By default the acquire methods can decompress "
-"<command>bzip2</command>, <command>lzma</command> and <command>gzip</"
-"command> compressed files; with this setting more formats can be added on "
-"the fly or the used method can be changed. The syntax for this is: "
-"<placeholder type=\"synopsis\" id=\"0\"/>"
+"<command>bzip2</command>, <command>lzma</command> and "
+"<command>gzip</command> compressed files; with this setting more formats can "
+"be added on the fly or the used method can be changed. The syntax for this "
+"is: <placeholder type=\"synopsis\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
@@ -2837,10 +2883,10 @@ msgid ""
 "acquire system will try the first and proceed with the next compression type "
 "in this list on error, so to prefer one over the other type simply add the "
 "preferred type first - default types not already added will be implicitly "
-"appended to the end of the list, so e.g. <placeholder type=\"synopsis\" id="
-"\"0\"/> can be used to prefer <command>gzip</command> compressed files over "
-"<command>bzip2</command> and <command>lzma</command>.  If <command>lzma</"
-"command> should be preferred over <command>gzip</command> and "
+"appended to the end of the list, so e.g. <placeholder type=\"synopsis\" "
+"id=\"0\"/> can be used to prefer <command>gzip</command> compressed files "
+"over <command>bzip2</command> and <command>lzma</command>.  If "
+"<command>lzma</command> should be preferred over <command>gzip</command> and "
 "<command>bzip2</command> the configure setting should look like this: "
 "<placeholder type=\"synopsis\" id=\"1\"/> It is not needed to add "
 "<literal>bz2</literal> to the list explicitly as it will be added "
@@ -2856,16 +2902,17 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:507
 msgid ""
-"Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
-"literal> will be checked at run time. If this option has been set, the "
-"method will only be used if this file exists; e.g. for the <literal>bzip2</"
-"literal> method (the inbuilt) setting is: <placeholder type=\"literallayout"
-"\" id=\"0\"/> Note also that list entries specified on the command line will "
-"be added at the end of the list specified in the configuration files, but "
-"before the default entries. To prefer a type in this case over the ones "
-"specified in the configuration files you can set the option direct - not in "
-"list style.  This will not override the defined list; it will only prefix "
-"the list with this type."
+"Note that the "
+"<literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will be "
+"checked at run time. If this option has been set, the method will only be "
+"used if this file exists; e.g. for the <literal>bzip2</literal> method (the "
+"inbuilt) setting is: <placeholder type=\"literallayout\" id=\"0\"/> Note "
+"also that list entries specified on the command line will be added at the "
+"end of the list specified in the configuration files, but before the default "
+"entries. To prefer a type in this case over the ones specified in the "
+"configuration files you can set the option direct - not in list style.  This "
+"will not override the defined list; it will only prefix the list with this "
+"type."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2889,10 +2936,10 @@ msgstr ""
 #: apt.conf.5.xml:532
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
-"files are downloaded and in which order APT tries to display the description-"
-"translations. APT will try to display the first available description in the "
-"language which is listed first. Languages can be defined with their short or "
-"long language codes. Note that not all archives provide "
+"files are downloaded and in which order APT tries to display the "
+"description-translations. APT will try to display the first available "
+"description in the language which is listed first. Languages can be defined "
+"with their short or long language codes. Note that not all archives provide "
 "<filename>Translation</filename> files for every language - the long "
 "language codes are especially rare."
 msgstr ""
@@ -2906,23 +2953,23 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:537
 msgid ""
-"The default list includes \"environment\" and \"en\". "
-"\"<literal>environment</literal>\" has a special meaning here: it will be "
-"replaced at runtime with the language codes extracted from the "
+"The default list includes \"environment\" and "
+"\"en\". \"<literal>environment</literal>\" has a special meaning here: it "
+"will be replaced at runtime with the language codes extracted from the "
 "<literal>LC_MESSAGES</literal> environment variable.  It will also ensure "
 "that these codes are not included twice in the list. If "
 "<literal>LC_MESSAGES</literal> is set to \"C\" only the "
 "<filename>Translation-en</filename> file (if available) will be used.  To "
-"force APT to use no Translation file use the setting <literal>Acquire::"
-"Languages=none</literal>. \"<literal>none</literal>\" is another special "
-"meaning code which will stop the search for a suitable "
+"force APT to use no Translation file use the setting "
+"<literal>Acquire::Languages=none</literal>. \"<literal>none</literal>\" is "
+"another special meaning code which will stop the search for a suitable "
 "<filename>Translation</filename> file.  This tells APT to download these "
 "translations too, without actually using them unless the environment "
 "specifies the languages. So the following example configuration will result "
-"in the order \"en, de\" in an English locale or \"de, en\" in a German one. "
-"Note that \"fr\" is downloaded, but not used unless APT is used in a French "
-"locale (where the order would be \"fr, de, en\").  <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"in the order \"en, de\" in an English locale or \"de, en\" in a German "
+"one. Note that \"fr\" is downloaded, but not used unless APT is used in a "
+"French locale (where the order would be \"fr, de, en\").  <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2931,7 +2978,8 @@ msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
 "files which are found in <filename>/var/lib/apt/lists/</filename> will be "
-"added to the end of the list (after an implicit \"<literal>none</literal>\")."
+"added to the end of the list (after an implicit "
+"\"<literal>none</literal>\")."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
@@ -2985,12 +3033,13 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:588
 msgid ""
-"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
-"Bin::Methods</literal> specifies the location of the method handlers and "
-"<literal>gzip</literal>, <literal>bzip2</literal>, <literal>lzma</literal>, "
-"<literal>dpkg</literal>, <literal>apt-get</literal> <literal>dpkg-source</"
-"literal> <literal>dpkg-buildpackage</literal> and <literal>apt-cache</"
-"literal> specify the location of the respective programs."
+"Binary programs are pointed to by "
+"<literal>Dir::Bin</literal>. <literal>Dir::Bin::Methods</literal> specifies "
+"the location of the method handlers and <literal>gzip</literal>, "
+"<literal>bzip2</literal>, <literal>lzma</literal>, <literal>dpkg</literal>, "
+"<literal>apt-get</literal> <literal>dpkg-source</literal> "
+"<literal>dpkg-buildpackage</literal> and <literal>apt-cache</literal> "
+"specify the location of the respective programs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -3000,10 +3049,10 @@ msgid ""
 "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 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>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -3011,10 +3060,10 @@ msgstr ""
 msgid ""
 "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
 "which files APT should silently ignore while parsing the files in the "
-"fragment directories. Per default a file which end with <literal>.disabled</"
-"literal>, <literal>~</literal>, <literal>.bak</literal> or <literal>.dpkg-[a-"
-"z]+</literal> is silently ignored. As seen in the last default value these "
-"patterns can use regular expression syntax."
+"fragment directories. Per default a file which end with "
+"<literal>.disabled</literal>, <literal>~</literal>, <literal>.bak</literal> "
+"or <literal>.dpkg-[a-z]+</literal> is silently ignored. As seen in the last "
+"default value these patterns can use regular expression syntax."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
@@ -3034,13 +3083,14 @@ msgstr ""
 #: apt.conf.5.xml:625
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
-"<literal>prompt</literal>, <literal>auto</literal>, <literal>pre-auto</"
-"literal> and <literal>never</literal>.  <literal>always</literal> and "
-"<literal>prompt</literal> will remove all packages from the cache after "
-"upgrading, <literal>prompt</literal> (the default) does so conditionally.  "
-"<literal>auto</literal> removes only those packages which are no longer "
-"downloadable (replaced with a new version for instance).  <literal>pre-auto</"
-"literal> performs this action before downloading new packages."
+"<literal>prompt</literal>, <literal>auto</literal>, "
+"<literal>pre-auto</literal> and <literal>never</literal>.  "
+"<literal>always</literal> and <literal>prompt</literal> will remove all "
+"packages from the cache after upgrading, <literal>prompt</literal> (the "
+"default) does so conditionally.  <literal>auto</literal> removes only those "
+"packages which are no longer downloadable (replaced with a new version for "
+"instance).  <literal>pre-auto</literal> performs this action before "
+"downloading new packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -3108,9 +3158,10 @@ msgstr ""
 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 2 is enabled by setting <literal>DPkg::Tools::"
-"options::cmd::Version</literal> to 2. <literal>cmd</literal> is a command "
-"given to <literal>Pre-Install-Pkgs</literal>."
+"being changed. Version 2 is enabled by setting "
+"<literal>DPkg::Tools::options::cmd::Version</literal> to "
+"2. <literal>cmd</literal> is a command given to "
+"<literal>Pre-Install-Pkgs</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -3188,28 +3239,30 @@ msgstr ""
 #: apt.conf.5.xml:729
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
-"and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
-"\", which causes APT to configure all packages. The \"<literal>smart</"
-"literal>\" way is to configure only packages which need to be configured "
-"before another package can be unpacked (Pre-Depends), and let the rest be "
-"configured by &dpkg; with a call generated by the ConfigurePending option "
-"(see below). On the other hand, \"<literal>no</literal>\" will not configure "
-"anything, and totally relies on &dpkg; for configuration (which at the "
-"moment will fail if a Pre-Depends is encountered). Setting this option to "
-"any value other than <literal>all</literal> will implicitly also activate "
-"the next option by default, as otherwise the system could end in an "
-"unconfigured and potentially unbootable state."
+"and \"<literal>no</literal>\".  The default value is "
+"\"<literal>all</literal>\", which causes APT to configure all packages. The "
+"\"<literal>smart</literal>\" way is to configure only packages which need to "
+"be configured before another package can be unpacked (Pre-Depends), and let "
+"the rest be configured by &dpkg; with a call generated by the "
+"ConfigurePending option (see below). On the other hand, "
+"\"<literal>no</literal>\" will not configure anything, and totally relies on "
+"&dpkg; for configuration (which at the moment will fail if a Pre-Depends is "
+"encountered). Setting this option to any value other than "
+"<literal>all</literal> will implicitly also activate the next option by "
+"default, as otherwise the system could end in an unconfigured and "
+"potentially unbootable state."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:744
 msgid ""
-"If this option is set APT will call <command>dpkg --configure --pending</"
-"command> to let &dpkg; handle all required configurations and triggers. This "
-"option is activated automatically per default if the previous option is not "
-"set to <literal>all</literal>, but deactivating it could be useful if you "
-"want to run APT multiple times in a row - e.g. in an installer. In these "
-"sceneries you could deactivate this option in all but the last run."
+"If this option is set APT will call <command>dpkg --configure "
+"--pending</command> to let &dpkg; handle all required configurations and "
+"triggers. This option is activated automatically per default if the previous "
+"option is not set to <literal>all</literal>, but deactivating it could be "
+"useful if you want to run APT multiple times in a row - e.g. in an "
+"installer. In these sceneries you could deactivate this option in all but "
+"the last run."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
@@ -3219,7 +3272,8 @@ msgid ""
 "pending triggers is not considered as <literal>installed</literal>, and "
 "&dpkg; treats them as <literal>unpacked</literal> currently which is a "
 "showstopper for Pre-Dependencies (see debbugs #526774). Note that this will "
-"process all triggers, not only the triggers needed to configure this package."
+"process all triggers, not only the triggers needed to configure this "
+"package."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
@@ -3239,13 +3293,13 @@ msgstr ""
 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 "
-"process as these configure calls also currently require <literal>DPkg::"
-"TriggersPending</literal> which will run quite a few triggers (which may not "
-"be needed). Essentials get per default a high score but the immediate flag "
-"is relatively low (a package which has a Pre-Depends is rated higher).  "
-"These option and the others in the same group can be used to change the "
-"scoring. The following example shows the settings with their default "
-"values.  <placeholder type=\"literallayout\" id=\"0\"/>"
+"process as these configure calls also currently require "
+"<literal>DPkg::TriggersPending</literal> which will run quite a few triggers "
+"(which may not be needed). Essentials get per default a high score but the "
+"immediate flag is relatively low (a package which has a Pre-Depends is rated "
+"higher).  These option and the others in the same group can be used to "
+"change the scoring. The following example shows the settings with their "
+"default values.  <placeholder type=\"literallayout\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
@@ -3273,25 +3327,25 @@ msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
 "utilizing the <literal>apt</literal> libraries, or enable special program "
-"modes that are primarily useful for debugging the behavior of <literal>apt</"
-"literal>.  Most of these options are not interesting to a normal user, but a "
-"few may be:"
+"modes that are primarily useful for debugging the behavior of "
+"<literal>apt</literal>.  Most of these options are not interesting to a "
+"normal user, but a few may be:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: apt.conf.5.xml:799
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
-"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
-"literal>."
+"decisions made by <literal>dist-upgrade, upgrade, install, remove, "
+"purge</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: apt.conf.5.xml:807
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
-"used to run some operations (for instance, <literal>apt-get -s install</"
-"literal>) as a non-root user."
+"used to run some operations (for instance, <literal>apt-get -s "
+"install</literal>) as a non-root user."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
@@ -3318,8 +3372,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:843
-msgid ""
-"Print information related to accessing <literal>cdrom://</literal> sources."
+msgid "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -3359,8 +3412,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:918
 msgid ""
-"Output each cryptographic hash that is generated by the <literal>apt</"
-"literal> libraries."
+"Output each cryptographic hash that is generated by the "
+"<literal>apt</literal> libraries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -3406,8 +3459,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:994
-msgid ""
-"Log all interactions with the sub-processes that actually perform downloads."
+msgid "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -3421,28 +3473,28 @@ msgstr ""
 #: apt.conf.5.xml:1015
 msgid ""
 "Generate debug messages describing which packages are being automatically "
-"installed to resolve dependencies.  This corresponds to the initial auto-"
-"install pass performed in, e.g., <literal>apt-get install</literal>, and not "
-"to the full <literal>apt</literal> dependency resolver; see <literal>Debug::"
-"pkgProblemResolver</literal> for that."
+"installed to resolve dependencies.  This corresponds to the initial "
+"auto-install pass performed in, e.g., <literal>apt-get install</literal>, "
+"and not to the full <literal>apt</literal> dependency resolver; see "
+"<literal>Debug::pkgProblemResolver</literal> for that."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1029
 msgid ""
-"Generate debug messages describing which packages are marked as keep/install/"
-"remove while the ProblemResolver does his work.  Each addition or deletion "
-"may trigger additional actions; they are shown indented two additional "
-"spaces under the original entry.  The format for each line is "
+"Generate debug messages describing which packages are marked as "
+"keep/install/remove while the ProblemResolver does his work.  Each addition "
+"or deletion may trigger additional actions; they are shown indented two "
+"additional spaces under the original entry.  The format for each line is "
 "<literal>MarkKeep</literal>, <literal>MarkDelete</literal> or "
-"<literal>MarkInstall</literal> followed by <literal>package-name &lt;a.b.c -"
-"&gt; d.e.f | x.y.z&gt; (section)</literal> where <literal>a.b.c</literal> is "
-"the current version of the package, <literal>d.e.f</literal> is the version "
-"considered for installation and <literal>x.y.z</literal> is a newer version, "
-"but not considered for installation (because of a low pin score). The later "
-"two can be omitted if there is none or if it is the same as the installed "
-"version.  <literal>section</literal> is the name of the section the package "
-"appears in."
+"<literal>MarkInstall</literal> followed by <literal>package-name &lt;a.b.c "
+"-&gt; d.e.f | x.y.z&gt; (section)</literal> where <literal>a.b.c</literal> "
+"is the current version of the package, <literal>d.e.f</literal> is the "
+"version considered for installation and <literal>x.y.z</literal> is a newer "
+"version, but not considered for installation (because of a low pin "
+"score). The later two can be omitted if there is none or if it is the same "
+"as the installed version.  <literal>section</literal> is the name of the "
+"section the package appears in."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -3468,8 +3520,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1084
-msgid ""
-"Output status messages tracing the steps performed when invoking &dpkg;."
+msgid "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -3495,13 +3546,12 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1128
 msgid ""
-"Print information about the vendors read from <filename>/etc/apt/vendors."
-"list</filename>."
+"Print information about the vendors read from "
+"<filename>/etc/apt/vendors.list</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1150 apt_preferences.5.xml:545 sources.list.5.xml:211
-#: apt-ftparchive.1.xml:596
+#: apt.conf.5.xml:1150 apt_preferences.5.xml:545 sources.list.5.xml:211 apt-ftparchive.1.xml:596
 msgid "Examples"
 msgstr ""
 
@@ -3574,12 +3624,12 @@ msgstr ""
 msgid ""
 "Note that the files in the <filename>/etc/apt/preferences.d</filename> "
 "directory are parsed in alphanumeric ascending order and need to obey the "
-"following naming convention: The files have either no or \"<literal>pref</"
-"literal>\" as filename extension and only contain alphanumeric, hyphen (-), "
-"underscore (_) and period (.) characters.  Otherwise APT will print a notice "
-"that it has ignored a file, unless that file matches a pattern in the "
-"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in which "
-"case it will be silently ignored."
+"following naming convention: The files have either no or "
+"\"<literal>pref</literal>\" as filename extension and only contain "
+"alphanumeric, hyphen (-), underscore (_) and period (.) characters.  "
+"Otherwise APT will print a notice that it has ignored a file, unless that "
+"file matches a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
+"configuration list - in which case it will be silently ignored."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
@@ -3590,7 +3640,9 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #: apt_preferences.5.xml:94
 #, no-wrap
-msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
+msgid ""
+"<command>apt-get install -t testing "
+"<replaceable>some-package</replaceable></command>\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
@@ -3609,10 +3661,11 @@ msgid ""
 "receives a higher priority than other distributions do by default.  The "
 "target release can be set on the <command>apt-get</command> command line or "
 "in the APT configuration file <filename>/etc/apt/apt.conf</filename>.  Note "
-"that this has precedence over any general priority you set in the <filename>/"
-"etc/apt/preferences</filename> file described later, but not over "
-"specifically pinned packages.  For example, <placeholder type="
-"\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>"
+"that this has precedence over any general priority you set in the "
+"<filename>/etc/apt/preferences</filename> file described later, but not over "
+"specifically pinned packages.  For example, <placeholder "
+"type=\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" "
+"id=\"1\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
@@ -3630,9 +3683,9 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #: apt_preferences.5.xml:107
 msgid ""
-"to the versions coming from archives which in their <filename>Release</"
-"filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
-"emphasis> as \"ButAutomaticUpgrades: yes\" like the Debian "
+"to the versions coming from archives which in their "
+"<filename>Release</filename> files are marked as \"NotAutomatic: yes\" but "
+"<emphasis>not</emphasis> as \"ButAutomaticUpgrades: yes\" like the Debian "
 "<literal>experimental</literal> archive."
 msgstr ""
 
@@ -3669,8 +3722,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #: apt_preferences.5.xml:127
-msgid ""
-"to the versions that are not installed and belong to the target release."
+msgid "to the versions that are not installed and belong to the target release."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
@@ -3717,8 +3769,8 @@ msgstr ""
 #: apt_preferences.5.xml:152
 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</"
-"literal> option is given, install the uninstalled one."
+"the packages differ in some of their metadata or the "
+"<literal>--reinstall</literal> option is given, install the uninstalled one."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
@@ -3727,8 +3779,9 @@ 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 "
 "the &sources-list; file (priority 500 or 990).  Then the package will be "
-"upgraded when <command>apt-get install <replaceable>some-package</"
-"replaceable></command> or <command>apt-get upgrade</command> is executed."
+"upgraded when <command>apt-get install "
+"<replaceable>some-package</replaceable></command> or <command>apt-get "
+"upgrade</command> is executed."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
@@ -3736,8 +3789,9 @@ msgstr ""
 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 "
-"downgraded when <command>apt-get install <replaceable>some-package</"
-"replaceable></command> or <command>apt-get upgrade</command> is executed."
+"downgraded when <command>apt-get install "
+"<replaceable>some-package</replaceable></command> or <command>apt-get "
+"upgrade</command> is executed."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
@@ -3837,16 +3891,16 @@ msgid ""
 "This should <emphasis>not</emphasis> be confused with the Origin of a "
 "distribution as specified in a <filename>Release</filename> file.  What "
 "follows the \"Origin:\" tag in a <filename>Release</filename> file is not an "
-"Internet address but an author or vendor name, such as \"Debian\" or \"Ximian"
-"\"."
+"Internet address but an author or vendor name, such as \"Debian\" or "
+"\"Ximian\"."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #: apt_preferences.5.xml:229
 msgid ""
 "The following record assigns a low priority to all package versions "
-"belonging to any distribution whose Archive name is \"<literal>unstable</"
-"literal>\"."
+"belonging to any distribution whose Archive name is "
+"\"<literal>unstable</literal>\"."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
@@ -3862,8 +3916,8 @@ msgstr ""
 #: apt_preferences.5.xml:238
 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>&testing-codename;</literal>\"."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
@@ -4069,9 +4123,10 @@ msgstr ""
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
 "will be installed, so long as that version's version number begins with "
-"\"<literal>&good-perl;</literal>\".  If <emphasis>any</emphasis> &good-perl;"
-"* version of <literal>perl</literal> is available and the installed version "
-"is &bad-perl;*, then <literal>perl</literal> will be downgraded."
+"\"<literal>&good-perl;</literal>\".  If <emphasis>any</emphasis> "
+"&good-perl;* version of <literal>perl</literal> is available and the "
+"installed version is &bad-perl;*, then <literal>perl</literal> will be "
+"downgraded."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
@@ -4086,9 +4141,9 @@ msgstr ""
 #: apt_preferences.5.xml:383
 msgid ""
 "A version of a package whose origin is not the local system but some other "
-"site listed in &sources-list; and which belongs to an <literal>unstable</"
-"literal> distribution is only installed if it is selected for installation "
-"and no version of the package is already installed."
+"site listed in &sources-list; and which belongs to an "
+"<literal>unstable</literal> distribution is only installed if it is selected "
+"for installation and no version of the package is already installed."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
@@ -4108,12 +4163,12 @@ msgstr ""
 #: apt_preferences.5.xml:399
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
-"<filename>.../dists/<replaceable>dist-name</replaceable>/"
-"<replaceable>component</replaceable>/<replaceable>arch</replaceable></"
-"filename>: for example, <filename>.../dists/stable/main/binary-i386/"
-"Packages</filename>.  It consists of a series of multi-line records, one for "
-"each package available in that directory.  Only two lines in each record are "
-"relevant for setting APT priorities:"
+"<filename>.../dists/<replaceable>dist-name</replaceable>/<replaceable>component</replaceable>/<replaceable>arch</replaceable></filename>: "
+"for example, "
+"<filename>.../dists/stable/main/binary-i386/Packages</filename>.  It "
+"consists of a series of multi-line records, one for each package available "
+"in that directory.  Only two lines in each record are relevant for setting "
+"APT priorities:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
@@ -4141,12 +4196,12 @@ msgstr ""
 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:"
+"example, <filename>.../dists/stable/Release</filename>, or "
+"<filename>.../dists/&stable-codename;/Release</filename>.  It consists of a "
+"single multi-line record which applies to <emphasis>all</emphasis> of the "
+"packages in the directory tree below its parent.  Unlike the "
+"<filename>Packages</filename> file, nearly all of the lines in a "
+"<filename>Release</filename> file are relevant for setting APT priorities:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
@@ -4226,7 +4281,8 @@ msgid ""
 "\"Component: main\" specifies that all the packages in the directory tree "
 "are from the <literal>main</literal> component, which entails that they are "
 "licensed under terms listed in the Debian Free Software Guidelines.  "
-"Specifying this component in the APT preferences file would require the line:"
+"Specifying this component in the APT preferences file would require the "
+"line:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
@@ -4244,9 +4300,9 @@ msgstr ""
 #: apt_preferences.5.xml:497
 msgid ""
 "names the originator of the packages in the directory tree of the "
-"<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
-"literal>.  Specifying this origin in the APT preferences file would require "
-"the line:"
+"<filename>Release</filename> file.  Most commonly, this is "
+"<literal>Debian</literal>.  Specifying this origin in the APT preferences "
+"file would require the line:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
@@ -4264,9 +4320,9 @@ msgstr ""
 #: apt_preferences.5.xml:510
 msgid ""
 "names the label of the packages in the directory tree of the "
-"<filename>Release</filename> file.  Most commonly, this is <literal>Debian</"
-"literal>.  Specifying this label in the APT preferences file would require "
-"the line:"
+"<filename>Release</filename> file.  Most commonly, this is "
+"<literal>Debian</literal>.  Specifying this label in the APT preferences "
+"file would require the line:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
@@ -4282,8 +4338,8 @@ msgid ""
 "files retrieved from locations listed in the &sources-list; file are stored "
 "in the directory <filename>/var/lib/apt/lists</filename>, or in the file "
 "named by the variable <literal>Dir::State::Lists</literal> in the "
-"<filename>apt.conf</filename> file.  For example, the file <filename>debian."
-"lcs.mit.edu_debian_dists_unstable_contrib_binary-i386_Release</filename> "
+"<filename>apt.conf</filename> file.  For example, the file "
+"<filename>debian.lcs.mit.edu_debian_dists_unstable_contrib_binary-i386_Release</filename> "
 "contains the <filename>Release</filename> file retrieved from the site "
 "<literal>debian.lcs.mit.edu</literal> for <literal>binary-i386</literal> "
 "architecture files from the <literal>contrib</literal> component of the "
@@ -4334,8 +4390,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:572 apt_preferences.5.xml:618
-#: apt_preferences.5.xml:676
+#: apt_preferences.5.xml:572 apt_preferences.5.xml:618 apt_preferences.5.xml:676
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -4396,8 +4451,8 @@ msgid ""
 "to package versions from the <literal>testing</literal> distribution, a "
 "lower priority to package versions from the <literal>unstable</literal> "
 "distribution, and a prohibitively low priority to package versions from "
-"other <literal>Debian</literal> distributions.  <placeholder type="
-"\"programlisting\" id=\"0\"/>"
+"other <literal>Debian</literal> distributions.  <placeholder "
+"type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
@@ -4422,9 +4477,9 @@ msgid ""
 "latest version from the <literal>unstable</literal> distribution.  "
 "Thereafter, <command>apt-get upgrade</command> will upgrade the package to "
 "the most recent <literal>testing</literal> version if that is more recent "
-"than the installed version, otherwise, to the most recent <literal>unstable</"
-"literal> version if that is more recent than the installed version.  "
-"<placeholder type=\"programlisting\" id=\"0\"/>"
+"than the installed version, otherwise, to the most recent "
+"<literal>unstable</literal> version if that is more recent than the "
+"installed version.  <placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
@@ -4436,8 +4491,10 @@ msgstr ""
 #: apt_preferences.5.xml:654
 #, 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: 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"
 "Package: *\n"
 "Pin: release n=&testing-codename;\n"
 "Pin-Priority: 900\n"
@@ -4489,9 +4546,9 @@ msgid ""
 "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\"/>"
+"than the installed version, otherwise, to the most recent "
+"<literal>sid</literal> version if that is more recent than the installed "
+"version.  <placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -4518,11 +4575,11 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:45
 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."
+"Each line specifying a source starts with type "
+"(e.g. <literal>deb-src</literal>)  followed by options and arguments for "
+"this type.  Individual entries cannot be continued onto a following "
+"line. Empty lines are ignored, and a <literal>#</literal> character anywhere "
+"on a line marks the remainder of that line as a comment."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
@@ -4555,12 +4612,13 @@ msgid ""
 "archive, <filename>distribution/component</filename>. The "
 "<literal>distribution</literal> is generally an archive name like "
 "<literal>stable</literal> or <literal>testing</literal> or a codename like "
-"<literal>&stable-codename;</literal> or <literal>&testing-codename;</"
-"literal> while component is one of <literal>main</literal>, "
-"<literal>contrib</literal> or <literal>non-free</literal>. The <literal>deb-"
-"src</literal> type 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."
+"<literal>&stable-codename;</literal> or "
+"<literal>&testing-codename;</literal> while component is one of "
+"<literal>main</literal>, <literal>contrib</literal> or "
+"<literal>non-free</literal>. The <literal>deb-src</literal> type references "
+"a Debian distribution's source code in the same form as the "
+"<literal>deb</literal> type.  A <literal>deb-src</literal> line is required "
+"to fetch source indexes."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -4592,13 +4650,13 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:92
 msgid ""
-"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)"
-"</literal> which expands to the Debian architecture (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."
+"<literal>distribution</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."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -4621,31 +4679,31 @@ msgstr ""
 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):"
+"<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 ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml:117
 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."
+"<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."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml:121
 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."
+"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 ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -4667,7 +4725,8 @@ msgstr ""
 #, no-wrap
 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"
+"deb http://security.debian.org/ &stable-codename;/updates main contrib "
+"non-free\n"
 "   "
 msgstr ""
 
@@ -4692,27 +4751,28 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:154
 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."
+"The cdrom scheme allows APT to use a local CD-ROM drive with media "
+"swapping. Use the &apt-cdrom; program to create cdrom entries in the source "
+"list."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:161
 msgid ""
 "The http scheme specifies an HTTP server for the archive. If an environment "
-"variable <envar>http_proxy</envar> is set with the format http://server:"
-"port/, the proxy server specified in <envar>http_proxy</envar> will be used. "
-"Users of authenticated HTTP/1.1 proxies may use a string of the format "
-"http://user:pass@server:port/.  Note that this is an insecure method of "
-"authentication."
+"variable <envar>http_proxy</envar> is set with the format "
+"http://server:port/, the proxy server specified in <envar>http_proxy</envar> "
+"will be used. Users of authenticated HTTP/1.1 proxies may use a string of "
+"the format http://user:pass@server:port/.  Note that this is an insecure "
+"method of authentication."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:172
 msgid ""
 "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
-"is highly configurable; for more information see the &apt-conf; manual page. "
-"Please note that an FTP proxy can be specified by using the "
+"is highly configurable; for more information see the &apt-conf; manual "
+"page. Please note that an FTP proxy can be specified by using the "
 "<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
 "HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
 "environment variable and <emphasis>only</emphasis> this environment "
@@ -4747,12 +4807,12 @@ msgstr ""
 #: sources.list.5.xml:200
 msgid ""
 "APT can be extended with more methods shipped in other optional packages, "
-"which should follow the naming scheme <package>apt-transport-"
-"<replaceable>method</replaceable></package>.  For instance, the APT team "
-"also maintains the package <package>apt-transport-https</package>, which "
-"provides access methods for HTTPS URIs with features similar to the http "
-"method.  Methods for using e.g. debtorrent are also available - see &apt-"
-"transport-debtorrent;."
+"which should follow the naming scheme "
+"<package>apt-transport-<replaceable>method</replaceable></package>.  For "
+"instance, the APT team also maintains the package "
+"<package>apt-transport-https</package>, which provides access methods for "
+"HTTPS URIs with features similar to the http method.  Methods for using "
+"e.g. debtorrent are also available - see &apt-transport-debtorrent;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -4857,12 +4917,12 @@ msgstr ""
 #: sources.list.5.xml:241
 msgid ""
 "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
-"directory, and uses only files found under <filename>unstable/binary-i386</"
-"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\"/>"
+"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\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -4911,8 +4971,8 @@ msgstr ""
 #: apt-extracttemplates.1.xml:58
 msgid ""
 "Temporary directory in which to write extracted <command>debconf</command> "
-"template files and config scripts.  Configuration Item: <literal>APT::"
-"ExtractTemplates::TempDir</literal>"
+"template files and config scripts.  Configuration Item: "
+"<literal>APT::ExtractTemplates::TempDir</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -4938,15 +4998,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-sortpkgs.1.xml:45
-msgid ""
-"All output is sent to standard output; the input must be a seekable file."
+msgid "All output is sent to standard output; the input must be a seekable file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-sortpkgs.1.xml:54
 msgid ""
-"Use source index field ordering.  Configuration Item: <literal>APT::"
-"SortPkgs::Source</literal>."
+"Use source index field ordering.  Configuration Item: "
+"<literal>APT::SortPkgs::Source</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -4974,10 +5033,10 @@ msgstr ""
 #: apt-ftparchive.1.xml:43
 msgid ""
 "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
-"program, incorporating its entire functionality via the <literal>packages</"
-"literal> command.  It also contains a contents file generator, "
-"<literal>contents</literal>, and an elaborate means to 'script' the "
-"generation process for a complete archive."
+"program, incorporating its entire functionality via the "
+"<literal>packages</literal> command.  It also contains a contents file "
+"generator, <literal>contents</literal>, and an elaborate means to 'script' "
+"the generation process for a complete archive."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -5001,8 +5060,7 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:65 apt-ftparchive.1.xml:89
-msgid ""
-"The option <option>--db</option> can be used to specify a binary caching DB."
+msgid "The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -5026,11 +5084,11 @@ msgstr ""
 #: apt-ftparchive.1.xml:82
 msgid ""
 "The <literal>contents</literal> command generates a contents file from a "
-"directory tree. It takes the given directory and recursively searches it "
-"for .deb files, and reads the file list from each file. It then sorts and "
-"writes to stdout the list of files matched to packages. Directories are not "
-"written to the output. If multiple packages own the same file then each "
-"package is separated by a comma in the output."
+"directory tree. It takes the given directory and recursively searches it for "
+".deb files, and reads the file list from each file. It then sorts and writes "
+"to stdout the list of files matched to packages. Directories are not written "
+"to the output. If multiple packages own the same file then each package is "
+"separated by a comma in the output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -5041,24 +5099,26 @@ msgid ""
 "<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."
+"<filename>md5sum.txt</filename> files by default "
+"(<literal>APT::FTPArchive::Release::Default-Patterns</literal>). Additional "
+"filename patterns can be added by listing them in "
+"<literal>APT::FTPArchive::Release::Patterns</literal>.  It then writes to "
+"stdout a <filename>Release</filename> file containing an MD5, SHA1 and "
+"SHA256 digest for each file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:104
 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
-"the corresponding variables under <literal>APT::FTPArchive::Release</"
-"literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>.  The "
-"supported fields are: <literal>Origin</literal>, <literal>Label</literal>, "
-"<literal>Suite</literal>, <literal>Version</literal>, <literal>Codename</"
-"literal>, <literal>Date</literal>, <literal>Valid-Until</literal>, "
-"<literal>Architectures</literal>, <literal>Components</literal>, "
-"<literal>Description</literal>."
+"the corresponding variables under "
+"<literal>APT::FTPArchive::Release</literal>, "
+"e.g. <literal>APT::FTPArchive::Release::Origin</literal>.  The supported "
+"fields are: <literal>Origin</literal>, <literal>Label</literal>, "
+"<literal>Suite</literal>, <literal>Version</literal>, "
+"<literal>Codename</literal>, <literal>Date</literal>, "
+"<literal>Valid-Until</literal>, <literal>Architectures</literal>, "
+"<literal>Components</literal>, <literal>Description</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -5088,16 +5148,15 @@ msgstr ""
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "
-"ISC configuration format as seen in ISC tools like bind 8 and dhcpd.  &apt-"
-"conf; contains a description of the syntax. Note that the generate "
+"ISC configuration format as seen in ISC tools like bind 8 and dhcpd.  "
+"&apt-conf; contains a description of the syntax. Note that the generate "
 "configuration is parsed in sectional manner, but &apt-conf; is parsed in a "
 "tree manner. This only effects how the scope tag is handled."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-ftparchive.1.xml:142
-msgid ""
-"The generate configuration has four separate sections, each described below."
+msgid "The generate configuration has four separate sections, each described below."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
@@ -5135,8 +5194,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:170
 msgid ""
-"Specifies the location of the file list files, if the <literal>FileList</"
-"literal> setting is used below."
+"Specifies the location of the file list files, if the "
+"<literal>FileList</literal> setting is used below."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
@@ -5200,8 +5259,8 @@ msgstr ""
 #: apt-ftparchive.1.xml:222
 msgid ""
 "Specifies the number of kilobytes to delink (and replace with hard links) "
-"per run. This is used in conjunction with the per-section <literal>External-"
-"Links</literal> setting."
+"per run. This is used in conjunction with the per-section "
+"<literal>External-Links</literal> setting."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
@@ -5235,74 +5294,74 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:251
 msgid ""
-"Sets the number of kilobytes of contents files that are generated each day. "
-"The contents files are round-robined so that over several days they will all "
-"be rebuilt."
+"Sets the number of kilobytes of contents files that are generated each "
+"day. The contents files are round-robined so that over several days they "
+"will all be rebuilt."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:258
 msgid ""
 "Controls the number of days a contents file is allowed to be checked without "
-"changing. If this limit is passed the mtime of the contents file is updated. "
-"This case can occur if the package file is changed in such a way that does "
-"not result in a new contents file [override edit for instance]. A hold off "
-"is allowed in hopes that new .debs will be installed, requiring a new file "
-"anyhow. The default is 10, the units are in days."
+"changing. If this limit is passed the mtime of the contents file is "
+"updated. This case can occur if the package file is changed in such a way "
+"that does not result in a new contents file [override edit for instance]. A "
+"hold off is allowed in hopes that new .debs will be installed, requiring a "
+"new file anyhow. The default is 10, the units are in days."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:269
 msgid ""
-"Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/"
-"$(SECTION)/binary-$(ARCH)/</filename>"
+"Sets the top of the .deb directory tree. Defaults to "
+"<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:275
 msgid ""
-"Sets the top of the source package directory tree. Defaults to <filename>"
-"$(DIST)/$(SECTION)/source/</filename>"
+"Sets the top of the source package directory tree. Defaults to "
+"<filename>$(DIST)/$(SECTION)/source/</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:281
 msgid ""
-"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
-"binary-$(ARCH)/Packages</filename>"
+"Sets the output Packages file. Defaults to "
+"<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:287
 msgid ""
-"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
-"source/Sources</filename>"
+"Sets the output Sources file. Defaults to "
+"<filename>$(DIST)/$(SECTION)/source/Sources</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:293
 msgid ""
 "Sets the output Translation-en master file with the long descriptions if "
-"they should be not included in the Packages file. Defaults to <filename>"
-"$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
+"they should be not included in the Packages file. Defaults to "
+"<filename>$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:300
 msgid ""
 "Sets the path prefix that causes a symlink to be considered an internal link "
-"instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</"
-"filename>"
+"instead of an external link. Defaults to "
+"<filename>$(DIST)/$(SECTION)/</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:307
 msgid ""
-"Sets the output Contents file. Defaults to <filename>$(DIST)/$(SECTION)/"
-"Contents-$(ARCH)</filename>. If this setting causes multiple Packages files "
-"to map onto a single Contents file (as is the default)  then <command>apt-"
-"ftparchive</command> will integrate those package files together "
-"automatically."
+"Sets the output Contents file. Defaults to "
+"<filename>$(DIST)/$(SECTION)/Contents-$(ARCH)</filename>. If this setting "
+"causes multiple Packages files to map onto a single Contents file (as is the "
+"default)  then <command>apt-ftparchive</command> will integrate those "
+"package files together automatically."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
@@ -5320,18 +5379,18 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:327
 msgid ""
-"Specifies that instead of walking the directory tree, <command>apt-"
-"ftparchive</command> should read the list of files from the given file. "
-"Relative files names are prefixed with the archive directory."
+"Specifies that instead of walking the directory tree, "
+"<command>apt-ftparchive</command> should read the list of files from the "
+"given file. Relative files names are prefixed with the archive directory."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:334
 msgid ""
-"Specifies that instead of walking the directory tree, <command>apt-"
-"ftparchive</command> should read the list of files from the given file. "
-"Relative files names are prefixed with the archive directory.  This is used "
-"when processing source indexes."
+"Specifies that instead of walking the directory tree, "
+"<command>apt-ftparchive</command> should read the list of files from the "
+"given file. Relative files names are prefixed with the archive directory.  "
+"This is used when processing source indexes."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
@@ -5379,17 +5438,17 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-ftparchive.1.xml:357
 msgid ""
-"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
-"command> performs an operation similar to: <placeholder type=\"programlisting"
-"\" id=\"0\"/>"
+"When processing a <literal>Tree</literal> section "
+"<command>apt-ftparchive</command> performs an operation similar to: "
+"<placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:368
 msgid ""
 "This is a space separated list of sections which appear under the "
-"distribution; typically this is something like <literal>main contrib non-"
-"free</literal>"
+"distribution; typically this is something like <literal>main contrib "
+"non-free</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
@@ -5435,8 +5494,8 @@ msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "
 "binary directory and the settings are similar to the <literal>Tree</literal> "
-"section with no substitution variables or <literal>Section</"
-"literal><literal>Architecture</literal> settings."
+"section with no substitution variables or "
+"<literal>Section</literal><literal>Architecture</literal> settings."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
@@ -5511,12 +5570,12 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: apt-ftparchive.1.xml:479
 msgid ""
-"The general form of the maintainer field is: <placeholder type="
-"\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" "
-"id=\"1\"/> The first form allows a double-slash separated list of old email "
-"addresses to be specified. If any of those are found then new is substituted "
-"for the maintainer field. The second form unconditionally substitutes the "
-"maintainer field."
+"The general form of the maintainer field is: <placeholder "
+"type=\"literallayout\" id=\"0\"/> or simply, <placeholder "
+"type=\"literallayout\" id=\"1\"/> The first form allows a double-slash "
+"separated list of old email addresses to be specified. If any of those are "
+"found then new is substituted for the maintainer field. The second form "
+"unconditionally substitutes the maintainer field."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
@@ -5550,13 +5609,15 @@ msgstr ""
 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>."
+"Configuration Items: "
+"<literal>APT::FTPArchive::<replaceable>Checksum</replaceable></literal> and "
+"<literal>APT::FTPArchive::<replaceable>Index</replaceable>::<replaceable>Checksum</replaceable></literal> "
+"where <literal><replaceable>Index</replaceable></literal> can be "
+"<literal>Packages</literal>, <literal>Sources</literal> or "
+"<literal>Release</literal> and "
+"<literal><replaceable>Checksum</replaceable></literal> can be "
+"<literal>MD5</literal>, <literal>SHA1</literal> or "
+"<literal>SHA256</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -5598,15 +5659,15 @@ msgstr ""
 #: apt-ftparchive.1.xml:553
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
-"command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
-"literal>."
+"command.  Configuration Item: "
+"<literal>APT::FTPArchive::SourceOverride</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:559
 msgid ""
-"Make the caching databases read only.  Configuration Item: <literal>APT::"
-"FTPArchive::ReadOnlyDB</literal>."
+"Make the caching databases read only.  Configuration Item: "
+"<literal>APT::FTPArchive::ReadOnlyDB</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -5645,7 +5706,10 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><programlisting>
 #: apt-ftparchive.1.xml:602
 #, no-wrap
-msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
+msgid ""
+"<command>apt-ftparchive</command> packages "
+"<replaceable>directory</replaceable> | <command>gzip</command> > "
+"<filename>Packages.gz</filename>\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -5712,9 +5776,9 @@ msgstr ""
 #: apt.8:31
 msgid ""
 "APT is a management system for software packages. For normal day to day "
-"package management there are several frontends available, such as B<aptitude>"
-"(8)  for the command line or B<synaptic>(8)  for the X Window System. Some "
-"options are only implemented in B<apt-get>(8)  though."
+"package management there are several frontends available, such as "
+"B<aptitude>(8)  for the command line or B<synaptic>(8)  for the X Window "
+"System. Some options are only implemented in B<apt-get>(8)  though."
 msgstr ""
 
 #. type: SH
@@ -5789,7 +5853,8 @@ msgstr ""
 #. type: <abstract></abstract>
 #: guide.sgml:11
 msgid ""
-"This document provides an overview of how to use the the APT package manager."
+"This document provides an overview of how to use the the APT package "
+"manager."
 msgstr ""
 
 #. type: <copyrightsummary></copyrightsummary>
@@ -5800,8 +5865,8 @@ msgstr ""
 #. type: <p></p>
 #: guide.sgml:21 offline.sgml:22
 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 "
+"\"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 "
 "published by the Free Software Foundation; either version 2 of the License, "
 "or (at your option) any later version."
 msgstr ""
@@ -5809,8 +5874,8 @@ msgstr ""
 #. type: <p></p>
 #: guide.sgml:24 offline.sgml:25
 msgid ""
-"For more details, on Debian systems, see the file /usr/share/common-licenses/"
-"GPL for the full license."
+"For more details, on Debian systems, see the file "
+"/usr/share/common-licenses/GPL for the full license."
 msgstr ""
 
 #. type: <heading></heading>
@@ -5821,10 +5886,10 @@ msgstr ""
 #. type: <p></p>
 #: guide.sgml:38
 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 "
+"<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."
 msgstr ""
 
 #. type: <heading></heading>
@@ -5887,9 +5952,9 @@ 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 "
 "identical, they both deliver mail and understand a common interface. Hence, "
-"the package system has a way for them to declare that they are both mail-"
-"transport-agents. So, exim and sendmail both declare that they provide a "
-"mail-transport-agent and other packages that need a mail transport agent "
+"the package system has a way for them to declare that they are both "
+"mail-transport-agents. So, exim and sendmail both declare that they provide "
+"a mail-transport-agent and other packages that need a mail transport agent "
 "depend on mail-transport-agent. This can add a great deal of confusion when "
 "trying to manually fix packages."
 msgstr ""
@@ -5921,11 +5986,11 @@ msgstr ""
 #: 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,"
+"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 ""
 
 #. type: <example></example>
@@ -5972,9 +6037,9 @@ 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 "
 "the package to install and do not want to go into a GUI to select it. Any "
-"number of packages may be passed to install, they will all be fetched. "
-"Install automatically attempts to resolve dependency problems with the "
-"listed packages and will print a summary and ask for confirmation if "
+"number of packages may be passed to install, they will all be "
+"fetched. Install automatically attempts to resolve dependency problems with "
+"the listed packages and will print a summary and ask for confirmation if "
 "anything other than its arguments are changed."
 msgstr ""
 
@@ -5989,10 +6054,11 @@ 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."
+"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."
 msgstr ""
 
 #. type: <p></p>
@@ -6082,12 +6148,12 @@ msgstr ""
 #. 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."
+"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 ""
 
 #. type: <example></example>
@@ -6122,8 +6188,8 @@ 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."
+"<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get "
+"update</tt> has been run before."
 msgstr ""
 
 #. type: <p></p>
@@ -6139,8 +6205,8 @@ msgstr ""
 #: guide.sgml:258
 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 "
+"<tt>Dselect::clean \"prompt\";</tt> in /etc/apt/apt.conf."
 msgstr ""
 
 #. type: <heading></heading>
@@ -6170,9 +6236,9 @@ msgstr ""
 #: guide.sgml:284
 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>."
+"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>."
 msgstr ""
 
 #. type: <example></example>
@@ -6188,9 +6254,9 @@ msgstr ""
 #: guide.sgml:297
 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. "
-"If some of the package files are not found then they will be ignored and a "
-"warning will be printed when apt-get exits."
+"a caching scheme so this operation will be faster the second time it is "
+"run. If some of the package files are not found then they will be ignored "
+"and a warning will be printed when apt-get exits."
 msgstr ""
 
 #. type: <p></p>
@@ -6239,10 +6305,10 @@ 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."
+"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."
 msgstr ""
 
 #. type: <p></p>
@@ -6328,11 +6394,11 @@ msgstr ""
 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."
+"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."
 msgstr ""
 
 #. type: <heading></heading>
@@ -6398,8 +6464,8 @@ msgstr ""
 #: guide.sgml:441
 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. "
-"This should only happen during dist-upgrade or install."
+"case it prints out a warning that the held package is going to be "
+"changed. This should only happen during dist-upgrade or install."
 msgstr ""
 
 #. type: <heading></heading>
@@ -6409,15 +6475,15 @@ msgstr ""
 
 #. type: <p></p>
 #: guide.sgml:447
-msgid ""
-"Finally, APT will print out a summary of all the changes that will occur."
+msgid "Finally, APT will print out a summary of all the changes that will occur."
 msgstr ""
 
 #. type: <example></example>
 #: guide.sgml:452
 #, no-wrap
 msgid ""
-"206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.\n"
+"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."
 msgstr ""
@@ -6435,9 +6501,9 @@ msgid ""
 "fetched from remote locations and the second indicates the total size of all "
 "the archives required. The next number indicates the size difference between "
 "the presently installed packages and the newly installed packages. It is "
-"roughly equivalent to the space required in /usr after everything is done. "
-"If a large number of packages are being removed then the value may indicate "
-"the amount of space that will be freed."
+"roughly equivalent to the space required in /usr after everything is "
+"done. If a large number of packages are being removed then the value may "
+"indicate the amount of space that will be freed."
 msgstr ""
 
 #. type: <p></p>
@@ -6467,7 +6533,8 @@ msgid ""
 "Get:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"
 "Get:2 http://llug.sep.bnl.gov/debian/ testing/contrib 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: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"
 msgstr ""
@@ -6490,9 +6557,10 @@ msgid ""
 "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."
+"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 ""
 
 #. type: <p></p>
@@ -6532,11 +6600,11 @@ msgstr ""
 #: 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."
+"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 ""
 
 #. type: <title></title>
@@ -6660,7 +6728,8 @@ msgstr ""
 msgid ""
 " APT\n"
 " {\n"
-"   /* This is not necessary if the two machines are the same arch, it tells\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"
@@ -6693,11 +6762,11 @@ msgstr ""
 #. type: <p><example>
 #: offline.sgml:136
 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 "
+"<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:"
 msgstr ""
 
 #. type: <example></example>
@@ -6748,11 +6817,11 @@ msgstr ""
 #. type: <p></p>
 #: offline.sgml:172
 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 "
-"machine are updated. I highly recommend that people only make selections on "
-"the local machine - but this may not always be possible. DO NOT copy the "
-"status file if dpkg or APT have been run in the mean time!!"
+"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 machine are updated. I highly recommend that people only make "
+"selections on the local machine - but this may not always be possible. DO "
+"NOT copy the status file if dpkg or APT have been run in the mean time!!"
 msgstr ""
 
 #. type: <heading></heading>
@@ -6785,8 +6854,8 @@ msgstr ""
 #. type: <p><example>
 #: offline.sgml:200
 msgid ""
-"Unlike the previous technique no special configuration files are required. "
-"We merely use the standard APT commands to generate the file list."
+"Unlike the previous technique no special configuration files are "
+"required. We merely use the standard APT commands to generate the file list."
 msgstr ""
 
 #. type: <example></example>
@@ -6802,8 +6871,8 @@ msgstr ""
 #. type: </example></p>
 #: offline.sgml:210
 msgid ""
-"Any command other than dist-upgrade could be used here, including dselect-"
-"upgrade."
+"Any command other than dist-upgrade could be used here, including "
+"dselect-upgrade."
 msgstr ""
 
 #. type: <p></p>
@@ -6846,34 +6915,3 @@ msgstr ""
 #: offline.sgml:234
 msgid "Which will use the already fetched archives on the disc."
 msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:130
-msgid ""
-"Update the local keyring with the archive keyring and remove from the local "
-"keyring the archive keys which are no longer valid.  The archive keyring is "
-"shipped in the <literal>archive-keyring</literal> package of your "
-"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
-"Ubuntu."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:183
-msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:184
-msgid "Keyring of Ubuntu archive trusted keys."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:187
-msgid ""
-"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:188
-msgid "Keyring of Ubuntu archive removed trusted keys."
-msgstr ""