Release 1.5~rc21.5_rc2

50 files changed, 1174 insertions, 1099 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 28d5cce07..d45409e56 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -187,7 +187,7 @@ endif()
 # Configure some variables like package, version and architecture.
 set(PACKAGE ${PROJECT_NAME})
 set(PACKAGE_MAIL "APT Development Team <deity@lists.debian.org>")
-set(PACKAGE_VERSION "1.5~rc1")
+set(PACKAGE_VERSION "1.5~rc2")
 
 if (NOT DEFINED DPKG_DATADIR)
   execute_process(COMMAND ${PERL_EXECUTABLE} -MDpkg -e "print $Dpkg::DATADIR;"
diff --git a/debian/changelog b/debian/changelog
index 1d21f6cac..40a482e8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,35 @@
+apt (1.5~rc2) unstable; urgency=medium
+
+  [ Julian Andres Klode ]
+  * Actually install apt_auth.conf manual page (Closes: #873934)
+  * test: Workaround gpgv warning
+  * apt-daily: Wait for network before daily updates.
+    Introduce a new helper, apt-helper wait-online that uses
+    NetworkManager and/or systemd-networkd to wait for them
+    reporting online, with a time out of 30 seconds; and run
+    that helper before running the daily update script. (LP: #1699850)
+  * apt-daily: Pull in network-online.target in service, not timer
+  * Do not warn about duplicate "legacy" targets (Closes: #839259)
+    (LP: #1697120)
+  * cdrom: Don't hardcode "Files" field for copying source files
+  * ftparchive: Do not pass through disabled hashes in Sources (Closes: #872963)
+  * Directly link against libudev on Linux systems - this does not affect
+    public API and ABI, but protected pkgUdevCdromDevices function pointers
+    were renamed and are now always NULL, even if Dlopen returns true.
+
+  [ Christos Trochalakis ]
+  * doc: correct '--allow-releaseinfo-change-*' typos (Closes: #873914)
+
+  [ Frans Spiesschaert ]
+  * Dutch program translation update (Closes: #874285)
+  * Dutch manpage translation update (Closes: #874293)
+
+  [ David Kalnischkies ]
+  * don't write & chmod /dev/null log files
+  * don't ask an uninit _system for supported archs (LP: #1613184)
+
+ -- Julian Andres Klode <jak@debian.org>  Sat, 09 Sep 2017 21:47:14 +0200
+
 apt (1.5~rc1) unstable; urgency=medium
 
   * Redefine APT_CONST to mean APT_PURE (APT_CONST is deprecated)
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index cc4159fdf..5dc8d9797 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -14,7 +14,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
-   <date>2017-08-17T00:00:00Z</date>
+   <date>2017-08-24T00:00:00Z</date>
  </refentryinfo>
  
  <refmeta>
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 6b328ae0a..61373f851 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -245,7 +245,7 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "1.5~rc1">
+<!ENTITY apt-product-version "1.5~rc2">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY debian-oldstable-codename "jessie">
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index a1dfb814e..bd1b5c966 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt-doc 1.5~rc1\n"
+"Project-Id-Version: apt-doc 1.5~rc2\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-08-24 23:21+0200\n"
+"POT-Creation-Date: 2017-09-09 21:47+0200\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"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
-#: apt.ent:1
+#: apt.ent
 #, no-wrap
 msgid ""
 "<!ENTITY apt-author.team \"\n"
@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:1
+#: apt.ent
 #, no-wrap
 msgid ""
 "<!ENTITY apt-qapage \"\n"
@@ -40,7 +40,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:1
+#: apt.ent
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Bug reporting section -->\n"
@@ -56,7 +56,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:1
+#: apt.ent
 #, no-wrap
 msgid ""
 "<!-- Boiler plate Author section -->\n"
@@ -70,7 +70,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:1
+#: apt.ent
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -85,7 +85,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:1
+#: apt.ent
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -98,7 +98,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:1
+#: apt.ent
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -118,7 +118,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:1
+#: apt.ent
 #, no-wrap
 msgid ""
 "     <varlistentry>\n"
@@ -138,7 +138,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:1
+#: apt.ent
 #, no-wrap
 msgid ""
 "<!-- Should be used within the option section of the text to\n"
@@ -155,7 +155,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:1
+#: apt.ent
 #, no-wrap
 msgid ""
 "<!ENTITY file-aptconf \"\n"
@@ -167,7 +167,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:1
+#: apt.ent
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
@@ -179,7 +179,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:1
+#: apt.ent
 #, no-wrap
 msgid ""
 "<!ENTITY file-cachearchives \"\n"
@@ -191,7 +191,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:1
+#: apt.ent
 #, no-wrap
 msgid ""
 "     "
@@ -205,7 +205,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:1
+#: apt.ent
 #, no-wrap
 msgid ""
 "<!ENTITY file-preferences \"\n"
@@ -221,7 +221,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:1
+#: apt.ent
 #, no-wrap
 msgid ""
 "     "
@@ -234,7 +234,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:1
+#: apt.ent
 #, no-wrap
 msgid ""
 "<!ENTITY file-sourceslist \"\n"
@@ -246,7 +246,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:1
+#: apt.ent
 #, no-wrap
 msgid ""
 "     "
@@ -259,7 +259,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:1
+#: apt.ent
 #, no-wrap
 msgid ""
 "<!ENTITY file-statelists \"\n"
@@ -273,7 +273,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:1
+#: apt.ent
 #, no-wrap
 msgid ""
 "     "
@@ -287,7 +287,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:1
+#: apt.ent
 #, no-wrap
 msgid ""
 "<!ENTITY file-trustedgpg \"\n"
@@ -300,7 +300,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:1
+#: apt.ent
 #, no-wrap
 msgid ""
 "     "
@@ -315,7 +315,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:1
+#: apt.ent
 #, no-wrap
 msgid ""
 "<!ENTITY file-extended_states \"\n"
@@ -329,7 +329,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:1
+#: apt.ent
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is the section header for the following paragraphs - "
@@ -340,7 +340,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:1
+#: apt.ent
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: This is a placeholder. You should write here who has "
@@ -359,7 +359,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:1
+#: apt.ent
 #, no-wrap
 msgid ""
 "<!-- TRANSLATOR: As a translation is allowed to have 20% of "
@@ -379,7 +379,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:1
+#: apt.ent
 msgid ""
 "<!-- TRANSLATOR: used as in -o=config_string "
 "e.g. -o=Debug::pkgProblemResolver=1 --> <!ENTITY synopsis-config-string "
@@ -387,14 +387,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:1
+#: apt.ent
 msgid ""
 "<!-- TRANSLATOR: used as in -c=config_file e.g. -c=./apt.conf --> <!ENTITY "
 "synopsis-config-file \"config_file\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:1
+#: apt.ent
 msgid ""
 "<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release "
 "e.g. -t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
@@ -402,49 +402,49 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:1
+#: apt.ent
 msgid ""
 "<!-- TRANSLATOR: used as in -a=architecture e.g. -a=armel --> <!ENTITY "
 "synopsis-architecture \"architecture\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:1
+#: apt.ent
 msgid ""
 "<!-- TRANSLATOR: used as in apt-get install pkg e.g. apt-get install awesome "
 "--> <!ENTITY synopsis-pkg \"pkg\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:1
+#: apt.ent
 msgid ""
 "<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> "
 "<!ENTITY synopsis-pkg-ver-number \"pkg_version_number\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:1
+#: apt.ent
 msgid ""
 "<!-- TRANSLATOR: used as in apt-cache pkgnames prefix e.g. apt-cache "
 "pkgnames apt --> <!ENTITY synopsis-prefix \"prefix\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:1
+#: apt.ent
 msgid ""
 "<!-- TRANSLATOR: used as in apt-cache search regex e.g. apt-cache search "
 "awesome --> <!ENTITY synopsis-regex \"regex\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:1
+#: apt.ent
 msgid ""
 "<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom "
 "-d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:1
+#: apt.ent
 msgid ""
 "<!-- TRANSLATOR: used as in apt-extracttemplates -t=temporary_directory "
 "e.g. apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "
@@ -452,21 +452,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:1
+#: apt.ent
 msgid ""
 "<!-- TRANSLATOR: used as in apt-extracttemplates filename --> <!ENTITY "
 "synopsis-filename \"filename\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:1
+#: apt.ent
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:1
+#: apt.ent
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-override "
@@ -474,7 +474,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:1
+#: apt.ent
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix "
@@ -482,48 +482,48 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:1
+#: apt.ent
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "generate section --> <!ENTITY synopsis-section \"section\">"
 msgstr ""
 
 #. type: Plain text
-#: apt.ent:1
+#: apt.ent
 msgid ""
 "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
 "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
 msgstr ""
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt.8.xml:1 apt-get.8.xml:1 apt-cache.8.xml:1 apt-key.8.xml:1
-#: apt-mark.8.xml:1 apt-secure.8.xml:1 apt-cdrom.8.xml:1 apt-config.8.xml:1
+#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
+#: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml
 msgid "8"
 msgstr ""
 
 #. type: Content of: <refentry><refmeta><refmiscinfo>
-#: apt.8.xml:1 apt-get.8.xml:1 apt-cache.8.xml:1 apt-key.8.xml:1
-#: apt-mark.8.xml:1 apt-secure.8.xml:1 apt-cdrom.8.xml:1 apt-config.8.xml:1
-#: apt.conf.5.xml:1 apt_preferences.5.xml:1 sources.list.5.xml:1
-#: apt-extracttemplates.1.xml:1 apt-sortpkgs.1.xml:1 apt-ftparchive.1.xml:1
+#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
+#: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml
+#: apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
 msgid "APT"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.8.xml:1
+#: apt.8.xml
 msgid "command-line interface"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:1 apt-get.8.xml:1 apt-cache.8.xml:1 apt-key.8.xml:1
-#: apt-mark.8.xml:1 apt-secure.8.xml:1 apt-cdrom.8.xml:1 apt-config.8.xml:1
-#: apt.conf.5.xml:1 apt_preferences.5.xml:1 sources.list.5.xml:1
-#: apt-extracttemplates.1.xml:1 apt-sortpkgs.1.xml:1 apt-ftparchive.1.xml:1
+#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
+#: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml
+#: apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
 msgid "Description"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:1
+#: apt.8.xml
 msgid ""
 "<command>apt</command> provides a high-level commandline interface for the "
 "package management system. It is intended as an end user interface and "
@@ -532,7 +532,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:1
+#: apt.8.xml
 msgid ""
 "Much like <command>apt</command> itself, its manpage is intended as an end "
 "user interface and as such only mentions the most used commands and options "
@@ -541,12 +541,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.8.xml:1 apt.8.xml:1 apt.8.xml:1 apt.8.xml:1 apt.8.xml:1
+#: apt.8.xml apt.8.xml apt.8.xml apt.8.xml apt.8.xml
 msgid "(&apt-get;)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:1
+#: apt.8.xml
 msgid ""
 "<option>update</option> is used to download package information from all "
 "configured sources. Other commands operate on this data to e.g. perform "
@@ -555,7 +555,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:1
+#: apt.8.xml
 msgid ""
 "<option>upgrade</option> is used to install available upgrades of all "
 "packages currently installed on the system from the sources configured via "
@@ -566,7 +566,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:1
+#: apt.8.xml
 msgid ""
 "<literal>full-upgrade</literal> performs the function of upgrade but will "
 "remove currently installed packages if this is needed to upgrade the system "
@@ -574,12 +574,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.8.xml:1 apt.8.xml:1 apt-key.8.xml:1
+#: apt.8.xml apt.8.xml apt-key.8.xml
 msgid ","
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:1
+#: apt.8.xml
 msgid ""
 "Performs the requested action on one or more packages specified via &regex;, "
 "&glob; or exact match. The requested action can be overridden for specific "
@@ -588,7 +588,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:1
+#: apt.8.xml
 msgid ""
 "A specific version of a package can be selected for installation by "
 "following the package name with an equals (=) and the version of the package "
@@ -600,7 +600,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:1
+#: apt.8.xml
 msgid ""
 "Removing a package removes all packaged data, but leaves usually small "
 "(modified) user configuration files behind, in case the remove was an "
@@ -612,7 +612,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:1
+#: apt.8.xml
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for other packages and are "
@@ -621,7 +621,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:1
+#: apt.8.xml
 msgid ""
 "You should check that the list does not include applications you have grown "
 "to like even though they were once installed just as a dependency of another "
@@ -631,12 +631,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.8.xml:1 apt.8.xml:1
+#: apt.8.xml apt.8.xml
 msgid "(&apt-cache;)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:1
+#: apt.8.xml
 msgid ""
 "<option>search</option> can be used to search for the given &regex; term(s) "
 "in the list of available packages and display matches.  This can e.g. be "
@@ -645,7 +645,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:1
+#: apt.8.xml
 msgid ""
 "Show information about the given package(s) including its dependencies, "
 "installation and download size, sources the package is available from, the "
@@ -655,12 +655,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.8.xml:1 apt.8.xml:1
+#: apt.8.xml apt.8.xml
 msgid "(work-in-progress)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:1
+#: apt.8.xml
 msgid ""
 "<option>list</option> is somewhat similar to <command>dpkg-query "
 "--list</command> in that it can display a list of packages satisfying "
@@ -671,19 +671,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:1
+#: apt.8.xml
 msgid ""
 "<literal>edit-sources</literal> lets you edit your &sources-list; files in "
 "your preferred texteditor while also providing basic sanity checks."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:1
+#: apt.8.xml
 msgid "Script Usage and Differences from Other APT Tools"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:1
+#: apt.8.xml
 msgid ""
 "The &apt; commandline is designed as an end-user tool and it may change "
 "behavior between versions. While it tries not to break backward "
@@ -692,7 +692,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:1
+#: apt.8.xml
 msgid ""
 "All features of &apt; are available in dedicated APT tools like &apt-get; "
 "and &apt-cache; as well.  &apt; just changes the default value of some "
@@ -703,41 +703,41 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:1 apt-get.8.xml:1 apt-cache.8.xml:1 apt-key.8.xml:1
-#: apt-mark.8.xml:1 apt-secure.8.xml:1 apt-cdrom.8.xml:1 apt-config.8.xml:1
-#: apt.conf.5.xml:1 apt_preferences.5.xml:1 sources.list.5.xml:1
-#: apt-extracttemplates.1.xml:1 apt-sortpkgs.1.xml:1 apt-ftparchive.1.xml:1
+#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml
+#: apt-secure.8.xml apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml
+#: apt_preferences.5.xml sources.list.5.xml apt-extracttemplates.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
 msgid "See Also"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:1
+#: apt.8.xml
 msgid ""
 "&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, The APT "
 "User's guide in &guidesdir;, &apt-preferences;, the APT Howto."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:1 apt-get.8.xml:1 apt-cache.8.xml:1 apt-mark.8.xml:1
-#: apt-cdrom.8.xml:1 apt-config.8.xml:1 apt-extracttemplates.1.xml:1
-#: apt-sortpkgs.1.xml:1 apt-ftparchive.1.xml:1
+#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-cdrom.8.xml
+#: apt-config.8.xml apt-extracttemplates.1.xml apt-sortpkgs.1.xml
+#: apt-ftparchive.1.xml
 msgid "Diagnostics"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:1
+#: apt.8.xml
 msgid ""
 "<command>apt</command> returns zero on normal operation, decimal 100 on "
 "error."
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid "APT package handling utility -- command-line interface"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "<command>apt-get</command> is the command-line tool for handling packages, "
 "and may be considered the user's \"back-end\" to other tools using the APT "
@@ -746,15 +746,15 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:1 apt-cache.8.xml:1 apt-cdrom.8.xml:1 apt-config.8.xml:1
-#: apt-ftparchive.1.xml:1
+#: apt-get.8.xml apt-cache.8.xml apt-cdrom.8.xml apt-config.8.xml
+#: apt-ftparchive.1.xml
 msgid ""
 "Unless the <option>-h</option>, or <option>--help</option> option is given, "
 "one of the commands below must be present."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "<literal>update</literal> is used to resynchronize the package index files "
 "from their sources. The indexes of available packages are fetched from the "
@@ -769,7 +769,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "<literal>upgrade</literal> is used to install the newest versions of all "
 "packages currently installed on the system from the sources enumerated in "
@@ -785,7 +785,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -800,7 +800,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "<literal>dselect-upgrade</literal> is used in conjunction with the "
 "traditional Debian packaging front-end, "
@@ -811,7 +811,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "<literal>install</literal> is followed by one or more packages desired for "
 "installation or upgrading.  Each package is a package name, not a fully "
@@ -828,7 +828,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "A specific version of a package can be selected for installation by "
 "following the package name with an equals and the version of the package to "
@@ -839,14 +839,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "Both of the version selection mechanisms can downgrade packages and must be "
 "used with care."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "This is also the target to use if you want to upgrade one or more "
 "already-installed packages without upgrading every package you have on your "
@@ -858,14 +858,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "Finally, the &apt-preferences; mechanism allows you to create an alternative "
 "installation policy for individual packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "If no package matches the given expression and the expression contains one "
 "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@ -877,7 +877,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "<literal>remove</literal> is identical to <literal>install</literal> except "
 "that packages are removed instead of installed. Note that removing a package "
@@ -887,7 +887,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "<literal>purge</literal> is identical to <literal>remove</literal> except "
 "that packages are removed and purged (any configuration files are deleted "
@@ -895,7 +895,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "<literal>source</literal> causes <command>apt-get</command> to fetch source "
 "packages. APT will examine the available packages to decide which source "
@@ -907,7 +907,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "Source packages are tracked separately from binary packages via "
 "<literal>deb-src</literal> lines in the &sources-list; file. This means that "
@@ -917,7 +917,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "If the <option>--compile</option> option is specified then the package will "
 "be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
@@ -927,7 +927,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "A specific source version can be retrieved by postfixing the source name "
 "with an equals and then the version to fetch, similar to the mechanism used "
@@ -937,7 +937,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "Note that source packages are not installed and tracked in the "
 "<command>dpkg</command> database like binary packages; they are simply "
@@ -945,7 +945,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
 "attempt to satisfy the build dependencies for a source package. By default "
@@ -955,21 +955,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "<literal>check</literal> is a diagnostic tool; it updates the package cache "
 "and checks for broken dependencies."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
 "current directory."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "<literal>clean</literal> clears out the local repository of retrieved "
 "package files. It removes everything but the lock file from "
@@ -978,17 +978,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:1 apt-get.8.xml:1
+#: apt-get.8.xml apt-get.8.xml
 msgid "(and the"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:1 apt-get.8.xml:1
+#: apt-get.8.xml apt-get.8.xml
 msgid "alias since 1.1)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
 "local repository of retrieved package files. The difference is that it only "
@@ -1000,7 +1000,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for other packages and are "
@@ -1008,7 +1008,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "<literal>changelog</literal> tries to download the changelog of a package "
 "and displays it through <command>sensible-pager</command>.  By default it "
@@ -1017,7 +1017,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "Displays by default a deb822 formatted listing of information about all data "
 "files (aka index targets) <command>apt-get update</command> would "
@@ -1032,34 +1032,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:1 apt-cache.8.xml:1 apt-config.8.xml:1
-#: apt-extracttemplates.1.xml:1 apt-sortpkgs.1.xml:1 apt-ftparchive.1.xml:1
+#: apt-get.8.xml apt-cache.8.xml apt-config.8.xml apt-extracttemplates.1.xml
+#: apt-sortpkgs.1.xml apt-ftparchive.1.xml
 msgid "options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "Do not consider recommended packages as a dependency for installing.  "
 "Configuration Item: <literal>APT::Install-Recommends</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "Consider suggested packages as a dependency for installing.  Configuration "
 "Item: <literal>APT::Install-Suggests</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "Fix; attempt to correct a system with broken dependencies in place. This "
 "option, when used with install/remove, can omit any packages to permit APT "
@@ -1075,7 +1075,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "Ignore missing packages; if packages cannot be retrieved or fail the "
 "integrity check after retrieval (corrupted package files), hold back those "
@@ -1087,7 +1087,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "Disables downloading of packages. This is best used with "
 "<option>--ignore-missing</option> to force APT to use only the .debs it has "
@@ -1096,7 +1096,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -1108,7 +1108,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "No action; perform a simulation of events that would occur based on the "
 "current system state but do not actually change the system. Locking will be "
@@ -1122,7 +1122,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "Simulated runs print out a series of lines, each representing a "
 "<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
@@ -1132,7 +1132,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
 "non-interactively. If an undesirable situation, such as changing a held "
@@ -1142,28 +1142,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "Automatic \"no\" to all prompts.  Configuration Item: "
 "<literal>APT::Get::Assume-No</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "Do not show a list of all packages that are to be upgraded.  Configuration "
 "Item: <literal>APT::Get::Show-Upgraded</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "Show full versions for upgraded and installed packages.  Configuration Item: "
 "<literal>APT::Get::Show-Versions</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "This option controls the architecture packages are built for by "
 "<command>apt-get source --compile</command> and how cross-builddependencies "
@@ -1174,7 +1174,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "This option controls the activated build profiles for which a source package "
 "is built by <command>apt-get source --compile</command> and how build "
@@ -1184,14 +1184,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "Compile source packages after downloading them.  Configuration Item: "
 "<literal>APT::Get::Compile</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "Ignore package holds; this causes <command>apt-get</command> to ignore a "
 "hold placed on a package. This may be useful in conjunction with "
@@ -1200,7 +1200,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "Allow installing new packages when used in conjunction with "
 "<literal>upgrade</literal>.  This is useful if the update of a installed "
@@ -1212,7 +1212,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "Do not upgrade packages; when used in conjunction with "
 "<literal>install</literal>, <literal>no-upgrade</literal> will prevent "
@@ -1221,7 +1221,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "Do not install new packages; when used in conjunction with "
 "<literal>install</literal>, <literal>only-upgrade</literal> will install "
@@ -1231,7 +1231,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "This is a dangerous option that will cause apt to continue without prompting "
 "if it is doing downgrades. It should not be used except in very special "
@@ -1240,7 +1240,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "Force yes; this is a dangerous option that will cause apt to continue "
 "without prompting if it is removing essentials. It should not be used except "
@@ -1250,7 +1250,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "Force yes; this is a dangerous option that will cause apt to continue "
 "without prompting if it is changing held packages. It should not be used "
@@ -1261,7 +1261,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 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 "
@@ -1275,7 +1275,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "Instead of fetching the files to install their URIs are printed. Each URI "
 "will have the path, the destination file name, the size and the expected MD5 "
@@ -1288,7 +1288,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "Use purge instead of remove for anything that would be removed.  An asterisk "
 "(\"*\") will be displayed next to packages which are scheduled to be "
@@ -1298,14 +1298,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "Re-install packages that are already installed and at the newest version.  "
 "Configuration Item: <literal>APT::Get::ReInstall</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "This option is on by default; use <literal>--no-list-cleanup</literal> to "
 "turn it off. When it is on, <command>apt-get</command> will automatically "
@@ -1316,7 +1316,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "This option controls the default input to the policy engine; it creates a "
 "default pin at priority 990 using the specified release string.  This "
@@ -1331,7 +1331,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "Only perform operations that are 'trivial'. Logically this can be considered "
 "related to <option>--assume-yes</option>; where "
@@ -1341,14 +1341,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "If any packages are to be removed apt-get immediately aborts without "
 "prompting.  Configuration Item: <literal>APT::Get::Remove</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "If the command is either <literal>install</literal> or "
 "<literal>remove</literal>, then this option acts like running the "
@@ -1357,7 +1357,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "Only has meaning for the <literal>source</literal> and "
 "<literal>build-dep</literal> commands.  Indicates that the given source "
@@ -1369,7 +1369,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "Download only the diff, dsc, or tar file of a source archive.  Configuration "
 "Item: <literal>APT::Get::Diff-Only</literal>, "
@@ -1378,21 +1378,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "Only process architecture-dependent build-dependencies.  Configuration Item: "
 "<literal>APT::Get::Arch-Only</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "Only process architecture-independent build-dependencies.  Configuration "
 "Item: <literal>APT::Get::Indep-Only</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "Ignore if packages can't be authenticated and don't prompt about it.  This "
 "can be useful while working with local repositories, but is a huge security "
@@ -1403,7 +1403,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "Forbid the update command to acquire unverifiable data from configured "
 "sources. APT will fail at the update command for repositories without valid "
@@ -1413,7 +1413,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "Allow the update command to continue downloading data from a repository "
 "which changed its information of the release contained in the repository "
@@ -1424,7 +1424,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "Specialist options "
 "(<literal>--allow-releaseinfo-change-</literal><replaceable>field</replaceable>)  "
@@ -1437,7 +1437,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "Show user friendly progress information in the terminal window when packages "
 "are installed, upgraded or removed. For a machine parsable version of this "
@@ -1447,7 +1447,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "Adds the given file as a source for metadata. Can be repeated to add "
 "multiple files.  See <option>--with-source</option> description in "
@@ -1455,13 +1455,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:1 apt-cache.8.xml:1 apt-key.8.xml:1 apt-mark.8.xml:1
-#: apt.conf.5.xml:1 apt_preferences.5.xml:1
+#: apt-get.8.xml apt-cache.8.xml apt-key.8.xml apt-mark.8.xml apt.conf.5.xml
+#: apt_preferences.5.xml
 msgid "Files"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, "
 "&apt-secure;, The APT User's guide in &guidesdir;, &apt-preferences;, the "
@@ -1469,19 +1469,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:1
+#: apt-get.8.xml
 msgid ""
 "<command>apt-get</command> returns zero on normal operation, decimal 100 on "
 "error."
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid "query the APT cache"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid ""
 "<command>apt-cache</command> performs a variety of operations on APT's "
 "package cache. <command>apt-cache</command> does not manipulate the state of "
@@ -1494,20 +1494,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid ""
 "<literal>gencaches</literal> creates APT's package cache. This is done "
 "implicitly by all commands needing this cache if it is missing or outdated."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:1 apt-cache.8.xml:1 apt-cache.8.xml:1 apt-cache.8.xml:1
-#: apt-cache.8.xml:1 apt-cache.8.xml:1 apt-cache.8.xml:1 apt-cache.8.xml:1
+#: apt-cache.8.xml apt-cache.8.xml apt-cache.8.xml apt-cache.8.xml
+#: apt-cache.8.xml apt-cache.8.xml apt-cache.8.xml apt-cache.8.xml
 msgid "&synopsis-pkg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid ""
 "<literal>showpkg</literal> displays information about the packages listed on "
 "the command line. Remaining arguments are package names. The available "
@@ -1521,7 +1521,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 #, no-wrap
 msgid ""
 "Package: libreadline2\n"
@@ -1537,7 +1537,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid ""
 "Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and "
 "ncurses3.0 which must be installed for libreadline2 to work.  In turn, "
@@ -1549,21 +1549,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid ""
 "<literal>stats</literal> displays some statistics about the cache.  No "
 "further arguments are expected. Statistics reported are:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid ""
 "<literal>Total package names</literal> is the number of package names found "
 "in the cache."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid ""
 "<literal>Normal packages</literal> is the number of regular, ordinary "
 "package names; these are packages that bear a one-to-one correspondence "
@@ -1572,7 +1572,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid ""
 "<literal>Pure virtual packages</literal> is the number of packages that "
 "exist only as a virtual package name; that is, packages only \"provide\" the "
@@ -1583,7 +1583,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid ""
 "<literal>Single virtual packages</literal> is the number of packages with "
 "only one package providing a particular virtual package. For example, in the "
@@ -1592,7 +1592,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid ""
 "<literal>Mixed virtual packages</literal> is the number of packages that "
 "either provide a particular virtual package or have the virtual package name "
@@ -1601,7 +1601,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid ""
 "<literal>Missing</literal> is the number of package names that were "
 "referenced in a dependency but were not provided by any package. Missing "
@@ -1611,7 +1611,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid ""
 "<literal>Total distinct</literal> versions is the number of package versions "
 "found in the cache. If more than one distribution is being accessed (for "
@@ -1620,14 +1620,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid ""
 "<literal>Total dependencies</literal> is the number of dependency "
 "relationships claimed by all of the packages in the cache."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid ""
 "<literal>showsrc</literal> displays all the source package records that "
 "match the given package names. All versions are shown, as well as all "
@@ -1636,28 +1636,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid ""
 "<literal>dump</literal> shows a short listing of every package in the "
 "cache. It is primarily for debugging."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid ""
 "<literal>dumpavail</literal> prints out an available list to stdout. This is "
 "suitable for use with &dpkg; and is used by the &dselect; method."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid ""
 "<literal>unmet</literal> displays a summary of all unmet dependencies in the "
 "package cache."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid ""
 "<literal>show</literal> performs a function similar to <command>dpkg "
 "--print-avail</command>; it displays the package records for the named "
@@ -1665,12 +1665,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid "&synopsis-regex;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid ""
 "<literal>search</literal> performs a full text search on all available "
 "package lists for the POSIX regex pattern given, see &regex;.  It searches "
@@ -1684,33 +1684,33 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid ""
 "Separate arguments can be used to specify multiple search patterns that are "
 "and'ed together."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid ""
 "<literal>depends</literal> shows a listing of each dependency a package has "
 "and all the possible other packages that can fulfill that dependency."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid ""
 "<literal>rdepends</literal> shows a listing of each reverse dependency a "
 "package has."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid ""
 "This command prints the name of each package APT knows. The optional "
 "argument is a prefix match to filter the name list. The output is suitable "
@@ -1720,7 +1720,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid ""
 "Note that a package which APT knows of is not necessarily available to "
 "download, installable or installed, e.g. virtual packages are also listed in "
@@ -1728,7 +1728,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid ""
 "<literal>dotty</literal> takes a list of packages on the command line and "
 "generates output suitable for use by dotty from the <ulink "
@@ -1741,7 +1741,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid ""
 "The resulting nodes will have several shapes; normal packages are boxes, "
 "pure virtual packages are triangles, mixed virtual packages are diamonds, "
@@ -1750,12 +1750,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid "Caution, dotty cannot graph larger sets of packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid ""
 "The same as <literal>dotty</literal>, only for xvcg from the <ulink "
 "url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG "
@@ -1763,12 +1763,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid ""
 "<literal>policy</literal> is meant to help debug issues relating to the "
 "preferences file. With no arguments it will print out the priorities of each "
@@ -1777,7 +1777,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid ""
 "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
 "to mimic the output format and a subset of the functionality of the Debian "
@@ -1789,7 +1789,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid ""
 "Select the file to store the package cache. The package cache is the primary "
 "cache used by all operations.  Configuration Item: "
@@ -1797,7 +1797,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid ""
 "Select the file to store the source cache. The source is used only by "
 "<literal>gencaches</literal> and it stores a parsed version of the package "
@@ -1807,7 +1807,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quietness up to a maximum of 2. You can also use "
@@ -1816,7 +1816,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid ""
 "Print only important dependencies; for use with <literal>unmet</literal> and "
 "<literal>depends</literal>. Causes only Depends and Pre-Depends relations to "
@@ -1824,7 +1824,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid ""
 "Per default the <command>depends</command> and <command>rdepends</command> "
 "print all dependencies. This can be tweaked with these flags which will omit "
@@ -1834,7 +1834,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid ""
 "Per default <command>depends</command> and <command>rdepends</command> print "
 "only dependencies explicitly expressed in the metadata. With this flag it "
@@ -1845,14 +1845,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid ""
 "Print full package records when searching.  Configuration Item: "
 "<literal>APT::Cache::ShowFull</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid ""
 "Print full records for all available versions. This is the default; to turn "
 "it off, use <option>--no-all-versions</option>.  If "
@@ -1863,7 +1863,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid ""
 "Perform automatic package cache regeneration, rather than use the cache as "
 "it is. This is the default; to turn it off, use "
@@ -1872,14 +1872,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid ""
 "Only search on the package and provided package names, not the long "
 "descriptions.  Configuration Item: <literal>APT::Cache::NamesOnly</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid ""
 "Make <literal>pkgnames</literal> print all names, including virtual packages "
 "and missing dependencies.  Configuration Item: "
@@ -1887,7 +1887,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid ""
 "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
 "that all packages mentioned are printed once.  Configuration Item: "
@@ -1895,7 +1895,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid ""
 "Limit the output of <literal>depends</literal> and "
 "<literal>rdepends</literal> to packages which are currently installed.  "
@@ -1903,7 +1903,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid ""
 "Adds the given file as a source for metadata. Can be repeated to add "
 "multiple files.  Supported are currently <literal>*.deb</literal>, "
@@ -1914,7 +1914,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid ""
 "<literal>Sources</literal> and <literal>Packages</literal> can be compressed "
 "in any format apt supports as long as they have the correct extension. If "
@@ -1924,31 +1924,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid ""
 "Note that these sources are treated as trusted (see &apt-secure;).  "
 "Configuration Item: <literal>APT::Sources::With</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:1
+#: apt-cache.8.xml
 msgid ""
 "<command>apt-cache</command> returns zero on normal operation, decimal 100 "
 "on error."
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-key.8.xml:1
+#: apt-key.8.xml
 msgid "APT key management utility"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:1
+#: apt-key.8.xml
 msgid ""
 "<command>apt-key</command> is used to manage the list of keys used by apt to "
 "authenticate packages.  Packages which have been authenticated using these "
@@ -1956,7 +1956,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:1
+#: apt-key.8.xml
 msgid ""
 "Note that if usage of <command>apt-key</command> is desired the additional "
 "installation of the GNU Privacy Guard suite (packaged in "
@@ -1969,12 +1969,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:1
+#: apt-key.8.xml
 msgid "Supported keyring files"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:1
+#: apt-key.8.xml
 msgid ""
 "apt-key supports only the binary OpenPGP format (also known as \"GPG key "
 "public ring\") in files with the \"<literal>gpg</literal>\" extension, not "
@@ -1984,7 +1984,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:1
+#: apt-key.8.xml
 msgid ""
 "Alternatively, if all systems which should be using the created keyring have "
 "at least apt version >= 1.4 installed, you can use the ASCII armored format "
@@ -1993,12 +1993,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:1
+#: apt-key.8.xml
 msgid "Commands"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:1
+#: apt-key.8.xml
 msgid ""
 "Add a new key to the list of trusted keys.  The key is read from the "
 "filename given with the parameter &synopsis-param-filename; or if the "
@@ -2006,7 +2006,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:1
+#: apt-key.8.xml
 msgid ""
 "It is critical that keys added manually via <command>apt-key</command> are "
 "verified to belong to the owner of the repositories they claim to be for "
@@ -2014,7 +2014,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:1
+#: apt-key.8.xml
 msgid ""
 "<emphasis>Note</emphasis>: Instead of using this command a keyring should be "
 "placed directly in the <filename>/etc/apt/trusted.gpg.d/</filename> "
@@ -2023,27 +2023,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:1
+#: apt-key.8.xml
 msgid "Remove a key from the list of trusted keys."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:1
+#: apt-key.8.xml
 msgid "Output the key &synopsis-param-keyid; to standard output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:1
+#: apt-key.8.xml
 msgid "Output all trusted keys to standard output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:1
+#: apt-key.8.xml
 msgid "List trusted keys with fingerprints."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:1
+#: apt-key.8.xml
 msgid ""
 "Pass advanced options to gpg. With <command>adv --recv-key</command> you can "
 "e.g. download key from keyservers directly into the trusted set of "
@@ -2053,12 +2053,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:1
+#: apt-key.8.xml
 msgid "(deprecated)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:1
+#: apt-key.8.xml
 msgid ""
 "Update the local keyring with the archive keyring and remove from the local "
 "keyring the archive keys which are no longer valid.  The archive keyring is "
@@ -2067,7 +2067,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:1
+#: apt-key.8.xml
 msgid ""
 "Note that a distribution does not need to and in fact should not use this "
 "command any longer and instead ship keyring files in the "
@@ -2077,7 +2077,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:1
+#: apt-key.8.xml
 msgid ""
 "Perform an update working similarly to the <command>update</command> command "
 "above, but get the archive keyring from a URI instead and validate it "
@@ -2088,19 +2088,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:1 apt-mark.8.xml:1 apt-mark.8.xml:1 apt-cdrom.8.xml:1
+#: apt-key.8.xml apt-mark.8.xml apt-mark.8.xml apt-cdrom.8.xml
 msgid "Options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:1
+#: apt-key.8.xml
 msgid ""
 "Note that options need to be defined before the commands described in the "
 "previous section."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:1
+#: apt-key.8.xml
 msgid ""
 "With this option it is possible to specify a particular keyring file the "
 "command should operate on. The default is that a command is executed on the "
@@ -2111,17 +2111,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:1
+#: apt-key.8.xml
 msgid "&apt-get;, &apt-secure;"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-mark.8.xml:1
+#: apt-mark.8.xml
 msgid "show, set and unset various settings for a package"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:1
+#: apt-mark.8.xml
 msgid ""
 "<command>apt-mark</command> can be used as a unified front-end to set "
 "various settings for a package, such as marking a package as being "
@@ -2132,12 +2132,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-mark.8.xml:1
+#: apt-mark.8.xml
 msgid "Automatically and Manually Installed Packages"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:1
+#: apt-mark.8.xml
 msgid ""
 "When you request that a package is installed, and as a result other packages "
 "are installed to satisfy its dependencies, the dependencies are marked as "
@@ -2149,7 +2149,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:1
+#: apt-mark.8.xml
 msgid ""
 "<literal>auto</literal> is used to mark a package as being automatically "
 "installed, which will cause the package to be removed when no more manually "
@@ -2157,7 +2157,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:1
+#: apt-mark.8.xml
 msgid ""
 "<literal>manual</literal> is used to mark a package as being manually "
 "installed, which will prevent the package from being automatically removed "
@@ -2165,7 +2165,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:1
+#: apt-mark.8.xml
 msgid ""
 "<literal>showauto</literal> is used to print a list of automatically "
 "installed packages with each package on a new line.  All automatically "
@@ -2174,7 +2174,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:1
+#: apt-mark.8.xml
 msgid ""
 "<literal>showmanual</literal> can be used in the same way as "
 "<literal>showauto</literal> except that it will print a list of manually "
@@ -2182,7 +2182,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:1
+#: apt-mark.8.xml
 msgid ""
 "Read/Write package stats from the filename given with the parameter "
 "&synopsis-param-filename; instead of from the default location, which is "
@@ -2191,38 +2191,38 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-mark.8.xml:1
+#: apt-mark.8.xml
 msgid "Prevent Changes for a Package"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:1
+#: apt-mark.8.xml
 msgid ""
 "<literal>hold</literal> is used to mark a package as held back, which will "
 "prevent the package from being automatically installed, upgraded or removed."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:1
+#: apt-mark.8.xml
 msgid ""
 "<literal>unhold</literal> is used to cancel a previously set hold on a "
 "package to allow all actions again."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:1
+#: apt-mark.8.xml
 msgid ""
 "<literal>showhold</literal> is used to print a list of packages on hold in "
 "the same way as for the other show commands."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-mark.8.xml:1
+#: apt-mark.8.xml
 msgid "Schedule Packages for Install, Remove and Purge"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:1
+#: apt-mark.8.xml
 msgid ""
 "Some front-ends like <command>apt-get dselect-upgrade</command> can be used "
 "to apply previously scheduled changes to the install state of packages. Such "
@@ -2235,19 +2235,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:1
+#: apt-mark.8.xml
 msgid ""
 "<command>apt-mark</command> returns zero on normal operation, non-zero on "
 "error."
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-secure.8.xml:1
+#: apt-secure.8.xml
 msgid "Archive authentication support for APT"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:1
+#: apt-secure.8.xml
 msgid ""
 "Starting with version 0.6, <command>APT</command> contains code that does "
 "signature checking of the Release file for all repositories. This ensures "
@@ -2261,7 +2261,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:1
+#: apt-secure.8.xml
 msgid ""
 "Note: All APT-based package management front-ends like &apt-get;, &aptitude; "
 "and &synaptic; support this authentication feature, so this manpage uses "
@@ -2269,12 +2269,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:1
+#: apt-secure.8.xml
 msgid "Unsigned Repositories"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:1
+#: apt-secure.8.xml
 msgid ""
 "If an archive has an unsigned Release file or no Release file at all current "
 "APT versions will refuse to download data from them by default in "
@@ -2285,7 +2285,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:1
+#: apt-secure.8.xml
 msgid ""
 "You can force all APT clients to raise only warnings by setting the "
 "configuration option <option>Acquire::AllowInsecureRepositories</option> to "
@@ -2299,7 +2299,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:1
+#: apt-secure.8.xml
 msgid ""
 "A repository which previously was authenticated but would loose this state "
 "in an <command>update</command> operation raises an error in all APT clients "
@@ -2311,12 +2311,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:1
+#: apt-secure.8.xml
 msgid "Signed Repositories"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:1
+#: apt-secure.8.xml
 msgid ""
 "The chain of trust from an APT archive to the end user is made up of several "
 "steps. <command>apt-secure</command> is the last step in this chain; "
@@ -2327,7 +2327,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:1
+#: apt-secure.8.xml
 msgid ""
 "apt-secure does not review signatures at a package level. If you require "
 "tools to do this you should look at <command>debsig-verify</command> and "
@@ -2336,7 +2336,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:1
+#: apt-secure.8.xml
 msgid ""
 "The chain of trust in Debian starts (e.g.) when a maintainer uploads a new "
 "package or a new version of a package to the Debian archive. In order to "
@@ -2348,7 +2348,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:1
+#: apt-secure.8.xml
 msgid ""
 "Once the uploaded package is verified and included in the archive, the "
 "maintainer signature is stripped off, and checksums of the package are "
@@ -2361,7 +2361,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:1
+#: apt-secure.8.xml
 msgid ""
 "End users can check the signature of the Release file, extract a checksum of "
 "a package from it and compare it with the checksum of the package they "
@@ -2369,14 +2369,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:1
+#: apt-secure.8.xml
 msgid ""
 "Notice that this is distinct from checking signatures on a per package "
 "basis. It is designed to prevent two possible attacks:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:1
+#: apt-secure.8.xml
 msgid ""
 "<literal>Network \"man in the middle\" attacks</literal>. Without signature "
 "checking, malicious agents can introduce themselves into the package "
@@ -2386,7 +2386,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:1
+#: apt-secure.8.xml
 msgid ""
 "<literal>Mirror network compromise</literal>.  Without signature checking, a "
 "malicious agent can compromise a mirror host and modify the files in it to "
@@ -2395,7 +2395,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:1
+#: apt-secure.8.xml
 msgid ""
 "However, it does not defend against a compromise of the master server itself "
 "(which signs the packages) or against a compromise of the key used to sign "
@@ -2404,12 +2404,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:1
+#: apt-secure.8.xml
 msgid "Information changes"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:1
+#: apt-secure.8.xml
 msgid ""
 "A Release file contains beside the checksums for the files in the repository "
 "also general information about the repository like the origin, codename or "
@@ -2417,7 +2417,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:1
+#: apt-secure.8.xml
 msgid ""
 "This information is shown in various places so a repository owner should "
 "always ensure correctness. Further more user configuration like "
@@ -2428,12 +2428,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:1
+#: apt-secure.8.xml
 msgid "User Configuration"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:1
+#: apt-secure.8.xml
 msgid ""
 "<command>apt-key</command> is the program that manages the list of keys used "
 "by APT to trust repositories. It can be used to add or remove keys as well "
@@ -2442,7 +2442,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:1
+#: apt-secure.8.xml
 msgid ""
 "Note that a default installation already contains all keys to securely "
 "acquire packages from the default repositories, so fiddling with "
@@ -2451,7 +2451,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:1
+#: apt-secure.8.xml
 msgid ""
 "In order to add a new key you need to first download it (you should make "
 "sure you are using a trusted communication channel when retrieving it), add "
@@ -2462,19 +2462,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:1
+#: apt-secure.8.xml
 msgid "Repository Configuration"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:1
+#: apt-secure.8.xml
 msgid ""
 "If you want to provide archive signatures in an archive under your "
 "maintenance you have to:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:1
+#: apt-secure.8.xml
 msgid ""
 "<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
 "already. You can do this by running <command>apt-ftparchive "
@@ -2482,7 +2482,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:1
+#: apt-secure.8.xml
 msgid ""
 "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg "
 "--clearsign -o InRelease Release</command> and <command>gpg -abs -o "
@@ -2490,7 +2490,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:1
+#: apt-secure.8.xml
 msgid ""
 "<emphasis>Publish the key fingerprint</emphasis>, so that your users will "
 "know what key they need to import in order to authenticate the files in the "
@@ -2500,7 +2500,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:1
+#: apt-secure.8.xml
 msgid ""
 "<emphasis>Provide instructions on how to add your archive and "
 "key</emphasis>.  If your users can't acquire your key securely the chain of "
@@ -2511,7 +2511,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:1
+#: apt-secure.8.xml
 msgid ""
 "Whenever the contents of the archive change (new packages are added or "
 "removed) the archive maintainer has to follow the first two steps outlined "
@@ -2519,14 +2519,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:1
+#: apt-secure.8.xml
 msgid ""
 "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
 "&debsign;, &debsig-verify;, &gpg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:1
+#: apt-secure.8.xml
 msgid ""
 "For more background information you might want to review the <ulink "
 "url=\"https://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
@@ -2537,24 +2537,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:1
+#: apt-secure.8.xml
 msgid "Manpage Authors"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:1
+#: apt-secure.8.xml
 msgid ""
 "This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac "
 "Jones, Colin Walters, Florian Weimer and Michael Vogt."
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-cdrom.8.xml:1
+#: apt-cdrom.8.xml
 msgid "APT CD-ROM management utility"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:1
+#: apt-cdrom.8.xml
 msgid ""
 "<command>apt-cdrom</command> is used to add a new CD-ROM to APT's list of "
 "available sources. <command>apt-cdrom</command> takes care of determining "
@@ -2563,7 +2563,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:1
+#: apt-cdrom.8.xml
 msgid ""
 "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
 "system; it cannot be done by hand. Furthermore each disc in a multi-CD set "
@@ -2571,7 +2571,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:1
+#: apt-cdrom.8.xml
 msgid ""
 "<literal>add</literal> is used to add a new disc to the source list. It will "
 "unmount the CD-ROM device, prompt for a disc to be inserted and then proceed "
@@ -2581,7 +2581,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:1
+#: apt-cdrom.8.xml
 msgid ""
 "APT uses a CD-ROM ID to track which disc is currently in the drive and "
 "maintains a database of these IDs in "
@@ -2589,14 +2589,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:1
+#: apt-cdrom.8.xml
 msgid ""
 "A debugging tool to report the identity of the current disc as well as the "
 "stored file name"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:1
+#: apt-cdrom.8.xml
 msgid ""
 "Do not try to auto-detect the CD-ROM path. Usually combined with the "
 "<option>--cdrom</option> option.  Configuration Item: "
@@ -2604,7 +2604,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:1
+#: apt-cdrom.8.xml
 msgid ""
 "Mount point; specify the location to mount the CD-ROM. This mount point must "
 "be listed in <filename>/etc/fstab</filename> and properly configured.  "
@@ -2612,7 +2612,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:1
+#: apt-cdrom.8.xml
 msgid ""
 "Rename a disc; change the label of a disc or override the disc's given "
 "label. This option will cause <command>apt-cdrom</command> to prompt for a "
@@ -2620,7 +2620,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:1
+#: apt-cdrom.8.xml
 msgid ""
 "No mounting; prevent <command>apt-cdrom</command> from mounting and "
 "unmounting the mount point.  Configuration Item: "
@@ -2628,7 +2628,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:1
+#: apt-cdrom.8.xml
 msgid ""
 "Fast Copy; Assume the package files are valid and do not check every "
 "package. This option should be used only if <command>apt-cdrom</command> has "
@@ -2637,7 +2637,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:1
+#: apt-cdrom.8.xml
 msgid ""
 "Thorough Package Scan; This option may be needed with some old Debian "
 "1.1/1.2 discs that have Package files in strange places. It takes much "
@@ -2645,7 +2645,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:1
+#: apt-cdrom.8.xml
 msgid ""
 "No Changes; Do not change the &sources-list; file and do not write index "
 "files. Everything is still checked however.  Configuration Item: "
@@ -2653,24 +2653,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:1
+#: apt-cdrom.8.xml
 msgid "&apt-conf;, &apt-get;, &sources-list;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:1
+#: apt-cdrom.8.xml
 msgid ""
 "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
 "on error."
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-config.8.xml:1
+#: apt-config.8.xml
 msgid "APT Configuration Query program"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:1
+#: apt-config.8.xml
 msgid ""
 "<command>apt-config</command> is an internal program used by various "
 "portions of the APT suite to provide consistent configurability. It accesses "
@@ -2679,7 +2679,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:1
+#: apt-config.8.xml
 msgid ""
 "shell is used to access the configuration information from a shell "
 "script. It is given pairs of arguments, the first being a shell variable and "
@@ -2689,7 +2689,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-config.8.xml:1
+#: apt-config.8.xml
 #, no-wrap
 msgid ""
 "OPTS=\"-f\"\n"
@@ -2698,14 +2698,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:1
+#: apt-config.8.xml
 msgid ""
 "This will set the shell environment variable $OPTS to the value of "
 "MyApp::options with a default of <option>-f</option>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:1
+#: apt-config.8.xml
 msgid ""
 "The configuration item may be postfixed with a /[fdbi]. f returns file "
 "names, d returns directories, b returns true or false and i returns an "
@@ -2713,24 +2713,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:1
+#: apt-config.8.xml
 msgid "Just show the contents of the configuration space."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:1
+#: apt-config.8.xml
 msgid ""
 "Include options which have an empty value. This is the default, so use "
 "--no-empty to remove them from the output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-config.8.xml:1
+#: apt-config.8.xml
 msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:1
+#: apt-config.8.xml
 msgid ""
 "Defines the output of each config option. &percnt;t will be replaced with "
 "its individual name, &percnt;f with its full hierarchical name and &percnt;v "
@@ -2741,40 +2741,40 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:1 apt-extracttemplates.1.xml:1 apt-sortpkgs.1.xml:1
-#: apt-ftparchive.1.xml:1
+#: apt-config.8.xml apt-extracttemplates.1.xml apt-sortpkgs.1.xml
+#: apt-ftparchive.1.xml
 msgid "&apt-conf;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:1
+#: apt-config.8.xml
 msgid ""
 "<command>apt-config</command> returns zero on normal operation, decimal 100 "
 "on error."
 msgstr ""
 
 #. type: Content of: <refentry><refentryinfo><author><contrib>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid "Initial documentation of Debug::*."
 msgstr ""
 
 #. type: Content of: <refentry><refentryinfo><author><email>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid "dburrows@debian.org"
 msgstr ""
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt.conf.5.xml:1 apt_preferences.5.xml:1 sources.list.5.xml:1
+#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml
 msgid "5"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid "Configuration file for APT"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "<filename>/etc/apt/apt.conf</filename> is the main configuration file shared "
 "by all the tools in the APT suite of tools, though it is by no means the "
@@ -2783,21 +2783,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "When an APT tool starts up it will read the configuration files in the "
 "following order:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
 "any)"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
 "order which have either no or \"<literal>conf</literal>\" as filename "
@@ -2809,31 +2809,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid "the main configuration file specified by <literal>Dir::Etc::main</literal>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "all options set in the binary specific configuration subtree are moved into "
 "the root of the tree."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "the command line options are applied to override the configuration "
 "directives or to load even more configuration files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid "Syntax"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "The configuration file is organized in a tree with options organized into "
 "functional groups. Option specification is given with a double colon "
@@ -2843,7 +2843,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Syntactically the configuration language is modeled after what the ISC tools "
 "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@ -2858,7 +2858,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 #, no-wrap
 msgid ""
 "APT {\n"
@@ -2870,7 +2870,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "with newlines placed to make it more readable. Lists can be created by "
 "opening a scope and including a single string enclosed in quotes followed by "
@@ -2878,27 +2878,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 #, no-wrap
 msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "In general the sample configuration file &configureindex; is a good guide "
 "for how it should look."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Case is not significant in names of configuration items, so in the previous "
 "example you could use <literal>dpkg::pre-install-pkgs</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Names for the configuration items are optional if a list is defined as can "
 "be seen in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. If "
@@ -2908,7 +2908,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Two special commands are defined: <literal>#include</literal> (which is "
 "deprecated and not supported by alternative implementations) and "
@@ -2920,7 +2920,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "The <literal>#clear</literal> command is the only way to delete a list or a "
 "complete scope. Reopening a scope (or using the syntax described below with "
@@ -2930,7 +2930,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "All of the APT tools take an -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "
@@ -2942,7 +2942,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Note that appending items to a list using <literal>::</literal> only works "
 "for one item per line, and that you should not use it in combination with "
@@ -2959,19 +2959,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid "The APT Group"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "This group of options controls general APT behavior as well as holding the "
 "options for all of the tools."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "System Architecture; sets the architecture to use when fetching files and "
 "parsing package lists. The internal default is the architecture apt was "
@@ -2979,7 +2979,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "All Architectures the system supports. For instance, CPUs implementing the "
 "<literal>amd64</literal> (also called <literal>x86-64</literal>)  "
@@ -2993,7 +2993,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "This scope defines which compression formats are supported, how compression "
 "and decompression can be performed if support for this format isn't built "
@@ -3006,7 +3006,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><informalexample><programlisting>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 #, no-wrap
 msgid ""
 "APT::Compressor::rev {\n"
@@ -3020,7 +3020,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "List of all build profiles enabled for build-dependency resolution, without "
 "the \"<literal>profile.</literal>\" namespace prefix.  By default this list "
@@ -3029,7 +3029,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Default release to install packages from if more than one version is "
 "available. Contains release name, codename or release version. Examples: "
@@ -3038,14 +3038,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Ignore held packages; this global option causes the problem resolver to "
 "ignore held packages in its decision making."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Defaults to on. When turned on the autoclean feature will remove any "
 "packages which can no longer be downloaded from the cache. If turned off "
@@ -3054,7 +3054,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Defaults to on, which will cause APT to install essential and important "
 "packages as soon as possible in an install/upgrade operation, in order to "
@@ -3069,7 +3069,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "The immediate configuration marker is also applied in the potentially "
 "problematic case of circular dependencies, since a dependency with the "
@@ -3086,7 +3086,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Before a big operation like <literal>dist-upgrade</literal> is run with this "
 "option disabled you should try to explicitly <literal>install</literal> the "
@@ -3097,7 +3097,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Never enable this option unless you <emphasis>really</emphasis> know what "
 "you are doing. It permits APT to temporarily remove an essential package to "
@@ -3110,7 +3110,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "APT uses since version 0.7.26 a resizable memory mapped cache file to store "
 "the available information. <literal>Cache-Start</literal> acts as a hint of "
@@ -3131,38 +3131,38 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid "Defines which packages are considered essential build dependencies."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "The Get subsection controls the &apt-get; tool; please see its documentation "
 "for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "The Cache subsection controls the &apt-cache; tool; please see its "
 "documentation for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool; please see its "
 "documentation for more information about the options here."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid "The Acquire Group"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages as well as the various \"acquire methods\" responsible for the "
@@ -3170,7 +3170,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Security related option defaulting to true, as giving a Release file's "
 "validation an expiration date prevents replay attacks over a long timescale, "
@@ -3185,7 +3185,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Maximum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3199,7 +3199,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Minimum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3213,7 +3213,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Allow use of the internal TLS support in the http method. If set to false, "
 "this completely disables support for TLS in apt's own methods (excluding the "
@@ -3221,7 +3221,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
 "<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -3230,7 +3230,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: "
 "<literal>FileLimit</literal> can be used to specify a maximum number of "
@@ -3242,7 +3242,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Try to download indexes via an URI constructed from a hashsum of the "
 "expected file rather than downloaded via a well-known stable filename. True "
@@ -3253,7 +3253,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Queuing mode; <literal>Queue-Mode</literal> can be one of "
 "<literal>host</literal> or <literal>access</literal> which determines how "
@@ -3263,21 +3263,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Number of retries to perform. If this is non-zero APT will retry failed "
 "files the given number of times."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Use symlinks for source archives. If set to true then source archives will "
 "be symlinked when possible instead of copying. True is the default."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "<literal>http::Proxy</literal> sets the default proxy to use for HTTP "
 "URIs. It is in the standard form of "
@@ -3290,7 +3290,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
 "caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
@@ -3302,14 +3302,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1 apt.conf.5.xml:1
+#: apt.conf.5.xml apt.conf.5.xml
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method; this value applies to the connection as well as the data timeout."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 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 "
@@ -3321,14 +3321,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
 "follow redirects, which is enabled by default."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "The used bandwidth can be limited with "
 "<literal>Acquire::http::Dl-Limit</literal> which accepts integer values in "
@@ -3338,7 +3338,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "<literal>Acquire::http::User-Agent</literal> can be used to set a different "
 "User-Agent for the http download method as some proxies allow access for "
@@ -3346,7 +3346,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
 "an external command to discover the http proxy to use. The first and only "
@@ -3364,7 +3364,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
 "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -3375,7 +3375,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -3399,7 +3399,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
 "It is in the standard form of "
@@ -3420,7 +3420,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
 "to leave passive mode on; it works in nearly every environment.  However, "
@@ -3430,7 +3430,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "It is possible to proxy FTP over HTTP by setting the "
 "<envar>ftp_proxy</envar> environment variable to an HTTP URL - see the "
@@ -3440,7 +3440,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
 "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -3450,13 +3450,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 #, no-wrap
 msgid "/cdrom/::Mount \"foo\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "For URIs using the <literal>cdrom</literal> method, the only configurable "
 "option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -3469,7 +3469,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "For GPGV URIs the only configurable option is "
 "<literal>gpgv::Options</literal>, which passes additional parameters to "
@@ -3477,7 +3477,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 #, no-wrap
 msgid ""
 "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> "
@@ -3485,7 +3485,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "List of compression types which are understood by the acquire methods.  "
 "Files like <filename>Packages</filename> can be available in various "
@@ -3498,19 +3498,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order:: \"gz\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 #, no-wrap
 msgid "Acquire::CompressionTypes::Order { \"xz\"; \"gz\"; };"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Also, the <literal>Order</literal> subgroup can be used to define in which "
 "order the acquire system will try to download the compressed files. The "
@@ -3527,13 +3527,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 #, no-wrap
 msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Note that the "
 "<literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will be "
@@ -3549,7 +3549,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
 "uncompressed files a preference, but note that most archives don't provide "
@@ -3557,7 +3557,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "When downloading <literal>gzip</literal> compressed indexes (Packages, "
 "Sources, or Translations), keep them gzip compressed locally instead of "
@@ -3566,7 +3566,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the "
@@ -3578,13 +3578,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 #, no-wrap
 msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "The default list includes \"environment\" and "
 "\"en\". \"<literal>environment</literal>\" has a special meaning here: it "
@@ -3606,7 +3606,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Note: To prevent problems resulting from APT being executed in different "
 "environments (e.g. by different users or by other programs) all Translation "
@@ -3616,24 +3616,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid "When downloading, force to use only the IPv4 protocol."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid "When downloading, force to use only the IPv6 protocol."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "The maximum file size of Release/Release.gpg/InRelease files.  The default "
 "is 10MB."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "This option controls if apt will use the DNS SRV server record as specified "
 "in RFC 2782 to select an alternative server to connect to.  The default is "
@@ -3641,7 +3641,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Allow update operations to load data files from repositories without "
 "sufficient security information.  The default value is "
@@ -3650,7 +3650,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Allow update operations to load data files from repositories which provide "
 "security information, but these are deemed no longer cryptographically "
@@ -3659,7 +3659,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Allow that a repository that was previously gpg signed to become unsigned "
 "during an update operation. When there is no valid signature for a "
@@ -3670,12 +3670,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid "scope"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Acquiring changelogs can only be done if an URI is known from where to get "
 "them.  Preferable the Release file indicates this in a 'Changelogs' "
@@ -3706,12 +3706,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid "Binary specific configuration"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Especially with the introduction of the <command>apt</command> binary it can "
 "be useful to set certain options only for a specific binary as even options "
@@ -3721,7 +3721,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Setting an option for a specific binary only can be achieved by setting the "
 "option inside the "
@@ -3732,7 +3732,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Note that as seen in the DESCRIPTION section further above you can't set "
 "binary-specific options on the commandline itself nor in configuration files "
@@ -3740,12 +3740,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid "Directories"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -3757,7 +3757,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -3771,7 +3771,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "<literal>Dir::Etc</literal> contains the location of configuration files, "
 "<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -3781,7 +3781,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "The <literal>Dir::Parts</literal> setting reads in all the config fragments "
 "in lexical order from the directory specified. After this is done then the "
@@ -3789,7 +3789,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Binary programs are pointed to by "
 "<literal>Dir::Bin</literal>. <literal>Dir::Bin::Methods</literal> specifies "
@@ -3801,7 +3801,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "The configuration item <literal>RootDir</literal> has a special meaning.  If "
 "set, all paths will be relative to <literal>RootDir</literal>, "
@@ -3815,7 +3815,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "The <literal>Ignore-Files-Silently</literal> list can be used to specify "
 "which files APT should silently ignore while parsing the files in the "
@@ -3826,12 +3826,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid "APT in DSelect"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "When APT is used as a &dselect; method several configuration directives "
 "control the default behavior. These are in the <literal>DSelect</literal> "
@@ -3839,7 +3839,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Cache Clean mode; this value may be one of <literal>always</literal>, "
 "<literal>prompt</literal>, <literal>auto</literal>, "
@@ -3853,40 +3853,40 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the install phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "The contents of this variable are passed to &apt-get; as command line "
 "options when it is run for the update phase."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "If true the [U]pdate operation in &dselect; will always prompt to continue.  "
 "The default is to prompt only on error."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid "How APT calls &dpkg;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Several configuration directives control how APT invokes &dpkg;. These are "
 "in the <literal>DPkg</literal> section."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "This is a list of options to pass to &dpkg;. The options must be specified "
 "using the list notation and each list item is passed as a single argument to "
@@ -3894,7 +3894,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "This is a list of shell commands to run before/after invoking &dpkg;.  Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -3903,7 +3903,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "This is a list of shell commands to run before invoking &dpkg;. Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -3914,7 +3914,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Version 2 of this protocol sends more information through the requested file "
 "descriptor: a line with the text <literal>VERSION 2</literal>, the APT "
@@ -3923,7 +3923,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Each configuration directive line has the form "
 "<literal>key=value</literal>.  Special characters (equal signs, newlines, "
@@ -3935,7 +3935,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Package action lines consist of five fields in Version 2: package name "
 "(without architecture qualification even if foreign), old version, direction "
@@ -3949,7 +3949,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "In Version 3 after each version field follows the architecture of this "
 "version, which is \"-\" if there is no version, and a field showing the "
@@ -3959,7 +3959,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "The version of the protocol to be used for the command "
 "<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -3970,7 +3970,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "The file descriptor to be used to send the information can be requested with "
 "<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</literal> "
@@ -3981,21 +3981,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "APT chdirs to this directory before invoking &dpkg;, the default is "
 "<filename>/</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "These options are passed to &dpkg-buildpackage; when compiling packages; the "
 "default is to disable signing and produce all binaries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "If this option is set APT will call <command>dpkg --configure "
 "--pending</command> to let &dpkg; handle all required configurations and "
@@ -4006,12 +4006,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid "Periodic and Archives options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
 "of options configure behavior of apt periodic updates, which is done by the "
@@ -4020,12 +4020,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid "Debug options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Enabling options in the <literal>Debug::</literal> section will cause "
 "debugging information to be sent to the standard error stream of the program "
@@ -4036,7 +4036,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "<literal>Debug::pkgProblemResolver</literal> enables output about the "
 "decisions made by <literal>dist-upgrade, upgrade, install, remove, "
@@ -4044,7 +4044,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "<literal>Debug::NoLocking</literal> disables all file locking.  This can be "
 "used to run some operations (for instance, <literal>apt-get -s "
@@ -4052,7 +4052,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
 "time that <literal>apt</literal> invokes &dpkg;."
@@ -4062,65 +4062,65 @@ msgstr ""
 #. 	   motivating example, except I haven't a clue why you'd want
 #. 	   to do this. 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 "in CD-ROM IDs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid "A full list of debugging options to apt follows."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid "Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid "Print information related to downloading packages using FTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid "Print information related to downloading packages using HTTPS."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Print information related to verifying cryptographic signatures using "
 "<literal>gpg</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Output information about the process of accessing collections of packages "
 "stored on CD-ROMs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid "Describes the process of resolving build-dependencies in &apt-get;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Output each cryptographic hash that is generated by the "
 "<literal>apt</literal> libraries."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Do not include information from <literal>statfs</literal>, namely the number "
 "of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -4128,52 +4128,52 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Disable all file locking.  For instance, this will allow two instances of "
 "<quote><literal>apt-get update</literal></quote> to run at the same time."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid "Log when items are added to or removed from the global download queue."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Output status messages and errors related to verifying checksums and "
 "cryptographic signatures of downloaded files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Output information about downloading and applying package index list diffs, "
 "and errors relating to package index list diffs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Output information related to patching apt package lists when downloading "
 "index diffs instead of full indices."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid "Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Log events related to the automatically-installed status of packages and to "
 "the removal of unused packages."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Generate debug messages describing which packages are being automatically "
 "installed to resolve dependencies.  This corresponds to the initial "
@@ -4183,7 +4183,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Generate debug messages describing which packages are marked as "
 "keep/install/remove while the ProblemResolver does his work.  Each addition "
@@ -4201,45 +4201,45 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "When invoking &dpkg;, output the precise command line with which it is being "
 "invoked, with arguments separated by a single space character."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Output all the data received from &dpkg; on the status file descriptor and "
 "any errors encountered while parsing it."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Generate a trace of the algorithm that decides the order in which "
 "<literal>apt</literal> should pass packages to &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid "Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid "Output the priority of each package list on startup."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Trace the execution of the dependency resolver (this applies only to what "
 "happens when a complex dependency problem is encountered)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Display a list of all installed packages with their calculated score used by "
 "the pkgProblemResolver. The description of the package is the same as "
@@ -4247,14 +4247,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Print information about the vendors read from "
 "<filename>/etc/apt/vendors.list</filename>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "Display the external commands that are called by apt hooks.  This includes "
 "e.g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
@@ -4262,13 +4262,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1 apt_preferences.5.xml:1 sources.list.5.xml:1
-#: apt-ftparchive.1.xml:1
+#: apt.conf.5.xml apt_preferences.5.xml sources.list.5.xml apt-ftparchive.1.xml
 msgid "Examples"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid ""
 "&configureindex; is a configuration file showing example values for all "
 "possible options."
@@ -4276,17 +4275,17 @@ msgstr ""
 
 #.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1
+#: apt.conf.5.xml
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid "Preference control file for APT"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "The APT preferences file <filename>/etc/apt/preferences</filename> and the "
 "fragment files in the <filename>/etc/apt/preferences.d/</filename> folder "
@@ -4295,7 +4294,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "Several versions of a package may be available for installation when the "
 "&sources-list; file contains references to more than one distribution (for "
@@ -4308,7 +4307,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "Several instances of the same version of a package may be available when the "
 "&sources-list; file contains references to more than one source.  In this "
@@ -4318,7 +4317,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "Preferences are a strong power in the hands of a system administrator but "
 "they can become also their biggest nightmare if used without care! APT will "
@@ -4332,7 +4331,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "Note that the files in the <filename>/etc/apt/preferences.d</filename> "
 "directory are parsed in alphanumeric ascending order and need to obey the "
@@ -4345,12 +4344,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid "APT's Default Priority Assignments"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 #, no-wrap
 msgid ""
 "<command>apt-get install -t testing "
@@ -4358,13 +4357,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 #, no-wrap
 msgid "APT::Default-Release \"stable\";\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "If there is no preferences file or if there is no entry in the file that "
 "applies to a particular version then the priority assigned to that version "
@@ -4381,19 +4380,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "If the target release has been specified then APT uses the following "
 "algorithm to set the priorities of the versions of a package.  Assign:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid "priority 1"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "to the versions coming from archives which in their "
 "<filename>Release</filename> files are marked as \"NotAutomatic: yes\" but "
@@ -4402,12 +4401,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid "priority 100"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "to the version that is already installed (if any) and to the versions coming "
 "from archives which in their <filename>Release</filename> files are marked "
@@ -4416,34 +4415,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid "priority 500"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid "to the versions that do not belong to the target release."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid "priority 990"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid "to the versions that belong to the target release."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "The highest of those priorities whose description matches the version is "
 "assigned to the version."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "If the target release has not been specified then APT simply assigns "
 "priority 100 to all installed package versions and priority 500 to all "
@@ -4454,14 +4453,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "APT then applies the following rules, listed in order of precedence, to "
 "determine which version of a package to install."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "Never downgrade unless the priority of an available version exceeds 1000.  "
 "(\"Downgrading\" is installing a less recent version of a package in place "
@@ -4471,19 +4470,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid "Install the highest priority version."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "If two or more versions have the same priority, install the most recent one "
 "(that is, the one with the higher version number)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "If two or more versions have the same priority and version number but either "
 "the packages differ in some of their metadata or the "
@@ -4491,7 +4490,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "In a typical situation, the installed version of a package (priority 100)  "
 "is not as recent as one of the versions available from the sources listed in "
@@ -4502,7 +4501,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "More rarely, the installed version of a package is <emphasis>more</emphasis> "
 "recent than any of the other available versions.  The package will not be "
@@ -4512,7 +4511,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "Sometimes the installed version of a package is more recent than the version "
 "belonging to the target release, but not as recent as a version belonging to "
@@ -4524,12 +4523,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid "The Effect of APT Preferences"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "The APT preferences file allows the system administrator to control the "
 "assignment of priorities.  The file consists of one or more multi-line "
@@ -4538,7 +4537,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "The specific form assigns a priority (a \"Pin-Priority\") to one or more "
 "specified packages with a specified version or version range.  For example, "
@@ -4549,7 +4548,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -4558,7 +4557,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "The general form assigns a priority to all of the package versions in a "
 "given distribution (that is, to all the versions of packages that are listed "
@@ -4568,7 +4567,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "This general-form entry in the APT preferences file applies only to groups "
 "of packages.  For example, the following record assigns a high priority to "
@@ -4576,7 +4575,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -4585,7 +4584,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "A note of caution: the keyword used here is \"<literal>origin</literal>\" "
 "which can be used to match a hostname. The following record will assign a "
@@ -4594,7 +4593,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -4603,7 +4602,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "This should <emphasis>not</emphasis> be confused with the Origin of a "
 "distribution as specified in a <filename>Release</filename> file.  What "
@@ -4613,7 +4612,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "The following record assigns a low priority to all package versions "
 "belonging to any distribution whose Archive name is "
@@ -4621,7 +4620,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -4630,7 +4629,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any distribution whose Codename is "
@@ -4638,7 +4637,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -4647,7 +4646,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -4656,7 +4655,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -4665,7 +4664,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "The effect of the comma operator is similar to an \"and\" in logic: All "
 "conditions must be satisfied for the pin to match. There is one exception: "
@@ -4674,12 +4673,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid "Regular expressions and &glob; syntax"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "APT also supports pinning by &glob; expressions, and regular expressions "
 "surrounded by slashes. For example, the following example assigns the "
@@ -4689,7 +4688,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 #, no-wrap
 msgid ""
 "Package: gnome* /kde/\n"
@@ -4698,7 +4697,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "The rule for those expressions is that they can occur anywhere where a "
 "string can occur. Thus, the following pin assigns the priority 990 to all "
@@ -4706,7 +4705,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -4715,7 +4714,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "If a regular expression occurs in a <literal>Package</literal> field, the "
 "behavior is the same as if this regular expression were replaced with a list "
@@ -4726,99 +4725,99 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid "How APT Interprets Priorities"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking):"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid "P &gt;= 1000"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "causes a version to be installed even if this constitutes a downgrade of the "
 "package"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid "990 &lt;= P &lt; 1000"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "causes a version to be installed even if it does not come from the target "
 "release, unless the installed version is more recent"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid "500 &lt;= P &lt; 990"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to the target release or the installed version is more recent"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid "100 &lt;= P &lt; 500"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "causes a version to be installed unless there is a version available "
 "belonging to some other distribution or the installed version is more recent"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid "0 &lt; P &lt; 100"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "causes a version to be installed only if there is no installed version of "
 "the package"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid "P &lt; 0"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid "prevents the version from being installed"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid "P = 0"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid "has undefined behaviour, do not use it."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "The first specific-form record matching an available package version "
 "determines the priority of the package version.  Failing that, the priority "
@@ -4828,14 +4827,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "For example, suppose the APT preferences file contains the three records "
 "presented earlier:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 #, no-wrap
 msgid ""
 "Package: perl\n"
@@ -4852,12 +4851,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid "Then:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "The most recent available version of the <literal>perl</literal> package "
 "will be installed, so long as that version's version number begins with "
@@ -4868,7 +4867,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "A version of any package other than <literal>perl</literal> that is "
 "available from the local system has priority over other versions, even "
@@ -4876,7 +4875,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "A version of a package whose origin is not the local system but some other "
 "site listed in &sources-list; and which belongs to an "
@@ -4885,12 +4884,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid "Determination of Package Version and Distribution Properties"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "The locations listed in the &sources-list; file should provide "
 "<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -4898,7 +4897,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 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>: "
@@ -4910,27 +4909,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid "the <literal>Package:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid "gives the package name"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:1 apt_preferences.5.xml:1
+#: apt_preferences.5.xml apt_preferences.5.xml
 msgid "the <literal>Version:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid "gives the version number for the named package"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "The <filename>Release</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -4944,12 +4943,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "names the archive to which all the packages in the directory tree belong.  "
 "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -4960,18 +4959,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 #, no-wrap
 msgid "Pin: release a=stable\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid "the <literal>Codename:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
 "For example, the line \"Codename: &debian-testing-codename;\" specifies that "
@@ -4982,13 +4981,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 #, no-wrap
 msgid "Pin: release n=&debian-testing-codename;\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "names the release version.  For example, the packages in the tree might "
 "belong to Debian release version &debian-stable-version;.  Note that there "
@@ -4999,7 +4998,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 #, no-wrap
 msgid ""
 "Pin: release v=&debian-stable-version;\n"
@@ -5008,12 +5007,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid "the <literal>Component:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "names the licensing component associated with the packages in the directory "
 "tree of the <filename>Release</filename> file.  For example, the line "
@@ -5025,18 +5024,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 #, no-wrap
 msgid "Pin: release c=main\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid "the <literal>Origin:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "names the originator of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is "
@@ -5045,18 +5044,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 #, no-wrap
 msgid "Pin: release o=Debian\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid "the <literal>Label:</literal> line"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "names the label of the packages in the directory tree of the "
 "<filename>Release</filename> file.  Most commonly, this is "
@@ -5065,13 +5064,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 #, no-wrap
 msgid "Pin: release l=Debian\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "All of the <filename>Packages</filename> and <filename>Release</filename> "
 "files retrieved from locations listed in the &sources-list; file are stored "
@@ -5086,12 +5085,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid "Optional Lines in an APT Preferences Record"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "Each record in the APT preferences file can optionally begin with one or "
 "more lines beginning with the word <literal>Explanation:</literal>.  This "
@@ -5099,12 +5098,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid "Tracking Stable"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated\n"
@@ -5119,7 +5118,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -5129,7 +5128,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:1 apt_preferences.5.xml:1 apt_preferences.5.xml:1
+#: apt_preferences.5.xml apt_preferences.5.xml apt_preferences.5.xml
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -5138,7 +5137,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest "
@@ -5147,13 +5146,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/testing\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>testing</literal> distribution; the package "
@@ -5162,12 +5161,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid "Tracking Testing or Unstable"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 #, no-wrap
 msgid ""
 "Package: *\n"
@@ -5184,7 +5183,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "The following APT preferences file will cause APT to assign a high priority "
 "to package versions from the <literal>testing</literal> distribution, a "
@@ -5195,7 +5194,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest "
@@ -5204,13 +5203,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>unstable</literal> distribution.  "
@@ -5222,12 +5221,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid "Tracking the evolution of a codename release"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 #, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package "
@@ -5249,7 +5248,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "The following APT preferences file will cause APT to assign a priority "
 "higher than the default (500) to all package versions belonging to a "
@@ -5264,7 +5263,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest version(s) in "
@@ -5273,13 +5272,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 #, no-wrap
 msgid "apt-get install <replaceable>package</replaceable>/sid\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@ -5291,17 +5290,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:1
+#: apt_preferences.5.xml
 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid "List of configured APT data sources"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid ""
 "The source list <filename>/etc/apt/sources.list</filename> and the files "
 "contained in <filename>/etc/apt/sources.list.d/</filename> are designed to "
@@ -5315,12 +5314,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid "sources.list.d"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid ""
 "The <filename>/etc/apt/sources.list.d</filename> directory provides a way to "
 "add sources.list entries in separate files.  Two different file formats are "
@@ -5335,12 +5334,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid "One-Line-Style Format"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid ""
 "Files in this format have the extension <filename>.list</filename>.  Each "
 "line specifying a source starts with a type "
@@ -5361,7 +5360,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid ""
 "This is the traditional format and supported by all apt versions.  Note that "
 "not all options as described below are supported by all apt versions.  Note "
@@ -5371,12 +5370,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid "deb822-Style Format"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid ""
 "Files in this format have the extension <filename>.sources</filename>.  The "
 "format is similar in syntax to other files used by Debian and its "
@@ -5398,7 +5397,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid ""
 "This is a new format supported by apt itself since version 1.1. Previous "
 "versions ignore such files with a notice message as described earlier.  It "
@@ -5413,12 +5412,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid "The deb and deb-src Types: General Format"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid ""
 "The <literal>deb</literal> type references a typical two-level Debian "
 "archive, <filename>distribution/component</filename>. The "
@@ -5434,14 +5433,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid ""
 "The format for two one-line-style entries using the <literal>deb</literal> "
 "and <literal>deb-src</literal> types is:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 #, no-wrap
 msgid ""
 "deb [ option1=value1 option2=value2 ] uri suite [component1] [component2] "
@@ -5451,7 +5450,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 #, no-wrap
 msgid ""
 "     Types: deb deb-src\n"
@@ -5464,14 +5463,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid ""
 "Alternatively the equivalent entry in deb822 style looks like this: "
 "<placeholder type=\"literallayout\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid ""
 "The URI for the <literal>deb</literal> type must specify the base of the "
 "Debian distribution, from which APT will find the information it needs.  "
@@ -5484,7 +5483,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid ""
 "<literal>suite</literal> may also contain a variable, "
 "<literal>$(ARCH)</literal> which expands to the Debian architecture (such as "
@@ -5496,7 +5495,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid ""
 "Especially in the one-line-style format since only one distribution can be "
 "specified per line it may be necessary to have multiple lines for the same "
@@ -5511,7 +5510,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid ""
 "It is important to list sources in order of preference, with the most "
 "preferred source listed first. Typically this will result in sorting by "
@@ -5520,19 +5519,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 #, no-wrap
 msgid "&sourceslist-list-format;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 #, no-wrap
 msgid "&sourceslist-sources-format;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid ""
 "As an example, the sources for your distribution could look like this in "
 "one-line-style format: <placeholder type=\"literallayout\" id=\"0\"/> or "
@@ -5541,12 +5540,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid "The deb and deb-src types: Options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid ""
 "Each source entry can have options specified to modify which source is "
 "accessed and how data is acquired from it. Format, syntax and names of the "
@@ -5560,7 +5559,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid ""
 "<option>Architectures</option> (<option>arch</option>) is a multivalue "
 "option defining for which architectures information should be downloaded. If "
@@ -5569,7 +5568,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid ""
 "<option>Languages</option> (<option>lang</option>) is a multivalue option "
 "defining for which languages information such as translated package "
@@ -5579,7 +5578,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid ""
 "<option>Targets</option> (<option>target</option>) is a multivalue option "
 "defining which download targets apt will try to acquire from this source. If "
@@ -5592,7 +5591,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid ""
 "<option>PDiffs</option> (<option>pdiffs</option>)  is a yes/no value which "
 "controls if APT should try to use PDiffs to update old indexes instead of "
@@ -5605,7 +5604,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid ""
 "<option>By-Hash</option> (<option>by-hash</option>)  can have the value "
 "<literal>yes</literal>, <literal>no</literal> or <literal>force</literal> "
@@ -5623,7 +5622,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid ""
 "Furthermore, there are options which if set affect <emphasis>all</emphasis> "
 "sources with the same URI and Suite, so they have to be set on all such "
@@ -5632,7 +5631,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid ""
 "<option>Allow-Insecure</option> (<option>allow-insecure</option>), "
 "<option>Allow-Weak</option> (<option>allow-weak</option>) and "
@@ -5643,7 +5642,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid ""
 "<option>Trusted</option> (<option>trusted</option>)  is a tri-state value "
 "which defaults to APT deciding if a source is considered trusted or if "
@@ -5659,7 +5658,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid ""
 "<option>Signed-By</option> (<option>signed-by</option>)  is either an "
 "absolute path to a keyring file (has to be accessible and readable for the "
@@ -5676,7 +5675,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid ""
 "<option>Check-Valid-Until</option> (<option>check-valid-until</option>)  is "
 "a yes/no value which controls if APT should try to detect replay attacks. A "
@@ -5694,7 +5693,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid ""
 "<option>Valid-Until-Min</option> (<option>valid-until-min</option>) and "
 "<option>Valid-Until-Max</option> (<option>valid-until-max</option>) can be "
@@ -5710,17 +5709,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid "URI Specification"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid "The currently recognized URI types are:"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid ""
 "The http scheme specifies an HTTP server for an archive and is the most "
 "commonly used method, with many options in the "
@@ -5735,7 +5734,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid ""
 "Note that these forms of authentication are insecure as the whole "
 "communication with the remote server (or proxy) is not encrypted so a "
@@ -5746,7 +5745,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid ""
 "The https scheme specifies an HTTPS server for an archive and is very "
 "similar in use and available options to the http scheme. The main difference "
@@ -5759,7 +5758,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid ""
 "The file scheme allows an arbitrary directory in the file system to be "
 "considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -5767,7 +5766,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid ""
 "The cdrom scheme allows APT to use a local CD-ROM, DVD or USB drive with "
 "media swapping. Use the &apt-cdrom; program to create cdrom entries in the "
@@ -5775,7 +5774,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid ""
 "The ftp scheme specifies an FTP server for an archive. Use of FTP is on the "
 "decline in favour of <literal>http</literal> and <literal>https</literal> "
@@ -5785,7 +5784,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid ""
 "Please note that an FTP proxy can be specified by using the "
 "<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
@@ -5796,7 +5795,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "
@@ -5805,7 +5804,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid ""
 "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
 "the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -5814,12 +5813,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid "adding more recognizable URI types"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid ""
 "APT can be extended with more methods shipped in other optional packages, "
 "which should follow the naming scheme "
@@ -5830,20 +5829,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid ""
 "Uses the archive stored locally (or NFS mounted) at /home/apt/debian for "
 "stable/main, stable/contrib, and stable/non-free."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 #, no-wrap
 msgid "deb file:/home/apt/debian stable main contrib non-free"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 #, no-wrap
 msgid ""
 "Types: deb\n"
@@ -5853,18 +5852,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid "As above, except this uses the unstable (development) distribution."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 #, no-wrap
 msgid "deb file:/home/apt/debian unstable main contrib non-free"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 #, no-wrap
 msgid ""
 "Types: deb\n"
@@ -5874,18 +5873,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid "Sources specification for the above."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 #, no-wrap
 msgid "deb-src file:/home/apt/debian unstable main contrib non-free"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 #, no-wrap
 msgid ""
 "Types: deb-src\n"
@@ -5895,7 +5894,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid ""
 "The first line gets package information for the architectures in "
 "<literal>APT::Architectures</literal> while the second always retrieves "
@@ -5903,7 +5902,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 #, no-wrap
 msgid ""
 "deb http://deb.debian.org/debian &debian-stable-codename; main\n"
@@ -5912,7 +5911,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 #, no-wrap
 msgid ""
 "Types: deb\n"
@@ -5928,20 +5927,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid ""
 "Uses HTTP to access the archive at archive.debian.org, and uses only the "
 "hamm/main area."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 #, no-wrap
 msgid "deb http://archive.debian.org/debian-archive hamm main"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 #, no-wrap
 msgid ""
 "Types: deb\n"
@@ -5951,20 +5950,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the &debian-stable-codename;/contrib area."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian &debian-stable-codename; contrib"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 #, no-wrap
 msgid ""
 "Types: deb\n"
@@ -5974,7 +5973,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the unstable/contrib area. If this line appears as "
@@ -5983,13 +5982,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 #, no-wrap
 msgid "deb ftp://ftp.debian.org/debian unstable contrib"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 #, no-wrap
 msgid ""
 "Types: deb\n"
@@ -5999,13 +5998,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 #, no-wrap
 msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 #, no-wrap
 msgid ""
 "Types: deb\n"
@@ -6014,7 +6013,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid ""
 "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
 "directory, and uses only files found under "
@@ -6027,14 +6026,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid ""
 "Uses HTTP to get binary packages as well as sources from the stable, testing "
 "and unstable suites and the components main and contrib."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 #, no-wrap
 msgid ""
 "deb http://deb.debian.org/debian stable main contrib\n"
@@ -6046,7 +6045,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 #, no-wrap
 msgid ""
 "Types: deb deb-src\n"
@@ -6056,24 +6055,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:1
+#: sources.list.5.xml
 msgid "&apt-get;, &apt-conf;, &apt-acquire-additional-files;"
 msgstr ""
 
 #. type: Content of: <refentry><refmeta><manvolnum>
-#: apt-extracttemplates.1.xml:1 apt-sortpkgs.1.xml:1 apt-ftparchive.1.xml:1
+#: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml
 msgid "1"
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-extracttemplates.1.xml:1
+#: apt-extracttemplates.1.xml
 msgid ""
 "Utility to extract <command>debconf</command> config and templates from "
 "Debian packages"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:1
+#: apt-extracttemplates.1.xml
 msgid ""
 "<command>apt-extracttemplates</command> will take one or more Debian package "
 "files as input and write out (to a temporary directory) all associated "
@@ -6083,12 +6082,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:1
+#: apt-extracttemplates.1.xml
 msgid "package version template-file config-script"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:1
+#: apt-extracttemplates.1.xml
 msgid ""
 "template-file and config-script are written to the temporary directory "
 "specified by the <option>-t</option> or <option>--tempdir</option> "
@@ -6098,7 +6097,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-extracttemplates.1.xml:1
+#: apt-extracttemplates.1.xml
 msgid ""
 "Temporary directory in which to write extracted <command>debconf</command> "
 "template files and config scripts.  Configuration Item: "
@@ -6106,19 +6105,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:1
+#: apt-extracttemplates.1.xml
 msgid ""
 "<command>apt-extracttemplates</command> returns zero on normal operation, "
 "decimal 100 on error."
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-sortpkgs.1.xml:1
+#: apt-sortpkgs.1.xml
 msgid "Utility to sort package index files"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:1
+#: apt-sortpkgs.1.xml
 msgid ""
 "<command>apt-sortpkgs</command> will take an index file (source index or "
 "package index) and sort the records so that they are ordered by the package "
@@ -6127,31 +6126,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:1
+#: apt-sortpkgs.1.xml
 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:1
+#: apt-sortpkgs.1.xml
 msgid ""
 "Use source index field ordering.  Configuration Item: "
 "<literal>APT::SortPkgs::Source</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:1
+#: apt-sortpkgs.1.xml
 msgid ""
 "<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
 "100 on error."
 msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid "Utility to generate index files"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "<command>apt-ftparchive</command> is the command line tool that generates "
 "the index files that APT uses to access a distribution source. The index "
@@ -6160,7 +6159,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
 "program, incorporating its entire functionality via the "
@@ -6170,7 +6169,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "Internally <command>apt-ftparchive</command> can make use of binary "
 "databases to cache the contents of a .deb file and it does not rely on any "
@@ -6180,7 +6179,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "The packages command generates a package file from a directory tree. It "
 "takes the given directory and recursively searches it for .deb files, "
@@ -6189,12 +6188,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1 apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml apt-ftparchive.1.xml
 msgid "The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "The <literal>sources</literal> command generates a source index file from a "
 "directory tree.  It takes the given directory and recursively searches it "
@@ -6203,7 +6202,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "If an override file is specified then a source override file will be looked "
 "for with an extension of .src. The --source-override option can be used to "
@@ -6211,7 +6210,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "The <literal>contents</literal> command generates a contents file from a "
 "directory tree. It takes the given directory and recursively searches it for "
@@ -6222,7 +6221,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "The <literal>release</literal> command generates a Release file from a "
 "directory tree. It recursively searches the given directory for uncompressed "
@@ -6238,7 +6237,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under "
@@ -6254,7 +6253,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "The <literal>generate</literal> command is designed to be runnable from a "
 "cron script and builds indexes according to the given config file. The "
@@ -6264,19 +6263,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "The <literal>clean</literal> command tidies the databases used by the given "
 "configuration file by removing any records that are no longer necessary."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid "The Generate Configuration"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "The <literal>generate</literal> command uses a configuration file to "
 "describe the archives that are going to be generated. It follows the typical "
@@ -6287,17 +6286,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid "The generate configuration has four separate sections, each described below."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid "<literal>Dir</literal> Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "The <literal>Dir</literal> section defines the standard directories needed "
 "to locate the files required during the generation process. These "
@@ -6306,7 +6305,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "Specifies the root of the FTP archive, in a standard Debian configuration "
 "this is the directory that contains the <filename>ls-LR</filename> and dist "
@@ -6314,29 +6313,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid "Specifies the location of the override files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid "Specifies the location of the cache files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "Specifies the location of the file list files, if the "
 "<literal>FileList</literal> setting is used below."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid "<literal>Default</literal> Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "The <literal>Default</literal> section specifies default values, and "
 "settings that control the operation of the generator. Other sections may "
@@ -6344,7 +6343,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "Sets the default compression schemes to use for the package index files. It "
 "is a string that contains a space separated list of at least one of the "
@@ -6353,42 +6352,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "Sets the default list of file extensions that are package files.  This "
 "defaults to '.deb'."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Sources files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "Sets the default list of file extensions that are source files.  This "
 "defaults to '.dsc'."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Contents files."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Translation-en master file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "Specifies the number of kilobytes to delink (and replace with hard links) "
 "per run. This is used in conjunction with the per-section "
@@ -6396,14 +6395,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "Specifies the mode of all created index files. It defaults to 0644. All "
 "index files are set to this mode with no regard to the umask."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1 apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml apt-ftparchive.1.xml
 msgid ""
 "Specifies whether long descriptions should be included in the "
 "<filename>Packages</filename> file or split out into a master "
@@ -6411,12 +6410,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid "<literal>TreeDefault</literal> Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "Sets defaults specific to <literal>Tree</literal> sections. All of these "
 "variables are substitution variables and have the strings $(DIST), "
@@ -6424,7 +6423,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "Sets the number of kilobytes of contents files that are generated each "
 "day. The contents files are round-robined so that over several days they "
@@ -6432,7 +6431,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "Controls the number of days a contents file is allowed to be checked without "
 "changing. If this limit is passed the mtime of the contents file is "
@@ -6443,35 +6442,35 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "Sets the top of the .deb directory tree. Defaults to "
 "<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "Sets the top of the source package directory tree. Defaults to "
 "<filename>$(DIST)/$(SECTION)/source/</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "Sets the output Packages file. Defaults to "
 "<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "Sets the output Sources file. Defaults to "
 "<filename>$(DIST)/$(SECTION)/source/Sources</filename>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "Sets the output Translation-en master file with the long descriptions if "
 "they should be not included in the Packages file. Defaults to "
@@ -6479,7 +6478,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "Sets the path prefix that causes a symlink to be considered an internal link "
 "instead of an external link. Defaults to "
@@ -6487,7 +6486,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "Sets the output Contents file. Defaults to "
 "<filename>$(DIST)/$(SECTION)/Contents-$(ARCH)</filename>. If this setting "
@@ -6497,19 +6496,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid "Sets header file to prepend to the contents output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "Sets the binary cache database to use for this section. Multiple sections "
 "can share the same database."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "Specifies that instead of walking the directory tree, "
 "<command>apt-ftparchive</command> should read the list of files from the "
@@ -6517,7 +6516,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "Specifies that instead of walking the directory tree, "
 "<command>apt-ftparchive</command> should read the list of files from the "
@@ -6526,12 +6525,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid "<literal>Tree</literal> Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "The <literal>Tree</literal> section defines a standard Debian file tree "
 "which consists of a base directory, then multiple sections in that base "
@@ -6541,7 +6540,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "The <literal>Tree</literal> section takes a scope tag which sets the "
 "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@ -6550,7 +6549,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "All of the settings defined in the <literal>TreeDefault</literal> section "
 "can be used in a <literal>Tree</literal> section as well as three new "
@@ -6558,7 +6557,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 #, no-wrap
 msgid ""
 "for i in Sections do \n"
@@ -6568,7 +6567,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "When processing a <literal>Tree</literal> section "
 "<command>apt-ftparchive</command> performs an operation similar to: "
@@ -6576,7 +6575,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "This is a space separated list of sections which appear under the "
 "distribution; typically this is something like <literal>main contrib "
@@ -6584,7 +6583,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "This is a space separated list of all the architectures that appear under "
 "search section. The special architecture 'source' is used to indicate that "
@@ -6595,36 +6594,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "Sets the binary override file. The override file contains section, priority "
 "and maintainer address information."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "Sets the source override file. The override file contains section "
 "information."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1 apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml apt-ftparchive.1.xml
 msgid "Sets the binary extra override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1 apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml apt-ftparchive.1.xml
 msgid "Sets the source extra override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid "<literal>BinDirectory</literal> Section"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "The <literal>bindirectory</literal> section defines a binary directory tree "
 "with no special structure. The scope tag specifies the location of the "
@@ -6634,54 +6633,54 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid "Sets the Packages file output."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "Sets the Sources file output. At least one of <literal>Packages</literal> or "
 "<literal>Sources</literal> is required."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid "Sets the Contents file output (optional)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid "Sets the binary override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid "Sets the source override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid "Sets the cache DB."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid "Appends a path to all the output paths."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid "Specifies the file list file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid "The Binary Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "The binary override file is fully compatible with &dpkg-scanpackages;. It "
 "contains four fields separated by spaces. The first field is the package "
@@ -6691,19 +6690,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 #, no-wrap
 msgid "old [// oldn]* => new"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 #, no-wrap
 msgid "new"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "The general form of the maintainer field is: <placeholder "
 "type=\"literallayout\" id=\"0\"/> or simply, <placeholder "
@@ -6714,12 +6713,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid "The Source Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "The source override file is fully compatible with &dpkg-scansources;. It "
 "contains two fields separated by spaces. The first field is the source "
@@ -6727,12 +6726,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid "The Extra Override File"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "The extra override file allows any arbitrary tag to be added or replaced in "
 "the output. It has three columns, the first is the package, the second is "
@@ -6740,7 +6739,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 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.  "
@@ -6756,14 +6755,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -6772,7 +6771,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "
@@ -6781,7 +6780,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -6791,7 +6790,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: "
@@ -6799,14 +6798,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "Make the caching databases read only.  Configuration Item: "
 "<literal>APT::FTPArchive::ReadOnlyDB</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "
@@ -6815,7 +6814,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -6829,7 +6828,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -6839,7 +6838,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 #, no-wrap
 msgid ""
 "<command>apt-ftparchive</command> packages "
@@ -6848,61 +6847,61 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:1
+#: apt-ftparchive.1.xml
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
 msgstr ""
 
 #. type: Attribute 'lang' of: <book>
-#: guide.dbk:1 offline.dbk:1
+#: guide.dbk offline.dbk
 msgid "en"
 msgstr ""
 
 #. type: Content of: <book><title>
-#: guide.dbk:1
+#: guide.dbk
 msgid "APT User's Guide"
 msgstr ""
 
 #. type: Content of: <book><bookinfo><authorgroup><author><personname>
-#: guide.dbk:1 offline.dbk:1
+#: guide.dbk offline.dbk
 msgid "Jason Gunthorpe"
 msgstr ""
 
 #. type: Content of: <book><bookinfo><authorgroup><author><email>
-#: guide.dbk:1 offline.dbk:1
+#: guide.dbk offline.dbk
 msgid "jgg@debian.org"
 msgstr ""
 
 #. type: Content of: <book><bookinfo><releaseinfo>
-#: guide.dbk:1 offline.dbk:1
+#: guide.dbk offline.dbk
 msgid "Version &apt-product-version;"
 msgstr ""
 
 #. type: Content of: <book><bookinfo><abstract><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid "This document provides an overview of how to use the APT package manager."
 msgstr ""
 
 #. type: Content of: <book><bookinfo>
-#: guide.dbk:1
+#: guide.dbk
 msgid "<copyright><year>1998</year><holder>Jason Gunthorpe</holder></copyright>"
 msgstr ""
 
 #. type: Content of: <book><bookinfo><legalnotice><title>
-#: guide.dbk:1 offline.dbk:1
+#: guide.dbk offline.dbk
 msgid "License Notice"
 msgstr ""
 
 #. type: Content of: <book><bookinfo><legalnotice><para>
-#: guide.dbk:1 offline.dbk:1
+#: guide.dbk offline.dbk
 msgid ""
 "\"APT\" and this document are free software; you can redistribute them "
 "and/or modify them under the terms of the GNU General Public License as "
@@ -6911,19 +6910,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><bookinfo><legalnotice><para>
-#: guide.dbk:1 offline.dbk:1
+#: guide.dbk offline.dbk
 msgid ""
 "For more details, on Debian systems, see the file "
 "/usr/share/common-licenses/GPL for the full license."
 msgstr ""
 
 #. type: Content of: <book><chapter><title>
-#: guide.dbk:1
+#: guide.dbk
 msgid "General"
 msgstr ""
 
 #. type: Content of: <book><chapter><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "The APT package currently contains two sections, the APT "
 "<command>dselect</command> method and the <command>apt-get</command> command "
@@ -6932,12 +6931,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><title>
-#: guide.dbk:1
+#: guide.dbk
 msgid "Anatomy of the Package System"
 msgstr ""
 
 #. type: Content of: <book><chapter><section><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "The Debian packaging system has a large amount of information associated "
 "with each package to help assure that it integrates cleanly and easily into "
@@ -6945,7 +6944,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "The dependency system allows individual programs to make use of shared "
 "elements in the system such as libraries. It simplifies placing infrequently "
@@ -6955,7 +6954,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "The first step to understanding the dependency system is to grasp the "
 "concept of a simple dependency. The meaning of a simple dependency is that a "
@@ -6964,7 +6963,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "For instance, mailcrypt is an emacs extension that aids in encrypting email "
 "with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
@@ -6973,7 +6972,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "The other important dependency to understand is a conflicting dependency. It "
 "means that a package, when installed with another package, will not work and "
@@ -6986,7 +6985,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "As an added complication there is the possibility for a package to pretend "
 "to be another package. Consider that exim and sendmail for many intents are "
@@ -6999,7 +6998,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "At any given time a single dependency may be met by packages that are "
 "already installed or it may not be. APT attempts to help resolve dependency "
@@ -7008,12 +7007,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><title>
-#: guide.dbk:1
+#: guide.dbk
 msgid "apt-get"
 msgstr ""
 
 #. type: Content of: <book><chapter><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "<command>apt-get</command> provides a simple way to install packages from "
 "the command line. Unlike <command>dpkg</command>, <command>apt-get</command> "
@@ -7022,14 +7021,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><para><footnote><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "If you are using an http proxy server you must set the http_proxy "
 "environment variable first, see sources.list(5)"
 msgstr ""
 
 #. type: Content of: <book><chapter><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "The first <placeholder type=\"footnote\" id=\"0\"/> thing that should be "
 "done before using <command>apt-get</command> is to fetch the package lists "
@@ -7039,7 +7038,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><screen>
-#: guide.dbk:1
+#: guide.dbk
 #, no-wrap
 msgid ""
 "# apt-get update\n"
@@ -7050,17 +7049,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid "Once updated there are several commands that can be used:"
 msgstr ""
 
 #. type: Content of: <book><chapter><variablelist><varlistentry><term>
-#: guide.dbk:1
+#: guide.dbk
 msgid "upgrade"
 msgstr ""
 
 #. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "Upgrade will attempt to gently upgrade the whole system. Upgrade will never "
 "install a new package or remove an existing package, nor will it ever "
@@ -7073,12 +7072,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><variablelist><varlistentry><term>
-#: guide.dbk:1
+#: guide.dbk
 msgid "install"
 msgstr ""
 
 #. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "Install is used to install packages by name. The package is automatically "
 "fetched and installed. This can be useful if you already know the name of "
@@ -7090,12 +7089,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><variablelist><varlistentry><term>
-#: guide.dbk:1
+#: guide.dbk
 msgid "dist-upgrade"
 msgstr ""
 
 #. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "Dist-upgrade is a complete upgrader designed to simplify upgrading between "
 "releases of Debian. It uses a sophisticated algorithm to determine the best "
@@ -7108,14 +7107,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><variablelist><varlistentry><listitem><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "It is important to closely look at what dist-upgrade is going to do, its "
 "decisions may sometimes be quite surprising."
 msgstr ""
 
 #. type: Content of: <book><chapter><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "<command>apt-get</command> has several command line options that are "
 "detailed in its man page, "
@@ -7129,12 +7128,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><title>
-#: guide.dbk:1
+#: guide.dbk
 msgid "DSelect"
 msgstr ""
 
 #. type: Content of: <book><chapter><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "The APT <command>dselect</command> method provides the complete APT system "
 "with the <command>dselect</command> package selection "
@@ -7143,7 +7142,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "To enable the APT method you need to select [A]ccess in "
 "<command>dselect</command> and then choose the APT method. You will be "
@@ -7158,7 +7157,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><screen>
-#: guide.dbk:1
+#: guide.dbk
 #, no-wrap
 msgid ""
 "   Set up a list of distribution source locations\n"
@@ -7176,7 +7175,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "The <emphasis>Sources</emphasis> setup starts by asking for the base of the "
 "Debian archive, defaulting to a HTTP mirror. Next it asks for the "
@@ -7184,7 +7183,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><screen>
-#: guide.dbk:1
+#: guide.dbk
 #, no-wrap
 msgid ""
 " Please give the distribution tag to get or a path to the\n"
@@ -7195,7 +7194,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "The distribution refers to the Debian version in the archive, "
 "<emphasis>stable</emphasis> refers to the latest released version and "
@@ -7207,7 +7206,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><screen>
-#: guide.dbk:1
+#: guide.dbk
 #, no-wrap
 msgid ""
 " Please give the components to get\n"
@@ -7217,7 +7216,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "The components list refers to the list of sub distributions to fetch. The "
 "distribution is split up based on software licenses, main being DFSG free "
@@ -7226,14 +7225,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "Any number of sources can be added, the setup script will continue to prompt "
 "until you have specified all that you want."
 msgstr ""
 
 #. type: Content of: <book><chapter><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "Before starting to use <command>dselect</command> it is necessary to update "
 "the available list by selecting [U]pdate from the menu. This is a superset "
@@ -7243,7 +7242,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "You can then go on and make your selections using [S]elect and then perform "
 "the installation using [I]nstall. When using the APT method the [C]onfig and "
@@ -7252,7 +7251,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "By default APT will automatically remove the package (.deb) files once they "
 "have been successfully installed. To change this behavior place "
@@ -7260,12 +7259,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><title>
-#: guide.dbk:1
+#: guide.dbk
 msgid "The Interface"
 msgstr ""
 
 #. type: Content of: <book><chapter><para><footnote><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "The <command>dselect</command> method actually is a set of wrapper scripts "
 "to <command>apt-get</command>. The method actually provides more "
@@ -7273,7 +7272,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "Both that APT <command>dselect</command> method and "
 "<command>apt-get</command> share the same interface. It is a simple system "
@@ -7284,12 +7283,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><title>
-#: guide.dbk:1
+#: guide.dbk
 msgid "Startup"
 msgstr ""
 
 #. type: Content of: <book><chapter><section><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "Before all operations except update, APT performs a number of actions to "
 "prepare its internal state. It also does some checks of the system's "
@@ -7298,7 +7297,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><screen>
-#: guide.dbk:1
+#: guide.dbk
 #, no-wrap
 msgid ""
 "# apt-get check\n"
@@ -7307,7 +7306,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "The first thing it does is read all the package files into memory. APT uses "
 "a caching scheme so this operation will be faster the second time it is "
@@ -7316,7 +7315,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "The final operation performs a detailed analysis of the system's "
 "dependencies. It checks every dependency of every installed or unpacked "
@@ -7325,7 +7324,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><screen>
-#: guide.dbk:1
+#: guide.dbk
 #, no-wrap
 msgid ""
 "# apt-get check\n"
@@ -7346,7 +7345,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "In this example the system has many problems, including a serious problem "
 "with libreadlineg2. For each package that has unmet dependencies a line is "
@@ -7356,14 +7355,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><para><footnote><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "APT however considers all known dependencies and attempts to prevent broken "
 "packages"
 msgstr ""
 
 #. type: Content of: <book><chapter><section><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "There are two ways a system can get into a broken state like this. The first "
 "is caused by <command>dpkg</command> missing some subtle relationships "
@@ -7374,7 +7373,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "The second situation is much less serious than the first because APT places "
 "certain constraints on the order that packages are installed. In both cases "
@@ -7386,7 +7385,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "However, if the <literal>-f</literal> option is used to correct a seriously "
 "broken system caused by the first case then it is possible that it will "
@@ -7396,12 +7395,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><title>
-#: guide.dbk:1
+#: guide.dbk
 msgid "The Status Report"
 msgstr ""
 
 #. type: Content of: <book><chapter><section><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "Before proceeding <command>apt-get</command> will present a report on what "
 "will happen. Generally the report reflects the type of operation being "
@@ -7412,12 +7411,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><section><title>
-#: guide.dbk:1
+#: guide.dbk
 msgid "The Extra Package list"
 msgstr ""
 
 #. type: Content of: <book><chapter><section><section><screen>
-#: guide.dbk:1
+#: guide.dbk
 #, no-wrap
 msgid ""
 "The following extra packages will be installed:\n"
@@ -7429,7 +7428,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><section><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "The Extra Package list shows all of the packages that will be installed or "
 "upgraded in excess of the ones mentioned on the command line. It is only "
@@ -7438,12 +7437,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><section><title>
-#: guide.dbk:1
+#: guide.dbk
 msgid "The Packages to Remove"
 msgstr ""
 
 #. type: Content of: <book><chapter><section><section><screen>
-#: guide.dbk:1
+#: guide.dbk
 #, no-wrap
 msgid ""
 "The following packages will be REMOVED:\n"
@@ -7454,7 +7453,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><section><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "The Packages to Remove list shows all of the packages that will be removed "
 "from the system. It can be shown for any of the operations and should be "
@@ -7466,12 +7465,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><section><title>
-#: guide.dbk:1
+#: guide.dbk
 msgid "The New Packages list"
 msgstr ""
 
 #. type: Content of: <book><chapter><section><section><screen>
-#: guide.dbk:1
+#: guide.dbk
 #, no-wrap
 msgid ""
 "The following NEW packages will installed:\n"
@@ -7479,7 +7478,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><section><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "The New Packages list is simply a reminder of what will happen. The packages "
 "listed are not presently installed in the system but will be when APT is "
@@ -7487,12 +7486,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><section><title>
-#: guide.dbk:1
+#: guide.dbk
 msgid "The Kept Back list"
 msgstr ""
 
 #. type: Content of: <book><chapter><section><section><screen>
-#: guide.dbk:1
+#: guide.dbk
 #, no-wrap
 msgid ""
 "The following packages have been kept back\n"
@@ -7501,7 +7500,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><section><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "Whenever the whole system is being upgraded there is the possibility that "
 "new versions of packages cannot be installed because they require new things "
@@ -7512,12 +7511,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><section><title>
-#: guide.dbk:1
+#: guide.dbk
 msgid "Held Packages warning"
 msgstr ""
 
 #. type: Content of: <book><chapter><section><section><screen>
-#: guide.dbk:1
+#: guide.dbk
 #, no-wrap
 msgid ""
 "The following held packages will be changed:\n"
@@ -7525,7 +7524,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><section><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "Sometimes you can ask APT to install a package that is on hold, in such a "
 "case it prints out a warning that the held package is going to be "
@@ -7533,17 +7532,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><section><title>
-#: guide.dbk:1
+#: guide.dbk
 msgid "Final summary"
 msgstr ""
 
 #. type: Content of: <book><chapter><section><section><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid "Finally, APT will print out a summary of all the changes that will occur."
 msgstr ""
 
 #. type: Content of: <book><chapter><section><section><screen>
-#: guide.dbk:1
+#: guide.dbk
 #, no-wrap
 msgid ""
 "206 packages upgraded, 8 newly installed, 23 to remove and 51 not "
@@ -7553,7 +7552,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><section><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "The first line of the summary simply is a reduced version of all of the "
 "lists and includes the number of upgrades - that is packages already "
@@ -7571,26 +7570,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><section><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "Some other reports can be generated by using the -u option to show packages "
 "to upgrade, they are similar to the previous examples."
 msgstr ""
 
 #. type: Content of: <book><chapter><section><title>
-#: guide.dbk:1
+#: guide.dbk
 msgid "The Status Display"
 msgstr ""
 
 #. type: Content of: <book><chapter><section><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "During the download of archives and package files APT prints out a series of "
 "status messages."
 msgstr ""
 
 #. type: Content of: <book><chapter><section><screen>
-#: guide.dbk:1
+#: guide.dbk
 #, no-wrap
 msgid ""
 "# apt-get update\n"
@@ -7604,7 +7603,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "The lines starting with <emphasis>Get</emphasis> are printed out when APT "
 "begins to fetch a file while the last line indicates the progress of the "
@@ -7615,7 +7614,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "The next section of the status line is repeated once for each download "
 "thread and indicates the operation being performed and some useful "
@@ -7628,7 +7627,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "Inside of the single quote is an informative string indicating the progress "
 "of the negotiation phase of the download. Typically it progresses from "
@@ -7647,7 +7646,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "The status display updates every half second to provide a constant feedback "
 "on the download progress while the Get lines scroll back whenever a new file "
@@ -7657,12 +7656,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><title>
-#: guide.dbk:1
+#: guide.dbk
 msgid "Dpkg"
 msgstr ""
 
 #. type: Content of: <book><chapter><section><para>
-#: guide.dbk:1
+#: guide.dbk
 msgid ""
 "APT uses <command>dpkg</command> for installing the archives and will switch "
 "over to the <command>dpkg</command> interface once downloading is "
@@ -7673,34 +7672,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><title>
-#: offline.dbk:1
+#: offline.dbk
 msgid "Using APT Offline"
 msgstr ""
 
 #. type: Content of: <book><bookinfo><abstract><para>
-#: offline.dbk:1
+#: offline.dbk
 msgid ""
 "This document describes how to use APT in a non-networked environment, "
 "specifically a 'sneaker-net' approach for performing upgrades."
 msgstr ""
 
 #. type: Content of: <book><bookinfo>
-#: offline.dbk:1
+#: offline.dbk
 msgid "<copyright><year>1999</year><holder>Jason Gunthorpe</holder></copyright>"
 msgstr ""
 
 #. type: Content of: <book><chapter><title>
-#: offline.dbk:1
+#: offline.dbk
 msgid "Introduction"
 msgstr ""
 
 #. type: Content of: <book><chapter><section><title>
-#: offline.dbk:1 offline.dbk:1 offline.dbk:1
+#: offline.dbk offline.dbk offline.dbk
 msgid "Overview"
 msgstr ""
 
 #. type: Content of: <book><chapter><section><para>
-#: offline.dbk:1
+#: offline.dbk
 msgid ""
 "Normally APT requires direct access to a Debian archive, either from a local "
 "media or through a network. Another common complaint is that a Debian "
@@ -7709,7 +7708,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><para>
-#: offline.dbk:1
+#: offline.dbk
 msgid ""
 "The solution to this is to use large removable media such as a Zip disc or a "
 "SuperDisk disc. These discs are not large enough to store the entire Debian "
@@ -7723,7 +7722,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><para>
-#: offline.dbk:1
+#: offline.dbk
 msgid ""
 "This is achieved by creatively manipulating the APT configuration file. The "
 "essential premise to tell APT to look on a disc for it's archive files. Note "
@@ -7732,12 +7731,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><title>
-#: offline.dbk:1
+#: offline.dbk
 msgid "Using APT on both machines"
 msgstr ""
 
 #. type: Content of: <book><chapter><section><para>
-#: offline.dbk:1
+#: offline.dbk
 msgid ""
 "APT being available on both machines gives the simplest configuration. The "
 "basic idea is to place a copy of the status file on the disc and use the "
@@ -7746,7 +7745,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><screen>
-#: offline.dbk:1
+#: offline.dbk
 #, no-wrap
 msgid ""
 "  /disc/\n"
@@ -7760,12 +7759,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><title>
-#: offline.dbk:1
+#: offline.dbk
 msgid "The configuration file"
 msgstr ""
 
 #. type: Content of: <book><chapter><section><para>
-#: offline.dbk:1
+#: offline.dbk
 msgid ""
 "The configuration file should tell APT to store its files on the disc and to "
 "use the configuration files on the disc as well. The sources.list should "
@@ -7777,14 +7776,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><para>
-#: offline.dbk:1
+#: offline.dbk
 msgid ""
 "<emphasis>apt.conf</emphasis> must contain the necessary information to make "
 "APT use the disc:"
 msgstr ""
 
 #. type: Content of: <book><chapter><section><screen>
-#: offline.dbk:1
+#: offline.dbk
 #, no-wrap
 msgid ""
 " APT\n"
@@ -7814,7 +7813,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><para>
-#: offline.dbk:1
+#: offline.dbk
 msgid ""
 "More details can be seen by examining the apt.conf man page and the sample "
 "configuration file in "
@@ -7822,7 +7821,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><para>
-#: offline.dbk:1
+#: offline.dbk
 msgid ""
 "On the target machine the first thing to do is mount the disc and copy "
 "<emphasis>/var/lib/dpkg/status</emphasis> to it. You will also need to "
@@ -7834,7 +7833,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><screen>
-#: offline.dbk:1
+#: offline.dbk
 #, no-wrap
 msgid ""
 " # export APT_CONFIG=\"/disc/apt.conf\"\n"
@@ -7845,7 +7844,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><para>
-#: offline.dbk:1
+#: offline.dbk
 msgid ""
 "The dist-upgrade command can be replaced with any other standard APT "
 "commands, particularly dselect-upgrade. You can even use an APT front end "
@@ -7854,14 +7853,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><para>
-#: offline.dbk:1
+#: offline.dbk
 msgid ""
 "Now the disc contains all of the index files and archives needed to upgrade "
 "the target machine. Take the disc back and run:"
 msgstr ""
 
 #. type: Content of: <book><chapter><section><screen>
-#: offline.dbk:1
+#: offline.dbk
 #, no-wrap
 msgid ""
 "  # export APT_CONFIG=\"/disc/apt.conf\"\n"
@@ -7872,14 +7871,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><para>
-#: offline.dbk:1
+#: offline.dbk
 msgid ""
 "It is necessary for proper function to re-specify the status file to be the "
 "local one. This is very important!"
 msgstr ""
 
 #. type: Content of: <book><chapter><section><para>
-#: offline.dbk:1
+#: offline.dbk
 msgid ""
 "If you are using dselect you can do the very risky operation of copying "
 "disc/status to /var/lib/dpkg/status so that any selections you made on the "
@@ -7889,12 +7888,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><title>
-#: offline.dbk:1
+#: offline.dbk
 msgid "Using APT and wget"
 msgstr ""
 
 #. type: Content of: <book><chapter><section><para>
-#: offline.dbk:1
+#: offline.dbk
 msgid ""
 "<emphasis>wget</emphasis> is a popular and portable download tool that can "
 "run on nearly any machine. Unlike the method above this requires that the "
@@ -7902,7 +7901,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><para>
-#: offline.dbk:1
+#: offline.dbk
 msgid ""
 "The basic idea is to create a disc that has only the archive files "
 "downloaded from the remote site. This is done by using the --print-uris "
@@ -7911,19 +7910,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><title>
-#: offline.dbk:1
+#: offline.dbk
 msgid "Operation"
 msgstr ""
 
 #. type: Content of: <book><chapter><section><para>
-#: offline.dbk:1
+#: offline.dbk
 msgid ""
 "Unlike the previous technique no special configuration files are "
 "required. We merely use the standard APT commands to generate the file list."
 msgstr ""
 
 #. type: Content of: <book><chapter><section><screen>
-#: offline.dbk:1
+#: offline.dbk
 #, no-wrap
 msgid ""
 " # apt-get dist-upgrade\n"
@@ -7933,14 +7932,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><para>
-#: offline.dbk:1
+#: offline.dbk
 msgid ""
 "Any command other than dist-upgrade could be used here, including "
 "dselect-upgrade."
 msgstr ""
 
 #. type: Content of: <book><chapter><section><para>
-#: offline.dbk:1
+#: offline.dbk
 msgid ""
 "The /disc/wget-script file will now contain a list of wget commands to "
 "execute in order to fetch the necessary archives. This script should be run "
@@ -7949,12 +7948,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><para>
-#: offline.dbk:1
+#: offline.dbk
 msgid "The remote machine would do something like"
 msgstr ""
 
 #. type: Content of: <book><chapter><section><screen>
-#: offline.dbk:1
+#: offline.dbk
 #, no-wrap
 msgid ""
 "  # cd /disc\n"
@@ -7963,19 +7962,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><chapter><section><para>
-#: offline.dbk:1
+#: offline.dbk
 msgid ""
 "Once the archives are downloaded and the disc returned to the Debian machine "
 "installation can proceed using,"
 msgstr ""
 
 #. type: Content of: <book><chapter><section><screen>
-#: offline.dbk:1
+#: offline.dbk
 #, no-wrap
 msgid "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgstr ""
 
 #. type: Content of: <book><chapter><section><para>
-#: offline.dbk:1
+#: offline.dbk
 msgid "Which will use the already fetched archives on the disc."
 msgstr ""
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index 4f5b3943f..d9585ce4a 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -14,7 +14,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
-   <date>2017-08-17T00:00:00Z</date>
+   <date>2017-08-24T00:00:00Z</date>
  </refentryinfo>
  
  <refmeta>
diff --git a/po/apt-all.pot b/po/apt-all.pot
index c3b1dca8a..837ed0e4c 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 1.5~rc1\n"
+"Project-Id-Version: apt 1.5~rc2\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-08-24 23:21+0200\n"
+"POT-Creation-Date: 2017-09-09 21:47+0200\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"
@@ -986,9 +986,6 @@ msgstr ""
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
-#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
-#. a file like main/binary-amd64/Packages; filename and linenumber of
-#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
@@ -2731,6 +2728,10 @@ msgstr ""
 msgid "detect proxy using apt.conf"
 msgstr ""
 
+#: cmdline/apt-helper.cc
+msgid "wait for system to be online"
+msgstr ""
+
 #: cmdline/apt-internal-planner.cc
 msgid ""
 "Usage: apt-internal-planner\n"
diff --git a/po/ar.po b/po/ar.po
index dc21f6768..29e7646a3 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-08-17 19:28+0200\n"
+"POT-Creation-Date: 2017-09-09 21:47+0200\n"
 "PO-Revision-Date: 2006-10-20 21:28+0300\n"
 "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"
@@ -997,9 +997,6 @@ msgstr "تعذر العثور على التحديد %s"
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
-#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
-#. a file like main/binary-amd64/Packages; filename and linenumber of
-#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
@@ -2777,6 +2774,10 @@ msgstr ""
 msgid "detect proxy using apt.conf"
 msgstr ""
 
+#: cmdline/apt-helper.cc
+msgid "wait for system to be online"
+msgstr ""
+
 #: cmdline/apt-internal-planner.cc
 msgid ""
 "Usage: apt-internal-planner\n"
diff --git a/po/ast.po b/po/ast.po
index 2317d9985..c7b8e9bf0 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.18\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-08-17 19:28+0200\n"
+"POT-Creation-Date: 2017-09-09 21:47+0200\n"
 "PO-Revision-Date: 2010-10-02 23:35+0100\n"
 "Last-Translator: Iñigo Varela <ivarela@softastur.org>\n"
 "Language-Team: Asturian (ast)\n"
@@ -1019,9 +1019,6 @@ msgstr "Escoyeta %s que nun s'atopa"
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
-#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
-#. a file like main/binary-amd64/Packages; filename and linenumber of
-#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
@@ -2870,6 +2867,10 @@ msgstr ""
 msgid "detect proxy using apt.conf"
 msgstr ""
 
+#: cmdline/apt-helper.cc
+msgid "wait for system to be online"
+msgstr ""
+
 #: cmdline/apt-internal-planner.cc
 #, fuzzy
 msgid ""
diff --git a/po/bg.po b/po/bg.po
index 359197034..7217547a5 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.21\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-08-17 19:28+0200\n"
+"POT-Creation-Date: 2017-09-09 21:47+0200\n"
 "PO-Revision-Date: 2012-06-25 17:23+0300\n"
 "Last-Translator: Damyan Ivanov <dmn@debian.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -1035,9 +1035,6 @@ msgstr "Изборът %s не е намерен"
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
-#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
-#. a file like main/binary-amd64/Packages; filename and linenumber of
-#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
@@ -2912,6 +2909,10 @@ msgstr ""
 msgid "detect proxy using apt.conf"
 msgstr ""
 
+#: cmdline/apt-helper.cc
+msgid "wait for system to be online"
+msgstr ""
+
 #: cmdline/apt-internal-planner.cc
 #, fuzzy
 msgid ""
diff --git a/po/bs.po b/po/bs.po
index 1acdf9cca..c24bb2682 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.26\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-08-17 19:28+0200\n"
+"POT-Creation-Date: 2017-09-09 21:47+0200\n"
 "PO-Revision-Date: 2004-05-06 15:25+0100\n"
 "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -994,9 +994,6 @@ msgstr ""
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
-#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
-#. a file like main/binary-amd64/Packages; filename and linenumber of
-#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
@@ -2761,6 +2758,10 @@ msgstr ""
 msgid "detect proxy using apt.conf"
 msgstr ""
 
+#: cmdline/apt-helper.cc
+msgid "wait for system to be online"
+msgstr ""
+
 #: cmdline/apt-internal-planner.cc
 msgid ""
 "Usage: apt-internal-planner\n"
diff --git a/po/ca.po b/po/ca.po
index babd8b2ca..347cb3d21 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.4~beta1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-08-17 19:28+0200\n"
+"POT-Creation-Date: 2017-09-09 21:47+0200\n"
 "PO-Revision-Date: 2016-12-05 21:09+0100\n"
 "Last-Translator: Oriol Debian <oriol.debian@gmail.com>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -1072,9 +1072,6 @@ msgstr "No s'ha trobat la selecció %s"
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr "L'objectiu %s vol obtenir el mateix fitxer (%s) que %s de l'origen %s"
 
-#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
-#. a file like main/binary-amd64/Packages; filename and linenumber of
-#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
@@ -3002,6 +2999,10 @@ msgstr "concatenar fitxers, amb descompressió automàtica"
 msgid "detect proxy using apt.conf"
 msgstr "detecta el servidor intermediari usant apt.conf"
 
+#: cmdline/apt-helper.cc
+msgid "wait for system to be online"
+msgstr ""
+
 #: cmdline/apt-internal-planner.cc
 msgid ""
 "Usage: apt-internal-planner\n"
diff --git a/po/cs.po b/po/cs.po
index 965607c32..203893cf2 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.4.2\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-08-17 19:28+0200\n"
+"POT-Creation-Date: 2017-09-09 21:47+0200\n"
 "PO-Revision-Date: 2017-05-06 11:08+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -1041,9 +1041,6 @@ msgstr "Výběr %s nenalezen"
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr "Cíl %s chce stáhnout stejný soubor (%s) jako %s ze zdroje %s"
 
-#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
-#. a file like main/binary-amd64/Packages; filename and linenumber of
-#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
@@ -2919,6 +2916,10 @@ msgstr "spojí soubory, automaticky je rozbalí"
 msgid "detect proxy using apt.conf"
 msgstr "detekuje proxy pomocí apt.conf"
 
+#: cmdline/apt-helper.cc
+msgid "wait for system to be online"
+msgstr ""
+
 #: cmdline/apt-internal-planner.cc
 msgid ""
 "Usage: apt-internal-planner\n"
diff --git a/po/cy.po b/po/cy.po
index 9dcbbbdcb..522200384 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-08-17 19:28+0200\n"
+"POT-Creation-Date: 2017-09-09 21:47+0200\n"
 "PO-Revision-Date: 2005-06-06 13:46+0100\n"
 "Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n"
 "Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n"
@@ -1021,9 +1021,6 @@ msgstr "Ni chanfuwyd y dewis %s"
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
-#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
-#. a file like main/binary-amd64/Packages; filename and linenumber of
-#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
@@ -2888,6 +2885,10 @@ msgstr ""
 msgid "detect proxy using apt.conf"
 msgstr ""
 
+#: cmdline/apt-helper.cc
+msgid "wait for system to be online"
+msgstr ""
+
 # FIXME: "debian"
 #: cmdline/apt-internal-planner.cc
 #, fuzzy
diff --git a/po/da.po b/po/da.po
index d63389a9f..7acdbbcea 100644
--- a/po/da.po
+++ b/po/da.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.4~rc2\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-08-17 19:28+0200\n"
+"POT-Creation-Date: 2017-09-09 21:47+0200\n"
 "PO-Revision-Date: 2017-03-02 23:51+0200\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -1049,9 +1049,6 @@ msgstr "Det valgte %s blev ikke fundet"
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr "Målet %s ønsker at erhverve den samme fil (%s) som %s fra kilden %s"
 
-#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
-#. a file like main/binary-amd64/Packages; filename and linenumber of
-#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
@@ -2941,6 +2938,10 @@ msgstr "sammenkæd filer, med automatisk dekomprimering"
 msgid "detect proxy using apt.conf"
 msgstr "detekter proxy via apt.conf"
 
+#: cmdline/apt-helper.cc
+msgid "wait for system to be online"
+msgstr ""
+
 #: cmdline/apt-internal-planner.cc
 msgid ""
 "Usage: apt-internal-planner\n"
diff --git a/po/de.po b/po/de.po
index 66ac411d4..4e579cc19 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.8\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-08-17 19:28+0200\n"
+"POT-Creation-Date: 2017-09-09 21:47+0200\n"
 "PO-Revision-Date: 2014-09-19 13:04+0100\n"
 "Last-Translator: Holger Wansing <linux@wansing-online.de>\n"
 "Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n"
@@ -1048,9 +1048,6 @@ msgstr "Auswahl %s nicht gefunden"
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
-#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
-#. a file like main/binary-amd64/Packages; filename and linenumber of
-#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
@@ -2975,6 +2972,10 @@ msgstr ""
 msgid "detect proxy using apt.conf"
 msgstr "erkennen eines Proxy-Servers mittels apt.conf"
 
+#: cmdline/apt-helper.cc
+msgid "wait for system to be online"
+msgstr ""
+
 #: cmdline/apt-internal-planner.cc
 #, fuzzy
 msgid ""
diff --git a/po/dz.po b/po/dz.po
index 2eebc3ed3..5b7c7b3e6 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-08-17 19:28+0200\n"
+"POT-Creation-Date: 2017-09-09 21:47+0200\n"
 "PO-Revision-Date: 2006-09-19 09:49+0530\n"
 "Last-Translator: Kinley Tshering <gasepkuenden2k3@hotmail.com>\n"
 "Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n"
@@ -1006,9 +1006,6 @@ msgstr "སེལ་འཐུ་%s ་མ་འཐོབ།"
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
-#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
-#. a file like main/binary-amd64/Packages; filename and linenumber of
-#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
@@ -2838,6 +2835,10 @@ msgstr ""
 msgid "detect proxy using apt.conf"
 msgstr ""
 
+#: cmdline/apt-helper.cc
+msgid "wait for system to be online"
+msgstr ""
+
 #: cmdline/apt-internal-planner.cc
 #, fuzzy
 msgid ""
diff --git a/po/el.po b/po/el.po
index 89e705e7d..0d1b7af34 100644
--- a/po/el.po
+++ b/po/el.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-08-17 19:28+0200\n"
+"POT-Creation-Date: 2017-09-09 21:47+0200\n"
 "PO-Revision-Date: 2008-08-26 18:25+0300\n"
 "Last-Translator: Θανάσης Νάτσης <natsisthanasis@gmail.com>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -1024,9 +1024,6 @@ msgstr "Η επιλογή %s δε βρέθηκε"
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
-#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
-#. a file like main/binary-amd64/Packages; filename and linenumber of
-#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
@@ -2865,6 +2862,10 @@ msgstr ""
 msgid "detect proxy using apt.conf"
 msgstr ""
 
+#: cmdline/apt-helper.cc
+msgid "wait for system to be online"
+msgstr ""
+
 #: cmdline/apt-internal-planner.cc
 #, fuzzy
 msgid ""
diff --git a/po/es.po b/po/es.po
index aff222d61..1733b99b5 100644
--- a/po/es.po
+++ b/po/es.po
@@ -34,7 +34,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.8.10\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-08-17 19:28+0200\n"
+"POT-Creation-Date: 2017-09-09 21:47+0200\n"
 "PO-Revision-Date: 2016-01-26 01:51+0100\n"
 "Last-Translator: Manuel \"Venturi\" Porras Peralta <venturi@openmailbox."
 "org>\n"
@@ -1136,9 +1136,6 @@ msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 "El objetivo %s quiere obtener el mismo fichero (%s) que %s del origen %s"
 
-#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
-#. a file like main/binary-amd64/Packages; filename and linenumber of
-#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
@@ -3058,6 +3055,10 @@ msgstr "concatenar ficheros, con descompresión automática"
 msgid "detect proxy using apt.conf"
 msgstr "detecta el proxy usando apt.conf"
 
+#: cmdline/apt-helper.cc
+msgid "wait for system to be online"
+msgstr ""
+
 #: cmdline/apt-internal-planner.cc
 #, fuzzy
 msgid ""
diff --git a/po/eu.po b/po/eu.po
index 2d45fe5e4..d898dd67c 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-08-17 19:28+0200\n"
+"POT-Creation-Date: 2017-09-09 21:47+0200\n"
 "PO-Revision-Date: 2009-05-17 00:41+0200\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n"
@@ -1009,9 +1009,6 @@ msgstr "%s hautapena ez da aurkitu"
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
-#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
-#. a file like main/binary-amd64/Packages; filename and linenumber of
-#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
@@ -2838,6 +2835,10 @@ msgstr ""
 msgid "detect proxy using apt.conf"
 msgstr ""
 
+#: cmdline/apt-helper.cc
+msgid "wait for system to be online"
+msgstr ""
+
 #: cmdline/apt-internal-planner.cc
 #, fuzzy
 msgid ""
diff --git a/po/fi.po b/po/fi.po
index 3a23e28d7..7e384c65d 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.26\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-08-17 19:28+0200\n"
+"POT-Creation-Date: 2017-09-09 21:47+0200\n"
 "PO-Revision-Date: 2008-12-11 14:52+0200\n"
 "Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -1003,9 +1003,6 @@ msgstr "Valintaa %s ei löydy"
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
-#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
-#. a file like main/binary-amd64/Packages; filename and linenumber of
-#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
@@ -2829,6 +2826,10 @@ msgstr ""
 msgid "detect proxy using apt.conf"
 msgstr ""
 
+#: cmdline/apt-helper.cc
+msgid "wait for system to be online"
+msgstr ""
+
 #: cmdline/apt-internal-planner.cc
 #, fuzzy
 msgid ""
diff --git a/po/fr.po b/po/fr.po
index a14e12552..e239bcc35 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-08-17 19:28+0200\n"
+"POT-Creation-Date: 2017-09-09 21:47+0200\n"
 "PO-Revision-Date: 2013-12-15 16:45+0100\n"
 "Last-Translator: Julien Patriarca <leatherface@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -1054,9 +1054,6 @@ msgstr "La sélection %s n'a pu être trouvée"
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
-#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
-#. a file like main/binary-amd64/Packages; filename and linenumber of
-#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
@@ -2967,6 +2964,10 @@ msgstr ""
 msgid "detect proxy using apt.conf"
 msgstr ""
 
+#: cmdline/apt-helper.cc
+msgid "wait for system to be online"
+msgstr ""
+
 #: cmdline/apt-internal-planner.cc
 #, fuzzy
 msgid ""
diff --git a/po/gl.po b/po/gl.po
index e7e789d71..73bd8a1e0 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-08-17 19:28+0200\n"
+"POT-Creation-Date: 2017-09-09 21:47+0200\n"
 "PO-Revision-Date: 2011-05-12 15:28+0100\n"
 "Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n"
 "Language-Team: galician <proxecto@trasno.net>\n"
@@ -1037,9 +1037,6 @@ msgstr "Non se atopou a selección %s"
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
-#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
-#. a file like main/binary-amd64/Packages; filename and linenumber of
-#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
@@ -2900,6 +2897,10 @@ msgstr ""
 msgid "detect proxy using apt.conf"
 msgstr ""
 
+#: cmdline/apt-helper.cc
+msgid "wait for system to be online"
+msgstr ""
+
 #: cmdline/apt-internal-planner.cc
 #, fuzzy
 msgid ""
diff --git a/po/hu.po b/po/hu.po
index e27b17c33..9641af863 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-08-17 19:28+0200\n"
+"POT-Creation-Date: 2017-09-09 21:47+0200\n"
 "PO-Revision-Date: 2016-04-10 19:46+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@ubuntu.com>\n"
 "Language-Team: Hungarian <gnome-hu-list@gnome.org>\n"
@@ -1066,9 +1066,6 @@ msgstr ""
 "%s cél ugyanazt a fájlt (%s) próbálja meg beszerezni, mint %s ebből a "
 "forrásból: %s"
 
-#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
-#. a file like main/binary-amd64/Packages; filename and linenumber of
-#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
@@ -2964,6 +2961,10 @@ msgstr "fájlok összefűzése, automatikus kibontással"
 msgid "detect proxy using apt.conf"
 msgstr "proxyfelismerés az apt-conf használatával"
 
+#: cmdline/apt-helper.cc
+msgid "wait for system to be online"
+msgstr ""
+
 #: cmdline/apt-internal-planner.cc
 #, fuzzy
 msgid ""
diff --git a/po/it.po b/po/it.po
index 44026b553..39d19569e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-08-17 19:28+0200\n"
+"POT-Creation-Date: 2017-09-09 21:47+0200\n"
 "PO-Revision-Date: 2015-04-07 16:51+0100\n"
 "Last-Translator: Milo Casagrande <milo@milo.name>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -1049,9 +1049,6 @@ msgstr "Selezione %s non trovata"
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
-#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
-#. a file like main/binary-amd64/Packages; filename and linenumber of
-#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
@@ -2945,6 +2942,10 @@ msgstr ""
 msgid "detect proxy using apt.conf"
 msgstr "Rileva proxy utilizzando apt.conf"
 
+#: cmdline/apt-helper.cc
+msgid "wait for system to be online"
+msgstr ""
+
 #: cmdline/apt-internal-planner.cc
 #, fuzzy
 msgid ""
diff --git a/po/ja.po b/po/ja.po
index ad7290dc6..3b596316d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.4\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-08-17 19:28+0200\n"
+"POT-Creation-Date: 2017-09-09 21:47+0200\n"
 "PO-Revision-Date: 2017-01-06 04:50+0900\n"
 "Last-Translator: Takuma Yamada <tyamada@takumayamada.com>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -1064,9 +1064,6 @@ msgstr ""
 "ターゲット %1$s はソース %4$s から %3$s と同じファイル (%2$s) の取得を求めて"
 "います"
 
-#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
-#. a file like main/binary-amd64/Packages; filename and linenumber of
-#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
@@ -2962,6 +2959,10 @@ msgstr "自動解凍とファイル結合"
 msgid "detect proxy using apt.conf"
 msgstr "apt.conf を使ってプロキシを検出する"
 
+#: cmdline/apt-helper.cc
+msgid "wait for system to be online"
+msgstr ""
+
 #: cmdline/apt-internal-planner.cc
 msgid ""
 "Usage: apt-internal-planner\n"
diff --git a/po/km.po b/po/km.po
index dc36a10ea..6732076b7 100644
--- a/po/km.po
+++ b/po/km.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-08-17 19:28+0200\n"
+"POT-Creation-Date: 2017-09-09 21:47+0200\n"
 "PO-Revision-Date: 2006-10-10 09:48+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
 "Language-Team: Khmer <support@khmeros.info>\n"
@@ -1004,9 +1004,6 @@ msgstr "ជម្រើស​ %s រក​មិន​ឃើញ​ឡើយ"
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
-#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
-#. a file like main/binary-amd64/Packages; filename and linenumber of
-#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
@@ -2821,6 +2818,10 @@ msgstr ""
 msgid "detect proxy using apt.conf"
 msgstr ""
 
+#: cmdline/apt-helper.cc
+msgid "wait for system to be online"
+msgstr ""
+
 #: cmdline/apt-internal-planner.cc
 #, fuzzy
 msgid ""
diff --git a/po/ko.po b/po/ko.po
index cfdaf573b..b7667d495 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-08-17 19:28+0200\n"
+"POT-Creation-Date: 2017-09-09 21:47+0200\n"
 "PO-Revision-Date: 2010-08-30 02:31+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -1005,9 +1005,6 @@ msgstr "선택한 %s이(가) 없습니다"
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
-#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
-#. a file like main/binary-amd64/Packages; filename and linenumber of
-#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
@@ -2834,6 +2831,10 @@ msgstr ""
 msgid "detect proxy using apt.conf"
 msgstr ""
 
+#: cmdline/apt-helper.cc
+msgid "wait for system to be online"
+msgstr ""
+
 #: cmdline/apt-internal-planner.cc
 #, fuzzy
 msgid ""
diff --git a/po/ku.po b/po/ku.po
index 47f3bad37..28f75f725 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-08-17 19:28+0200\n"
+"POT-Creation-Date: 2017-09-09 21:47+0200\n"
 "PO-Revision-Date: 2008-05-08 12:48+0200\n"
 "Last-Translator: Erdal Ronahi <erdal.ronahi@gmail.com>\n"
 "Language-Team: ku <ubuntu-l10n-kur@lists.ubuntu.com>\n"
@@ -997,9 +997,6 @@ msgstr "Hilbijartina %s nehatiye dîtin"
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
-#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
-#. a file like main/binary-amd64/Packages; filename and linenumber of
-#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
@@ -2762,6 +2759,10 @@ msgstr ""
 msgid "detect proxy using apt.conf"
 msgstr ""
 
+#: cmdline/apt-helper.cc
+msgid "wait for system to be online"
+msgstr ""
+
 #: cmdline/apt-internal-planner.cc
 #, fuzzy
 msgid ""
diff --git a/po/lt.po b/po/lt.po
index 3573b8860..128ea806d 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-08-17 19:28+0200\n"
+"POT-Creation-Date: 2017-09-09 21:47+0200\n"
 "PO-Revision-Date: 2008-08-02 01:47-0400\n"
 "Last-Translator: Gintautas Miliauskas <gintas@akl.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -999,9 +999,6 @@ msgstr ""
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
-#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
-#. a file like main/binary-amd64/Packages; filename and linenumber of
-#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
@@ -2808,6 +2805,10 @@ msgstr ""
 msgid "detect proxy using apt.conf"
 msgstr ""
 
+#: cmdline/apt-helper.cc
+msgid "wait for system to be online"
+msgstr ""
+
 #: cmdline/apt-internal-planner.cc
 #, fuzzy
 msgid ""
diff --git a/po/mr.po b/po/mr.po
index 4d21b35a3..281b55327 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-08-17 19:28+0200\n"
+"POT-Creation-Date: 2017-09-09 21:47+0200\n"
 "PO-Revision-Date: 2008-11-20 23:27+0530\n"
 "Last-Translator: Sampada <sampadanakhare@gmail.com>\n"
 "Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India "
@@ -1002,9 +1002,6 @@ msgstr "%s निवडक भाग सापडत नाही"
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
-#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
-#. a file like main/binary-amd64/Packages; filename and linenumber of
-#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
@@ -2818,6 +2815,10 @@ msgstr ""
 msgid "detect proxy using apt.conf"
 msgstr ""
 
+#: cmdline/apt-helper.cc
+msgid "wait for system to be online"
+msgstr ""
+
 #: cmdline/apt-internal-planner.cc
 #, fuzzy
 msgid ""
diff --git a/po/nb.po b/po/nb.po
index 0d7fc842a..fc5d76227 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-08-17 19:28+0200\n"
+"POT-Creation-Date: 2017-09-09 21:47+0200\n"
 "PO-Revision-Date: 2016-06-11 22:38+0200\n"
 "Last-Translator: Petter Reinholdtsen <pere@hungry.com>\n"
 "Language-Team: Norwegian Bokmål <i18n-no@lister.ping.uio.no>\n"
@@ -1022,9 +1022,6 @@ msgstr "Fant ikke utvalget %s"
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
-#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
-#. a file like main/binary-amd64/Packages; filename and linenumber of
-#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
@@ -2884,6 +2881,10 @@ msgstr "slå sammen filer, med automatisk utpakking"
 msgid "detect proxy using apt.conf"
 msgstr ""
 
+#: cmdline/apt-helper.cc
+msgid "wait for system to be online"
+msgstr ""
+
 #: cmdline/apt-internal-planner.cc
 #, fuzzy
 msgid ""
diff --git a/po/ne.po b/po/ne.po
index 0a9118b18..b52d05081 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-08-17 19:28+0200\n"
+"POT-Creation-Date: 2017-09-09 21:47+0200\n"
 "PO-Revision-Date: 2006-06-12 14:35+0545\n"
 "Last-Translator: Shiva Pokharel <pokharelshiva@hotmail.com>\n"
 "Language-Team: Nepali <info@mpp.org.np>\n"
@@ -1000,9 +1000,6 @@ msgstr "चयन %s फेला पार्न सकिएन"
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
-#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
-#. a file like main/binary-amd64/Packages; filename and linenumber of
-#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
@@ -2818,6 +2815,10 @@ msgstr ""
 msgid "detect proxy using apt.conf"
 msgstr ""
 
+#: cmdline/apt-helper.cc
+msgid "wait for system to be online"
+msgstr ""
+
 #: cmdline/apt-internal-planner.cc
 #, fuzzy
 msgid ""
diff --git a/po/nl.po b/po/nl.po
index 862f47807..d7e7bef76 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.4~beta4\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-09-03 13:13+0200\n"
+"POT-Creation-Date: 2017-09-09 21:47+0200\n"
 "PO-Revision-Date: 2017-08-12 16:38+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -1082,9 +1082,6 @@ msgstr "Selectie %s niet gevonden"
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr "Doel %s wil hetzelfde bestand (%s) als %s uit pakketbron %s opvragen"
 
-#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
-#. a file like main/binary-amd64/Packages; filename and linenumber of
-#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
@@ -3012,6 +3009,10 @@ msgstr "voeg bestanden samen, met automatische decompressie"
 msgid "detect proxy using apt.conf"
 msgstr "proxy opzoeken met behulp van apt.conf"
 
+#: cmdline/apt-helper.cc
+msgid "wait for system to be online"
+msgstr ""
+
 #: cmdline/apt-internal-planner.cc
 msgid ""
 "Usage: apt-internal-planner\n"
diff --git a/po/nn.po b/po/nn.po
index 63a252234..bfd4d5507 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-08-17 19:28+0200\n"
+"POT-Creation-Date: 2017-09-09 21:47+0200\n"
 "PO-Revision-Date: 2005-02-14 23:30+0100\n"
 "Last-Translator: Havard Korsvoll <korsvoll@skulelinux.no>\n"
 "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -1008,9 +1008,6 @@ msgstr "Fann ikkje utvalet %s"
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
-#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
-#. a file like main/binary-amd64/Packages; filename and linenumber of
-#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
@@ -2836,6 +2833,10 @@ msgstr ""
 msgid "detect proxy using apt.conf"
 msgstr ""
 
+#: cmdline/apt-helper.cc
+msgid "wait for system to be online"
+msgstr ""
+
 #: cmdline/apt-internal-planner.cc
 #, fuzzy
 msgid ""
diff --git a/po/pl.po b/po/pl.po
index 144582676..0d45d745a 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.9.7.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-08-17 19:28+0200\n"
+"POT-Creation-Date: 2017-09-09 21:47+0200\n"
 "PO-Revision-Date: 2012-07-28 21:53+0200\n"
 "Last-Translator: Michał Kułach <michal.kulach@gmail.com>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -1037,9 +1037,6 @@ msgstr "Nie odnaleziono wyboru %s"
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
-#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
-#. a file like main/binary-amd64/Packages; filename and linenumber of
-#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
@@ -2935,6 +2932,10 @@ msgstr ""
 msgid "detect proxy using apt.conf"
 msgstr ""
 
+#: cmdline/apt-helper.cc
+msgid "wait for system to be online"
+msgstr ""
+
 #: cmdline/apt-internal-planner.cc
 #, fuzzy
 msgid ""
diff --git a/po/pt.po b/po/pt.po
index 69cacaff0..90bbd43a5 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-08-17 19:28+0200\n"
+"POT-Creation-Date: 2017-09-09 21:47+0200\n"
 "PO-Revision-Date: 2012-06-29 15:45+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -1041,9 +1041,6 @@ msgstr "A selecção %s não foi encontrada"
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
-#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
-#. a file like main/binary-amd64/Packages; filename and linenumber of
-#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
@@ -2919,6 +2916,10 @@ msgstr ""
 msgid "detect proxy using apt.conf"
 msgstr ""
 
+#: cmdline/apt-helper.cc
+msgid "wait for system to be online"
+msgstr ""
+
 #: cmdline/apt-internal-planner.cc
 #, fuzzy
 msgid ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index f47419b6a..5b020bf4f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-08-17 19:28+0200\n"
+"POT-Creation-Date: 2017-09-09 21:47+0200\n"
 "PO-Revision-Date: 2008-11-17 02:33-0200\n"
 "Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n"
 "Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
@@ -1011,9 +1011,6 @@ msgstr "Seleção %s não encontrada"
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
-#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
-#. a file like main/binary-amd64/Packages; filename and linenumber of
-#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
@@ -2850,6 +2847,10 @@ msgstr ""
 msgid "detect proxy using apt.conf"
 msgstr ""
 
+#: cmdline/apt-helper.cc
+msgid "wait for system to be online"
+msgstr ""
+
 #: cmdline/apt-internal-planner.cc
 #, fuzzy
 msgid ""
diff --git a/po/ro.po b/po/ro.po
index 6d2245e4b..746e51b32 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-08-17 19:28+0200\n"
+"POT-Creation-Date: 2017-09-09 21:47+0200\n"
 "PO-Revision-Date: 2008-11-15 02:21+0200\n"
 "Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n"
 "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -1015,9 +1015,6 @@ msgstr "Selecția %s nu a fost găsită"
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
-#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
-#. a file like main/binary-amd64/Packages; filename and linenumber of
-#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
@@ -2858,6 +2855,10 @@ msgstr ""
 msgid "detect proxy using apt.conf"
 msgstr ""
 
+#: cmdline/apt-helper.cc
+msgid "wait for system to be online"
+msgstr ""
+
 #: cmdline/apt-internal-planner.cc
 #, fuzzy
 msgid ""
diff --git a/po/ru.po b/po/ru.po
index da1093ac9..b8e6179c8 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.2.12\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-08-17 19:28+0200\n"
+"POT-Creation-Date: 2017-09-09 21:47+0200\n"
 "PO-Revision-Date: 2017-07-01 16:05+0300\n"
 "Last-Translator: Aleksej Shilin <rootlexx@mail.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -1071,9 +1071,6 @@ msgstr "Не найдено: %s"
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr "Для цели %s нужно получить такой же файл (%s) как %s из источника %s"
 
-#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
-#. a file like main/binary-amd64/Packages; filename and linenumber of
-#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
@@ -2988,6 +2985,10 @@ msgstr "склеить файлы, с автоматическим разжат�
 msgid "detect proxy using apt.conf"
 msgstr "определять прокси с помощью apt.conf"
 
+#: cmdline/apt-helper.cc
+msgid "wait for system to be online"
+msgstr ""
+
 #: cmdline/apt-internal-planner.cc
 #, fuzzy
 msgid ""
diff --git a/po/sk.po b/po/sk.po
index f76c185ac..a0d014117 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-08-17 19:28+0200\n"
+"POT-Creation-Date: 2017-09-09 21:47+0200\n"
 "PO-Revision-Date: 2012-06-28 20:49+0100\n"
 "Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -1021,9 +1021,6 @@ msgstr "Voľba %s nenájdená"
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
-#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
-#. a file like main/binary-amd64/Packages; filename and linenumber of
-#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
@@ -2888,6 +2885,10 @@ msgstr ""
 msgid "detect proxy using apt.conf"
 msgstr ""
 
+#: cmdline/apt-helper.cc
+msgid "wait for system to be online"
+msgstr ""
+
 #: cmdline/apt-internal-planner.cc
 #, fuzzy
 msgid ""
diff --git a/po/sl.po b/po/sl.po
index 5a86d50c9..49dea8015 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-08-17 19:28+0200\n"
+"POT-Creation-Date: 2017-09-09 21:47+0200\n"
 "PO-Revision-Date: 2012-06-27 21:29+0000\n"
 "Last-Translator: Andrej Znidarsic <andrej.znidarsic@gmail.com>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -1019,9 +1019,6 @@ msgstr "Izbire %s ni mogoče najti"
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
-#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
-#. a file like main/binary-amd64/Packages; filename and linenumber of
-#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
@@ -2893,6 +2890,10 @@ msgstr ""
 msgid "detect proxy using apt.conf"
 msgstr ""
 
+#: cmdline/apt-helper.cc
+msgid "wait for system to be online"
+msgstr ""
+
 #: cmdline/apt-internal-planner.cc
 #, fuzzy
 msgid ""
diff --git a/po/sv.po b/po/sv.po
index 932e6d9ed..98f2101e4 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-08-17 19:28+0200\n"
+"POT-Creation-Date: 2017-09-09 21:47+0200\n"
 "PO-Revision-Date: 2015-08-19 21:33+0200\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <debian-l10n-swedish@debian.org>\n"
@@ -1035,9 +1035,6 @@ msgstr "Valet %s hittades inte"
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
-#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
-#. a file like main/binary-amd64/Packages; filename and linenumber of
-#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
@@ -2913,6 +2910,10 @@ msgstr ""
 msgid "detect proxy using apt.conf"
 msgstr "hitta proxy med hjälp av apt.conf"
 
+#: cmdline/apt-helper.cc
+msgid "wait for system to be online"
+msgstr ""
+
 #: cmdline/apt-internal-planner.cc
 #, fuzzy
 msgid ""
diff --git a/po/th.po b/po/th.po
index 786d8ac15..4322871a9 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-08-17 19:28+0200\n"
+"POT-Creation-Date: 2017-09-09 21:47+0200\n"
 "PO-Revision-Date: 2014-12-12 13:00+0700\n"
 "Last-Translator: Theppitak Karoonboonyanan <thep@debian.org>\n"
 "Language-Team: Thai <thai-l10n@googlegroups.com>\n"
@@ -1004,9 +1004,6 @@ msgstr "ไม่พบรายการเลือก %s"
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
-#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
-#. a file like main/binary-amd64/Packages; filename and linenumber of
-#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
@@ -2825,6 +2822,10 @@ msgstr ""
 msgid "detect proxy using apt.conf"
 msgstr "ตรวจหาพร็อกซีโดยใช้ apt.conf"
 
+#: cmdline/apt-helper.cc
+msgid "wait for system to be online"
+msgstr ""
+
 #: cmdline/apt-internal-planner.cc
 #, fuzzy
 msgid ""
diff --git a/po/tl.po b/po/tl.po
index c418e4503..4d5dbcc3e 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-08-17 19:28+0200\n"
+"POT-Creation-Date: 2017-09-09 21:47+0200\n"
 "PO-Revision-Date: 2007-03-29 21:36+0800\n"
 "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
 "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -1020,9 +1020,6 @@ msgstr "Piniling %s ay hindi nahanap"
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
-#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
-#. a file like main/binary-amd64/Packages; filename and linenumber of
-#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
@@ -2850,6 +2847,10 @@ msgstr ""
 msgid "detect proxy using apt.conf"
 msgstr ""
 
+#: cmdline/apt-helper.cc
+msgid "wait for system to be online"
+msgstr ""
+
 #: cmdline/apt-internal-planner.cc
 #, fuzzy
 msgid ""
diff --git a/po/tr.po b/po/tr.po
index 29e2261e6..ddb07ca4e 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-08-17 19:28+0200\n"
+"POT-Creation-Date: 2017-09-09 21:47+0200\n"
 "PO-Revision-Date: 2016-09-24 03:24+0300\n"
 "Last-Translator: Mert Dirik <mertdirik@gmail.com>\n"
 "Language-Team: Debian l10n Turkish <debian-l10n-turkish@lists.debian.org>\n"
@@ -1060,9 +1060,6 @@ msgstr "%s seçimi bulunamadı"
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr "%s hedefi aynı dosyayı (%s) %s olarak %s kaynağından almak istiyor"
 
-#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
-#. a file like main/binary-amd64/Packages; filename and linenumber of
-#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
@@ -2958,6 +2955,10 @@ msgstr "dosyaları birleştir, otomatik olarak aç"
 msgid "detect proxy using apt.conf"
 msgstr "apt.conf kullanarak vekil sunucuyu algıla"
 
+#: cmdline/apt-helper.cc
+msgid "wait for system to be online"
+msgstr ""
+
 #: cmdline/apt-internal-planner.cc
 msgid ""
 "Usage: apt-internal-planner\n"
diff --git a/po/uk.po b/po/uk.po
index 3cb482096..70d04aa5a 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-08-17 19:28+0200\n"
+"POT-Creation-Date: 2017-09-09 21:47+0200\n"
 "PO-Revision-Date: 2012-09-25 20:19+0300\n"
 "Last-Translator: A. Bondarenko <artem.brz@gmail.com>\n"
 "Language-Team: Українська <uk@li.org>\n"
@@ -1038,9 +1038,6 @@ msgstr "Вибір %s не знайдено"
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
-#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
-#. a file like main/binary-amd64/Packages; filename and linenumber of
-#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
@@ -2929,6 +2926,10 @@ msgstr ""
 msgid "detect proxy using apt.conf"
 msgstr ""
 
+#: cmdline/apt-helper.cc
+msgid "wait for system to be online"
+msgstr ""
+
 #: cmdline/apt-internal-planner.cc
 #, fuzzy
 msgid ""
diff --git a/po/vi.po b/po/vi.po
index 620f8fa03..1f2113cc1 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.8\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-08-17 19:28+0200\n"
+"POT-Creation-Date: 2017-09-09 21:47+0200\n"
 "PO-Revision-Date: 2014-09-12 13:48+0700\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
@@ -1028,9 +1028,6 @@ msgstr "Không tìm thấy vùng chọn %s"
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
-#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
-#. a file like main/binary-amd64/Packages; filename and linenumber of
-#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
@@ -2899,6 +2896,10 @@ msgstr ""
 msgid "detect proxy using apt.conf"
 msgstr "dò tìm proxy dùng apt.conf"
 
+#: cmdline/apt-helper.cc
+msgid "wait for system to be online"
+msgstr ""
+
 #: cmdline/apt-internal-planner.cc
 #, fuzzy
 msgid ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4a68c1643..f332195fd 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.5.x\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-08-17 19:28+0200\n"
+"POT-Creation-Date: 2017-09-09 21:47+0200\n"
 "PO-Revision-Date: 2017-07-04 03:00+0000\n"
 "Last-Translator: Zhou Mo <cdluminate@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -1014,9 +1014,6 @@ msgstr "找不到您选则的 %s"
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr "目标 %1$s 想要捕获与 %3$s (来自软件源 %4$s) 相同的文件 (%2$s)"
 
-#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
-#. a file like main/binary-amd64/Packages; filename and linenumber of
-#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
@@ -2832,6 +2829,10 @@ msgstr "自动解压并连接文件"
 msgid "detect proxy using apt.conf"
 msgstr "用 apt.conf 检测代理设置"
 
+#: cmdline/apt-helper.cc
+msgid "wait for system to be online"
+msgstr ""
+
 #: cmdline/apt-internal-planner.cc
 msgid ""
 "Usage: apt-internal-planner\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 8c5a71660..a542d83f2 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.2.X\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-08-17 19:28+0200\n"
+"POT-Creation-Date: 2017-09-09 21:47+0200\n"
 "PO-Revision-Date: 2009-01-28 10:41+0800\n"
 "Last-Translator: Tetralet <tetralet@gmail.com>\n"
 "Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
@@ -1002,9 +1002,6 @@ msgstr "選項 %s 找不到"
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr ""
 
-#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
-#. a file like main/binary-amd64/Packages; filename and linenumber of
-#. two sources.list entries
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
@@ -2804,6 +2801,10 @@ msgstr ""
 msgid "detect proxy using apt.conf"
 msgstr ""
 
+#: cmdline/apt-helper.cc
+msgid "wait for system to be online"
+msgstr ""
+
 #: cmdline/apt-internal-planner.cc
 #, fuzzy
 msgid ""