Release 1.5~beta21.5_beta2

60 files changed, 2107 insertions, 997 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6d41f728a..dc9b6ecd6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -182,7 +182,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~beta1")
+set(PACKAGE_VERSION "1.5~beta2")
 
 if (NOT DEFINED DPKG_DATADIR)
   execute_process(COMMAND ${PERL_EXECUTABLE} -MDpkg -e "print $Dpkg::DATADIR;"
diff --git a/debian/changelog b/debian/changelog
index e9ec2e230..8f1f6e867 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,66 @@
+apt (1.5~beta2) unstable; urgency=medium
+
+  [ M. Willis Monroe ]
+  * Minor grammar fix
+
+  [ Zhou Mo ]
+  * zh_CN.po: update Simplified Chinese programs translation
+
+  [ David Kalnischkies ]
+  * don't expect more downloads from failed transactions
+  * remove reference to a-t-debtorrent in description
+  * ignore SIGPIPE in dump solver if forwarding
+  * support compressed extended_states file for bug triage
+  * don't move failed pdiff indexes out of partial (Closes: 869425)
+  * don't try to parse all fields starting with HTTP as status-line
+  * send weak-only hashes to methods
+  * fail earlier if server answers with too much data
+  * fail early in http if server answer is too small as well
+  * use FileFd to parse all apt configuration files
+  * show warnings instead of errors if files are unreadable (LP: #1701852)
+  * reimplement and document auth.conf (Closes: #811181)
+  * lookup login info for proxies in auth.conf
+  * allow the auth.conf to be root:root owned
+  * update URI scheme descriptions in sources.list(5)
+  * show a warning for Debian shutting down FTP services
+  * suggest using auth.conf for sources with passwords
+  * ftparchive: sort discovered filenames before writing indexes.
+    Thanks to Chris Lamb for initial patch & Stefan Lippers-Hollmann for testing
+    (Closes: 869557)
+  * don't keep configuration files open needlessly
+  * don't hang if multiple sources use unavailable method (Closes: 870675)
+
+  [ Beatrice Torracca ]
+  * Italian manpage translation update (Closes: 858877)
+
+  [ Apollon Oikonomopoulos ]
+  * Handle supported components with slashes in sources.list (Closes: #868127)
+
+  [ Julian Andres Klode ]
+  * Drop cacheiterators.h include
+  * methods/aptmethod.h: Add missing fileutl.h include
+  * Reformat and sort all includes with clang-format
+  * cacheiterators: Warn about direct include and don't include pkgcache.h
+  * Update gitignore with new files
+  * Use C++11 threading support instead of pthread
+  * Always warn if --force-yes is validly specified, not just if used
+  * Work around float rounding change in gcc 7 on i386
+  * Handle GCC 7 std::string operator ABI break (Closes: #871275)
+  * debian: Update symbols for libapt-pkg5.0
+
+  [ Paul Wise ]
+  * Support zero delay for the various APT::Periodic activities
+  * Support seconds, minutes, hours and days for APT::Periodic intervals
+  * Switch from /org to /srv in example apt-ftparchive configuration
+
+  [ Balint Reczey ]
+  * Gracefully terminate process when stopping apt-daily-upgrade (LP: #1690980)
+
+  [ Dominik ]
+  * doc: Add '--allow-unauthenticated' to '--force-yes'
+
+ -- Julian Andres Klode <jak@debian.org>  Thu, 17 Aug 2017 19:28:00 +0200
+
 apt (1.5~beta1) unstable; urgency=medium
 
   [ Julian Andres Klode ]
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index 878adb726..55fd307e2 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-06-30T00:00:00Z</date>
+   <date>2017-07-27T00:00:00Z</date>
  </refentryinfo>
  
  <refmeta>
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index be599d393..af5d2f532 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~beta1">
+<!ENTITY apt-product-version "1.5~beta2">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY debian-oldstable-codename "jessie">
diff --git a/doc/apt_auth.conf.5.xml b/doc/apt_auth.conf.5.xml
index 37e4fbc98..8621cdee2 100644
--- a/doc/apt_auth.conf.5.xml
+++ b/doc/apt_auth.conf.5.xml
@@ -13,7 +13,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
-   <date>2017-07-07T00:00:00Z</date>
+   <date>2017-08-17T00:00:00Z</date>
  </refentryinfo>
 
  <refmeta>
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 0412fcbab..f5f413f1d 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~alpha4\n"
+"Project-Id-Version: apt-doc 1.5~beta2\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+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"
@@ -1268,8 +1268,9 @@ msgid ""
 "not be used except in very special situations. Using "
 "<literal>force-yes</literal> can potentially destroy your system! "
 "Configuration Item: <literal>APT::Get::force-yes</literal>. This is "
-"deprecated and replaced by <option>--allow-downgrades</option>, "
-"<option>--allow-remove-essential</option>, "
+"deprecated and replaced by <option>--allow-unauthenticated</option> , "
+"<option>--allow-downgrades</option> , "
+"<option>--allow-remove-essential</option> , "
 "<option>--allow-change-held-packages</option> in 1.1."
 msgstr ""
 
@@ -5721,6 +5722,45 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:1
 msgid ""
+"The http scheme specifies an HTTP server for an archive and is the most "
+"commonly used method, with many options in the "
+"<literal>Acquire::http</literal> scope detailed in &apt-conf;. The URI can "
+"directly include login information if the archive requires it, but the use "
+"of &apt-authconf; should be preferred. The method also supports SOCKS5 and "
+"HTTP(S) proxies either configured via apt-specific configuration or "
+"specified by the environment variable <envar>http_proxy</envar> in the "
+"format (assuming an HTTP proxy requiring authentication)  "
+"<replaceable>http://user:pass@server:port/</replaceable>.  The "
+"authentication details for proxies can also be supplied via &apt-authconf;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: sources.list.5.xml:1
+msgid ""
+"Note that these forms of authentication are insecure as the whole "
+"communication with the remote server (or proxy) is not encrypted so a "
+"sufficiently capable attacker can observe and record login as well as all "
+"other interactions. The attacker can <emphasis>not</emphasis> modify the "
+"communication through as APTs data security model is independent of the "
+"chosen transport method. See &apt-secure; for details."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: sources.list.5.xml:1
+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 "
+"is that the communication between apt and server (or proxy) is "
+"encrypted. Note that the encryption does not prevent an attacker from "
+"knowing which server (or proxy) apt is communicating with and deeper "
+"analyses can potentially still reveal which data was downloaded. If this is "
+"a concern the Tor-based schemes mentioned further below might be a suitable "
+"alternative."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: sources.list.5.xml:1
+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 "
 "archives."
@@ -5729,28 +5769,25 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:1
 msgid ""
-"The cdrom scheme allows APT to use a local CD-ROM drive with media "
-"swapping. Use the &apt-cdrom; program to create cdrom entries in the source "
-"list."
+"The cdrom scheme allows APT to use a local CD-ROM, DVD or USB drive with "
+"media swapping. Use the &apt-cdrom; program to create cdrom entries in the "
+"source list."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:1
 msgid ""
-"The http scheme specifies an HTTP server for the archive. If an environment "
-"variable <envar>http_proxy</envar> is set with the format "
-"http://server:port/, the proxy server specified in <envar>http_proxy</envar> "
-"will be used. Users of authenticated HTTP/1.1 proxies may use a string of "
-"the format http://user:pass@server:port/.  Note that this is an insecure "
-"method of authentication."
+"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> "
+"and many archives either never offered or are retiring FTP access. If you "
+"still need this method many configuration options for it are available in "
+"the <literal>Acquire::ftp</literal> scope and detailed in &apt-conf;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:1
 msgid ""
-"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
-"is highly configurable; for more information see the &apt-conf; manual "
-"page. Please note that an FTP proxy can be specified by using the "
+"Please note that an FTP proxy can be specified by using the "
 "<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
 "HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
 "environment variable and <emphasis>only</emphasis> this environment "
@@ -5788,9 +5825,8 @@ msgid ""
 "which should follow the naming scheme "
 "<package>apt-transport-<replaceable>method</replaceable></package>.  For "
 "instance, the APT team also maintains the package "
-"<package>apt-transport-https</package>, which provides access methods for "
-"HTTPS URIs with features similar to the http method.  Methods for using "
-"e.g. debtorrent are also available - see &apt-transport-debtorrent;."
+"<package>apt-transport-tor</package>, which provides access methods for HTTP "
+"and HTTPS URIs routed via the Tor network."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
diff --git a/doc/po/de.po b/doc/po/de.po
index b53e5010d..672fe14cc 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+0200\n"
 "PO-Revision-Date: 2016-11-15 21:51+0200\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -1749,14 +1749,24 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
+#, fuzzy
+#| msgid ""
+#| "Force yes; this is a dangerous option that will cause apt to continue "
+#| "without prompting if it is doing something potentially harmful. It should "
+#| "not be used except in very special situations. Using <literal>force-yes</"
+#| "literal> can potentially destroy your system! Configuration Item: "
+#| "<literal>APT::Get::force-yes</literal>. This is deprecated and replaced "
+#| "by <option>--allow-downgrades</option>, <option>--allow-remove-essential</"
+#| "option>, <option>--allow-change-held-packages</option> in 1.1."
 msgid ""
 "Force yes; this is a dangerous option that will cause apt to continue "
 "without prompting if it is doing something potentially harmful. It should "
 "not be used except in very special situations. Using <literal>force-yes</"
 "literal> can potentially destroy your system! Configuration Item: "
 "<literal>APT::Get::force-yes</literal>. This is deprecated and replaced by "
-"<option>--allow-downgrades</option>, <option>--allow-remove-essential</"
-"option>, <option>--allow-change-held-packages</option> in 1.1."
+"<option>--allow-unauthenticated</option> , <option>--allow-downgrades</"
+"option> , <option>--allow-remove-essential</option> , <option>--allow-change-"
+"held-packages</option> in 1.1."
 msgstr ""
 "erzwingt »Ja«; Dies ist eine gefährliche Option, die APT veranlasst, ohne "
 "Nachfrage fortzufahren, wenn es etwas möglicherweise schädliches tut. Es "
@@ -8244,6 +8254,44 @@ msgstr "Die derzeit zulässigen URI-Typen sind:"
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: 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 <literal>Acquire::http</"
+"literal> scope detailed in &apt-conf;. The URI can directly include login "
+"information if the archive requires it, but the use of &apt-authconf; should "
+"be preferred. The method also supports SOCKS5 and HTTP(S) proxies either "
+"configured via apt-specific configuration or specified by the environment "
+"variable <envar>http_proxy</envar> in the format (assuming an HTTP proxy "
+"requiring authentication)  <replaceable>http://user:pass@server:port/</"
+"replaceable>.  The authentication details for proxies can also be supplied "
+"via &apt-authconf;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: 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 "
+"sufficiently capable attacker can observe and record login as well as all "
+"other interactions. The attacker can <emphasis>not</emphasis> modify the "
+"communication through as APTs data security model is independent of the "
+"chosen transport method. See &apt-secure; for details."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: 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 "
+"is that the communication between apt and server (or proxy) is encrypted. "
+"Note that the encryption does not prevent an attacker from knowing which "
+"server (or proxy) apt is communicating with and deeper analyses can "
+"potentially still reveal which data was downloaded. If this is a concern the "
+"Tor-based schemes mentioned further below might be a suitable alternative."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: 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 "
 "archives."
@@ -8254,9 +8302,15 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "The cdrom scheme allows APT to use a local CD-ROM drive with media "
+#| "swapping. Use the &apt-cdrom; program to create cdrom entries in the "
+#| "source list."
 msgid ""
-"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
-"Use the &apt-cdrom; program to create cdrom entries in the source list."
+"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 "
+"source list."
 msgstr ""
 "Das cdrom-Schema erlaubt APT ein lokales CD-ROM-Laufwerk mit Medienwechsel "
 "zu benutzen. Benutzen Sie das Programm &apt-cdrom;, um CD-ROM-Einträge in "
@@ -8265,25 +8319,26 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
-"The http scheme specifies an HTTP server for the archive. If an environment "
-"variable <envar>http_proxy</envar> is set with the format http://server:"
-"port/, the proxy server specified in <envar>http_proxy</envar> will be used. "
-"Users of authenticated HTTP/1.1 proxies may use a string of the format "
-"http://user:pass@server:port/.  Note that this is an insecure method of "
-"authentication."
+"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> "
+"and many archives either never offered or are retiring FTP access. If you "
+"still need this method many configuration options for it are available in "
+"the <literal>Acquire::ftp</literal> scope and detailed in &apt-conf;."
 msgstr ""
-"Das http-Schema gibt einen HTTP-Server für das Archiv an. Wenn eine "
-"Umgebungsvariable <envar>http_proxy</envar> mit dem Format http://Server:"
-"Port/ gesetzt ist, wird der in <envar>http_proxy</envar> angegebene Proxy-"
-"Server benutzt. Anwender eines HTTP/1.1-authentifizierten Proxys können eine "
-"Zeichenkette mit dem Format http://Anwender:Passwort@Server:Port/ benutzt. "
-"Beachten Sie, dass dies eine unsichere Authentifizierungsmethode ist."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "The ftp scheme specifies an FTP server for the archive. APT's FTP "
+#| "behavior is highly configurable; for more information see the &apt-conf; "
+#| "manual page. Please note that an FTP proxy can be specified by using the "
+#| "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
+#| "an HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
+#| "environment variable and <emphasis>only</emphasis> this environment "
+#| "variable. Proxies using HTTP specified in the configuration file will be "
+#| "ignored."
 msgid ""
-"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
-"is highly configurable; for more information see the &apt-conf; manual page. "
 "Please note that an FTP proxy can be specified by using the "
 "<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
 "HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
@@ -8335,14 +8390,21 @@ msgstr "weitere zulässige URI-Typen hinzufügen"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "APT can be extended with more methods shipped in other optional packages, "
+#| "which should follow the naming scheme <package>apt-transport-"
+#| "<replaceable>method</replaceable></package>.  For instance, the APT team "
+#| "also maintains the package <package>apt-transport-https</package>, which "
+#| "provides access methods for HTTPS URIs with features similar to the http "
+#| "method.  Methods for using e.g. debtorrent are also available - see &apt-"
+#| "transport-debtorrent;."
 msgid ""
 "APT can be extended with more methods shipped in other optional packages, "
 "which should follow the naming scheme <package>apt-transport-"
 "<replaceable>method</replaceable></package>.  For instance, the APT team "
-"also maintains the package <package>apt-transport-https</package>, which "
-"provides access methods for HTTPS URIs with features similar to the http "
-"method.  Methods for using e.g. debtorrent are also available - see &apt-"
-"transport-debtorrent;."
+"also maintains the package <package>apt-transport-tor</package>, which "
+"provides access methods for HTTP and HTTPS URIs routed via the Tor network."
 msgstr ""
 "APT kann mit weiteren Methoden, die in anderen optionalen Paketen geliefert "
 "werden, die dem Namensschema <literal>apt-transport-<replaceable>Methode</"
@@ -11391,6 +11453,22 @@ msgid "Which will use the already fetched archives on the disc."
 msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen."
 
 #~ msgid ""
+#~ "The http scheme specifies an HTTP server for the archive. If an "
+#~ "environment variable <envar>http_proxy</envar> is set with the format "
+#~ "http://server:port/, the proxy server specified in <envar>http_proxy</"
+#~ "envar> will be used. Users of authenticated HTTP/1.1 proxies may use a "
+#~ "string of the format http://user:pass@server:port/.  Note that this is an "
+#~ "insecure method of authentication."
+#~ msgstr ""
+#~ "Das http-Schema gibt einen HTTP-Server für das Archiv an. Wenn eine "
+#~ "Umgebungsvariable <envar>http_proxy</envar> mit dem Format http://Server:"
+#~ "Port/ gesetzt ist, wird der in <envar>http_proxy</envar> angegebene Proxy-"
+#~ "Server benutzt. Anwender eines HTTP/1.1-authentifizierten Proxys können "
+#~ "eine Zeichenkette mit dem Format http://Anwender:Passwort@Server:Port/ "
+#~ "benutzt. Beachten Sie, dass dies eine unsichere Authentifizierungsmethode "
+#~ "ist."
+
+#~ msgid ""
 #~ "As a temporary exception &apt-get; (not &apt;!) raises warnings only if "
 #~ "it encounters unauthenticated archives to give a slightly longer grace "
 #~ "period on this backward compatibility effecting change. This exception "
diff --git a/doc/po/es.po b/doc/po/es.po
index 3323b8bb1..9d4233058 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+0200\n"
 "PO-Revision-Date: 2014-07-04 01:31+0200\n"
 "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -1842,8 +1842,9 @@ msgid ""
 "not be used except in very special situations. Using <literal>force-yes</"
 "literal> can potentially destroy your system! Configuration Item: "
 "<literal>APT::Get::force-yes</literal>. This is deprecated and replaced by "
-"<option>--allow-downgrades</option>, <option>--allow-remove-essential</"
-"option>, <option>--allow-change-held-packages</option> in 1.1."
+"<option>--allow-unauthenticated</option> , <option>--allow-downgrades</"
+"option> , <option>--allow-remove-essential</option> , <option>--allow-change-"
+"held-packages</option> in 1.1."
 msgstr ""
 "Supone una respuesta afirmativa a todas las preguntas. Ésta es una opción "
 "peligrosa que hará que apt continúe sin preguntar incluso si se va a "
@@ -8105,6 +8106,44 @@ msgstr "Los tipos de URI permitidos actualmente son:"
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: 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 <literal>Acquire::http</"
+"literal> scope detailed in &apt-conf;. The URI can directly include login "
+"information if the archive requires it, but the use of &apt-authconf; should "
+"be preferred. The method also supports SOCKS5 and HTTP(S) proxies either "
+"configured via apt-specific configuration or specified by the environment "
+"variable <envar>http_proxy</envar> in the format (assuming an HTTP proxy "
+"requiring authentication)  <replaceable>http://user:pass@server:port/</"
+"replaceable>.  The authentication details for proxies can also be supplied "
+"via &apt-authconf;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: 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 "
+"sufficiently capable attacker can observe and record login as well as all "
+"other interactions. The attacker can <emphasis>not</emphasis> modify the "
+"communication through as APTs data security model is independent of the "
+"chosen transport method. See &apt-secure; for details."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: 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 "
+"is that the communication between apt and server (or proxy) is encrypted. "
+"Note that the encryption does not prevent an attacker from knowing which "
+"server (or proxy) apt is communicating with and deeper analyses can "
+"potentially still reveal which data was downloaded. If this is a concern the "
+"Tor-based schemes mentioned further below might be a suitable alternative."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: 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 "
 "archives."
@@ -8115,9 +8154,15 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "The cdrom scheme allows APT to use a local CD-ROM drive with media "
+#| "swapping. Use the &apt-cdrom; program to create cdrom entries in the "
+#| "source list."
 msgid ""
-"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
-"Use the &apt-cdrom; program to create cdrom entries in the source list."
+"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 "
+"source list."
 msgstr ""
 "El esquema «cdrom» permite a APT utilizar la unidad de CD-ROM local. Utilice "
 "el programa &apt-cdrom; para añadir entradas de un disco óptico a «sources."
@@ -8126,26 +8171,26 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
-"The http scheme specifies an HTTP server for the archive. If an environment "
-"variable <envar>http_proxy</envar> is set with the format http://server:"
-"port/, the proxy server specified in <envar>http_proxy</envar> will be used. "
-"Users of authenticated HTTP/1.1 proxies may use a string of the format "
-"http://user:pass@server:port/.  Note that this is an insecure method of "
-"authentication."
-msgstr ""
-"El esquema «http» define un servidor HTTP como el archivo de paquetes. Si la "
-"variable de entorno <envar>http_proxy</envar> está definida con formato "
-"«http://servidor:puerto/», se usará el servidor proxy definido en "
-"<envar>http_proxy</envar>. Los usuarios de servidores proxy con "
-"autenticación HTTP/1.1 deberán usar la cadena de caracteres «http://usuario:"
-"contraseña@servidor:puerto/». Tenga en cuenta que este método de "
-"autenticación no es seguro."
+"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> "
+"and many archives either never offered or are retiring FTP access. If you "
+"still need this method many configuration options for it are available in "
+"the <literal>Acquire::ftp</literal> scope and detailed in &apt-conf;."
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "The ftp scheme specifies an FTP server for the archive. APT's FTP "
+#| "behavior is highly configurable; for more information see the &apt-conf; "
+#| "manual page. Please note that an FTP proxy can be specified by using the "
+#| "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
+#| "an HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
+#| "environment variable and <emphasis>only</emphasis> this environment "
+#| "variable. Proxies using HTTP specified in the configuration file will be "
+#| "ignored."
 msgid ""
-"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
-"is highly configurable; for more information see the &apt-conf; manual page. "
 "Please note that an FTP proxy can be specified by using the "
 "<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
 "HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
@@ -8196,14 +8241,21 @@ msgstr "Añadir más tipos de URI reconocidos."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "APT can be extended with more methods shipped in other optional packages, "
+#| "which should follow the naming scheme <package>apt-transport-"
+#| "<replaceable>method</replaceable></package>.  For instance, the APT team "
+#| "also maintains the package <package>apt-transport-https</package>, which "
+#| "provides access methods for HTTPS URIs with features similar to the http "
+#| "method.  Methods for using e.g. debtorrent are also available - see &apt-"
+#| "transport-debtorrent;."
 msgid ""
 "APT can be extended with more methods shipped in other optional packages, "
 "which should follow the naming scheme <package>apt-transport-"
 "<replaceable>method</replaceable></package>.  For instance, the APT team "
-"also maintains the package <package>apt-transport-https</package>, which "
-"provides access methods for HTTPS URIs with features similar to the http "
-"method.  Methods for using e.g. debtorrent are also available - see &apt-"
-"transport-debtorrent;."
+"also maintains the package <package>apt-transport-tor</package>, which "
+"provides access methods for HTTP and HTTPS URIs routed via the Tor network."
 msgstr ""
 "APT se puede extender con más métodos proporcionados por paquetes "
 "opcionales, que deben seguir el esquema de denominación <package>apt-"
@@ -11218,6 +11270,22 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Esto utiliza los archivos del disco previamente obtenidos."
 
+#~ msgid ""
+#~ "The http scheme specifies an HTTP server for the archive. If an "
+#~ "environment variable <envar>http_proxy</envar> is set with the format "
+#~ "http://server:port/, the proxy server specified in <envar>http_proxy</"
+#~ "envar> will be used. Users of authenticated HTTP/1.1 proxies may use a "
+#~ "string of the format http://user:pass@server:port/.  Note that this is an "
+#~ "insecure method of authentication."
+#~ msgstr ""
+#~ "El esquema «http» define un servidor HTTP como el archivo de paquetes. Si "
+#~ "la variable de entorno <envar>http_proxy</envar> está definida con "
+#~ "formato «http://servidor:puerto/», se usará el servidor proxy definido en "
+#~ "<envar>http_proxy</envar>. Los usuarios de servidores proxy con "
+#~ "autenticación HTTP/1.1 deberán usar la cadena de caracteres «http://"
+#~ "usuario:contraseña@servidor:puerto/». Tenga en cuenta que este método de "
+#~ "autenticación no es seguro."
+
 #~ msgid "Archive Configuration"
 #~ msgstr "Configuración del archivo"
 
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 8a6c8f620..ef67f2033 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+0200\n"
 "PO-Revision-Date: 2017-01-24 22:43+0100\n"
 "Last-Translator: Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -1745,14 +1745,24 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
+#, fuzzy
+#| msgid ""
+#| "Force yes; this is a dangerous option that will cause apt to continue "
+#| "without prompting if it is doing something potentially harmful. It should "
+#| "not be used except in very special situations. Using <literal>force-yes</"
+#| "literal> can potentially destroy your system! Configuration Item: "
+#| "<literal>APT::Get::force-yes</literal>. This is deprecated and replaced "
+#| "by <option>--allow-downgrades</option>, <option>--allow-remove-essential</"
+#| "option>, <option>--allow-change-held-packages</option> in 1.1."
 msgid ""
 "Force yes; this is a dangerous option that will cause apt to continue "
 "without prompting if it is doing something potentially harmful. It should "
 "not be used except in very special situations. Using <literal>force-yes</"
 "literal> can potentially destroy your system! Configuration Item: "
 "<literal>APT::Get::force-yes</literal>. This is deprecated and replaced by "
-"<option>--allow-downgrades</option>, <option>--allow-remove-essential</"
-"option>, <option>--allow-change-held-packages</option> in 1.1."
+"<option>--allow-unauthenticated</option> , <option>--allow-downgrades</"
+"option> , <option>--allow-remove-essential</option> , <option>--allow-change-"
+"held-packages</option> in 1.1."
 msgstr ""
 "Forcer l'acceptation ; cette option est dangereuse parce qu'elle laisse APT "
 "continuer sans poser de questions quand il réalise quelque chose de "
@@ -8216,6 +8226,44 @@ msgstr "Les types d'URI actuellement reconnus sont :"
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: 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 <literal>Acquire::http</"
+"literal> scope detailed in &apt-conf;. The URI can directly include login "
+"information if the archive requires it, but the use of &apt-authconf; should "
+"be preferred. The method also supports SOCKS5 and HTTP(S) proxies either "
+"configured via apt-specific configuration or specified by the environment "
+"variable <envar>http_proxy</envar> in the format (assuming an HTTP proxy "
+"requiring authentication)  <replaceable>http://user:pass@server:port/</"
+"replaceable>.  The authentication details for proxies can also be supplied "
+"via &apt-authconf;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: 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 "
+"sufficiently capable attacker can observe and record login as well as all "
+"other interactions. The attacker can <emphasis>not</emphasis> modify the "
+"communication through as APTs data security model is independent of the "
+"chosen transport method. See &apt-secure; for details."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: 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 "
+"is that the communication between apt and server (or proxy) is encrypted. "
+"Note that the encryption does not prevent an attacker from knowing which "
+"server (or proxy) apt is communicating with and deeper analyses can "
+"potentially still reveal which data was downloaded. If this is a concern the "
+"Tor-based schemes mentioned further below might be a suitable alternative."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: 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 "
 "archives."
@@ -8226,9 +8274,15 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "The cdrom scheme allows APT to use a local CD-ROM drive with media "
+#| "swapping. Use the &apt-cdrom; program to create cdrom entries in the "
+#| "source list."
 msgid ""
-"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
-"Use the &apt-cdrom; program to create cdrom entries in the source list."
+"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 "
+"source list."
 msgstr ""
 "Le procédé <literal>cdrom</literal> permet l'utilisation d'un lecteur de CD "
 "avec la possibilité de changer de media. Utilisez le programme &apt-cdrom; "
@@ -8237,25 +8291,26 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
-"The http scheme specifies an HTTP server for the archive. If an environment "
-"variable <envar>http_proxy</envar> is set with the format http://server:"
-"port/, the proxy server specified in <envar>http_proxy</envar> will be used. "
-"Users of authenticated HTTP/1.1 proxies may use a string of the format "
-"http://user:pass@server:port/.  Note that this is an insecure method of "
-"authentication."
+"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> "
+"and many archives either never offered or are retiring FTP access. If you "
+"still need this method many configuration options for it are available in "
+"the <literal>Acquire::ftp</literal> scope and detailed in &apt-conf;."
 msgstr ""
-"Le procédé <literal>http</literal> indique un serveur HTTP comme archive. Si "
-"une variable d'environnement <envar>http_proxy</envar> (au format http://"
-"server:port/)  existe, le serveur mandataire indiqué par <envar>http_proxy</"
-"envar> est utilisé.  Quand un serveur mandataire HTTP/1.1 demande une "
-"authentification, on peut utiliser la chaîne http://user:pass@server:port/. "
-"Notez qu'il s'agit d'une méthode d'authentification peu sûre."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "The ftp scheme specifies an FTP server for the archive. APT's FTP "
+#| "behavior is highly configurable; for more information see the &apt-conf; "
+#| "manual page. Please note that an FTP proxy can be specified by using the "
+#| "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
+#| "an HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
+#| "environment variable and <emphasis>only</emphasis> this environment "
+#| "variable. Proxies using HTTP specified in the configuration file will be "
+#| "ignored."
 msgid ""
-"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
-"is highly configurable; for more information see the &apt-conf; manual page. "
 "Please note that an FTP proxy can be specified by using the "
 "<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
 "HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
@@ -8308,14 +8363,21 @@ msgstr "ajout de types d'URI supplémentaires reconnues"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "APT can be extended with more methods shipped in other optional packages, "
+#| "which should follow the naming scheme <package>apt-transport-"
+#| "<replaceable>method</replaceable></package>.  For instance, the APT team "
+#| "also maintains the package <package>apt-transport-https</package>, which "
+#| "provides access methods for HTTPS URIs with features similar to the http "
+#| "method.  Methods for using e.g. debtorrent are also available - see &apt-"
+#| "transport-debtorrent;."
 msgid ""
 "APT can be extended with more methods shipped in other optional packages, "
 "which should follow the naming scheme <package>apt-transport-"
 "<replaceable>method</replaceable></package>.  For instance, the APT team "
-"also maintains the package <package>apt-transport-https</package>, which "
-"provides access methods for HTTPS URIs with features similar to the http "
-"method.  Methods for using e.g. debtorrent are also available - see &apt-"
-"transport-debtorrent;."
+"also maintains the package <package>apt-transport-tor</package>, which "
+"provides access methods for HTTP and HTTPS URIs routed via the Tor network."
 msgstr ""
 "APT peut être complété avec des méthodes supplémentaires fournies par des "
 "paquets optionnels dont le schéma de nommage est <literal>apt-transport-"
@@ -11358,6 +11420,22 @@ msgid "Which will use the already fetched archives on the disc."
 msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 
 #~ msgid ""
+#~ "The http scheme specifies an HTTP server for the archive. If an "
+#~ "environment variable <envar>http_proxy</envar> is set with the format "
+#~ "http://server:port/, the proxy server specified in <envar>http_proxy</"
+#~ "envar> will be used. Users of authenticated HTTP/1.1 proxies may use a "
+#~ "string of the format http://user:pass@server:port/.  Note that this is an "
+#~ "insecure method of authentication."
+#~ msgstr ""
+#~ "Le procédé <literal>http</literal> indique un serveur HTTP comme archive. "
+#~ "Si une variable d'environnement <envar>http_proxy</envar> (au format "
+#~ "http://server:port/)  existe, le serveur mandataire indiqué par "
+#~ "<envar>http_proxy</envar> est utilisé.  Quand un serveur mandataire "
+#~ "HTTP/1.1 demande une authentification, on peut utiliser la chaîne http://"
+#~ "user:pass@server:port/. Notez qu'il s'agit d'une méthode "
+#~ "d'authentification peu sûre."
+
+#~ msgid ""
 #~ "As a temporary exception &apt-get; (not &apt;!) raises warnings only if "
 #~ "it encounters unauthenticated archives to give a slightly longer grace "
 #~ "period on this backward compatibility effecting change. This exception "
diff --git a/doc/po/it.po b/doc/po/it.po
index 716fa8b02..65c74391d 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-07-08 14:03+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+0200\n"
 "PO-Revision-Date: 2017-03-27 19:05+0200\n"
 "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -1789,14 +1789,24 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
+#, fuzzy
+#| msgid ""
+#| "Force yes; this is a dangerous option that will cause apt to continue "
+#| "without prompting if it is doing something potentially harmful. It should "
+#| "not be used except in very special situations. Using <literal>force-yes</"
+#| "literal> can potentially destroy your system! Configuration Item: "
+#| "<literal>APT::Get::force-yes</literal>. This is deprecated and replaced "
+#| "by <option>--allow-downgrades</option>, <option>--allow-remove-essential</"
+#| "option>, <option>--allow-change-held-packages</option> in 1.1."
 msgid ""
 "Force yes; this is a dangerous option that will cause apt to continue "
 "without prompting if it is doing something potentially harmful. It should "
 "not be used except in very special situations. Using <literal>force-yes</"
 "literal> can potentially destroy your system! Configuration Item: "
 "<literal>APT::Get::force-yes</literal>. This is deprecated and replaced by "
-"<option>--allow-downgrades</option>, <option>--allow-remove-essential</"
-"option>, <option>--allow-change-held-packages</option> in 1.1."
+"<option>--allow-unauthenticated</option> , <option>--allow-downgrades</"
+"option> , <option>--allow-remove-essential</option> , <option>--allow-change-"
+"held-packages</option> in 1.1."
 msgstr ""
 "Forza «sì»; questa è un'opzione pericolosa che fa sì che apt, se sta facendo "
 "qualcosa di potenzialmente pericoloso, continui senza chiedere "
@@ -8223,6 +8233,44 @@ msgstr "I tipi di URI attualmente riconosciuti sono:"
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: 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 <literal>Acquire::http</"
+"literal> scope detailed in &apt-conf;. The URI can directly include login "
+"information if the archive requires it, but the use of &apt-authconf; should "
+"be preferred. The method also supports SOCKS5 and HTTP(S) proxies either "
+"configured via apt-specific configuration or specified by the environment "
+"variable <envar>http_proxy</envar> in the format (assuming an HTTP proxy "
+"requiring authentication)  <replaceable>http://user:pass@server:port/</"
+"replaceable>.  The authentication details for proxies can also be supplied "
+"via &apt-authconf;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: 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 "
+"sufficiently capable attacker can observe and record login as well as all "
+"other interactions. The attacker can <emphasis>not</emphasis> modify the "
+"communication through as APTs data security model is independent of the "
+"chosen transport method. See &apt-secure; for details."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: 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 "
+"is that the communication between apt and server (or proxy) is encrypted. "
+"Note that the encryption does not prevent an attacker from knowing which "
+"server (or proxy) apt is communicating with and deeper analyses can "
+"potentially still reveal which data was downloaded. If this is a concern the "
+"Tor-based schemes mentioned further below might be a suitable alternative."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: 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 "
 "archives."
@@ -8233,9 +8281,15 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "The cdrom scheme allows APT to use a local CD-ROM drive with media "
+#| "swapping. Use the &apt-cdrom; program to create cdrom entries in the "
+#| "source list."
 msgid ""
-"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
-"Use the &apt-cdrom; program to create cdrom entries in the source list."
+"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 "
+"source list."
 msgstr ""
 "Il tipo cdrom permette ad APT di usare un'unità CD-ROM locale cambiando i "
 "supporti. Usare il programma &apt-cdrom; per creare voci cdrom nell'elenco "
@@ -8244,25 +8298,26 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
-"The http scheme specifies an HTTP server for the archive. If an environment "
-"variable <envar>http_proxy</envar> is set with the format http://server:"
-"port/, the proxy server specified in <envar>http_proxy</envar> will be used. "
-"Users of authenticated HTTP/1.1 proxies may use a string of the format "
-"http://user:pass@server:port/.  Note that this is an insecure method of "
-"authentication."
+"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> "
+"and many archives either never offered or are retiring FTP access. If you "
+"still need this method many configuration options for it are available in "
+"the <literal>Acquire::ftp</literal> scope and detailed in &apt-conf;."
 msgstr ""
-"Il tipo http specifica un server HTTP per l'archivio. Se è impostata una "
-"variabile d'ambiente <envar>http_proxy</envar> con il formato http://server:"
-"porta/, verrà usato il server proxy specificato in <envar>http_proxy</"
-"envar>. Gli utenti con proxy HTTP/1.1 con autenticazione possono usare una "
-"stringa nel formato http://utente:password@server:porta/. Notare che questo "
-"è un metodo di autenticazione non sicuro."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "The ftp scheme specifies an FTP server for the archive. APT's FTP "
+#| "behavior is highly configurable; for more information see the &apt-conf; "
+#| "manual page. Please note that an FTP proxy can be specified by using the "
+#| "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
+#| "an HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
+#| "environment variable and <emphasis>only</emphasis> this environment "
+#| "variable. Proxies using HTTP specified in the configuration file will be "
+#| "ignored."
 msgid ""
-"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
-"is highly configurable; for more information see the &apt-conf; manual page. "
 "Please note that an FTP proxy can be specified by using the "
 "<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
 "HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
@@ -8312,14 +8367,21 @@ msgstr "aggiungere ulteriori tipi di URI riconoscibili"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "APT can be extended with more methods shipped in other optional packages, "
+#| "which should follow the naming scheme <package>apt-transport-"
+#| "<replaceable>method</replaceable></package>.  For instance, the APT team "
+#| "also maintains the package <package>apt-transport-https</package>, which "
+#| "provides access methods for HTTPS URIs with features similar to the http "
+#| "method.  Methods for using e.g. debtorrent are also available - see &apt-"
+#| "transport-debtorrent;."
 msgid ""
 "APT can be extended with more methods shipped in other optional packages, "
 "which should follow the naming scheme <package>apt-transport-"
 "<replaceable>method</replaceable></package>.  For instance, the APT team "
-"also maintains the package <package>apt-transport-https</package>, which "
-"provides access methods for HTTPS URIs with features similar to the http "
-"method.  Methods for using e.g. debtorrent are also available - see &apt-"
-"transport-debtorrent;."
+"also maintains the package <package>apt-transport-tor</package>, which "
+"provides access methods for HTTP and HTTPS URIs routed via the Tor network."
 msgstr ""
 "APT può essere esteso con ulteriori metodi forniti in altri pacchetti "
 "opzionali, i cui nomi devono seguire lo schema <package>apt-transport-"
@@ -11326,6 +11388,22 @@ msgid "Which will use the already fetched archives on the disc."
 msgstr "che userà gli archivi già scaricati e presenti sul disco."
 
 #~ msgid ""
+#~ "The http scheme specifies an HTTP server for the archive. If an "
+#~ "environment variable <envar>http_proxy</envar> is set with the format "
+#~ "http://server:port/, the proxy server specified in <envar>http_proxy</"
+#~ "envar> will be used. Users of authenticated HTTP/1.1 proxies may use a "
+#~ "string of the format http://user:pass@server:port/.  Note that this is an "
+#~ "insecure method of authentication."
+#~ msgstr ""
+#~ "Il tipo http specifica un server HTTP per l'archivio. Se è impostata una "
+#~ "variabile d'ambiente <envar>http_proxy</envar> con il formato http://"
+#~ "server:porta/, verrà usato il server proxy specificato in "
+#~ "<envar>http_proxy</envar>. Gli utenti con proxy HTTP/1.1 con "
+#~ "autenticazione possono usare una stringa nel formato http://utente:"
+#~ "password@server:porta/. Notare che questo è un metodo di autenticazione "
+#~ "non sicuro."
+
+#~ msgid ""
 #~ "As a temporary exception &apt-get; (not &apt;!) raises warnings only if "
 #~ "it encounters unauthenticated archives to give a slightly longer grace "
 #~ "period on this backward compatibility effecting change. This exception "
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 07f66a33e..c25f109b1 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.4\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+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"
@@ -1734,14 +1734,24 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
+#, fuzzy
+#| msgid ""
+#| "Force yes; this is a dangerous option that will cause apt to continue "
+#| "without prompting if it is doing something potentially harmful. It should "
+#| "not be used except in very special situations. Using <literal>force-yes</"
+#| "literal> can potentially destroy your system! Configuration Item: "
+#| "<literal>APT::Get::force-yes</literal>. This is deprecated and replaced "
+#| "by <option>--allow-downgrades</option>, <option>--allow-remove-essential</"
+#| "option>, <option>--allow-change-held-packages</option> in 1.1."
 msgid ""
 "Force yes; this is a dangerous option that will cause apt to continue "
 "without prompting if it is doing something potentially harmful. It should "
 "not be used except in very special situations. Using <literal>force-yes</"
 "literal> can potentially destroy your system! Configuration Item: "
 "<literal>APT::Get::force-yes</literal>. This is deprecated and replaced by "
-"<option>--allow-downgrades</option>, <option>--allow-remove-essential</"
-"option>, <option>--allow-change-held-packages</option> in 1.1."
+"<option>--allow-unauthenticated</option> , <option>--allow-downgrades</"
+"option> , <option>--allow-remove-essential</option> , <option>--allow-change-"
+"held-packages</option> in 1.1."
 msgstr ""
 "強制承諾 - 何か損傷を与えかねない動作をしようとした場合でも、確認なしで実行し"
 "てしまう危険なオプションです。よほどの状況でなければ、使うべきではありませ"
@@ -7874,6 +7884,44 @@ msgstr "現在認識できる URI タイプは以下のとおりです:"
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: 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 <literal>Acquire::http</"
+"literal> scope detailed in &apt-conf;. The URI can directly include login "
+"information if the archive requires it, but the use of &apt-authconf; should "
+"be preferred. The method also supports SOCKS5 and HTTP(S) proxies either "
+"configured via apt-specific configuration or specified by the environment "
+"variable <envar>http_proxy</envar> in the format (assuming an HTTP proxy "
+"requiring authentication)  <replaceable>http://user:pass@server:port/</"
+"replaceable>.  The authentication details for proxies can also be supplied "
+"via &apt-authconf;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: 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 "
+"sufficiently capable attacker can observe and record login as well as all "
+"other interactions. The attacker can <emphasis>not</emphasis> modify the "
+"communication through as APTs data security model is independent of the "
+"chosen transport method. See &apt-secure; for details."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: 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 "
+"is that the communication between apt and server (or proxy) is encrypted. "
+"Note that the encryption does not prevent an attacker from knowing which "
+"server (or proxy) apt is communicating with and deeper analyses can "
+"potentially still reveal which data was downloaded. If this is a concern the "
+"Tor-based schemes mentioned further below might be a suitable alternative."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: 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 "
 "archives."
@@ -7883,9 +7931,15 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "The cdrom scheme allows APT to use a local CD-ROM drive with media "
+#| "swapping. Use the &apt-cdrom; program to create cdrom entries in the "
+#| "source list."
 msgid ""
-"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
-"Use the &apt-cdrom; program to create cdrom entries in the source list."
+"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 "
+"source list."
 msgstr ""
 "cdrom スキームは、APT がローカル CD-ROM ドライブを、メディア交換しながら使え"
 "るようにします。取得元リストに cdrom エントリを追加するには、&apt-cdrom; プロ"
@@ -7894,24 +7948,26 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
-"The http scheme specifies an HTTP server for the archive. If an environment "
-"variable <envar>http_proxy</envar> is set with the format http://server:"
-"port/, the proxy server specified in <envar>http_proxy</envar> will be used. "
-"Users of authenticated HTTP/1.1 proxies may use a string of the format "
-"http://user:pass@server:port/.  Note that this is an insecure method of "
-"authentication."
+"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> "
+"and many archives either never offered or are retiring FTP access. If you "
+"still need this method many configuration options for it are available in "
+"the <literal>Acquire::ftp</literal> scope and detailed in &apt-conf;."
 msgstr ""
-"http スキームはアーカイブとして、HTTP サーバを指定します。環境変数 "
-"<envar>http_proxy</envar> が、http://server:port/ と言った形で指定されていれ"
-"ば、<envar>http_proxy</envar> で指定したプロキシサーバを使用します。ユーザ認"
-"証が必要な HTTP/1.1 プロキシの場合、http://user:pass@server:port/ という形で"
-"指定してください。この認証方法は安全ではないことに注意してください。"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "The ftp scheme specifies an FTP server for the archive. APT's FTP "
+#| "behavior is highly configurable; for more information see the &apt-conf; "
+#| "manual page. Please note that an FTP proxy can be specified by using the "
+#| "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
+#| "an HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
+#| "environment variable and <emphasis>only</emphasis> this environment "
+#| "variable. Proxies using HTTP specified in the configuration file will be "
+#| "ignored."
 msgid ""
-"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
-"is highly configurable; for more information see the &apt-conf; manual page. "
 "Please note that an FTP proxy can be specified by using the "
 "<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
 "HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
@@ -7959,14 +8015,21 @@ msgstr "さらに認識できる URI タイプの追加"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "APT can be extended with more methods shipped in other optional packages, "
+#| "which should follow the naming scheme <package>apt-transport-"
+#| "<replaceable>method</replaceable></package>.  For instance, the APT team "
+#| "also maintains the package <package>apt-transport-https</package>, which "
+#| "provides access methods for HTTPS URIs with features similar to the http "
+#| "method.  Methods for using e.g. debtorrent are also available - see &apt-"
+#| "transport-debtorrent;."
 msgid ""
 "APT can be extended with more methods shipped in other optional packages, "
 "which should follow the naming scheme <package>apt-transport-"
 "<replaceable>method</replaceable></package>.  For instance, the APT team "
-"also maintains the package <package>apt-transport-https</package>, which "
-"provides access methods for HTTPS URIs with features similar to the http "
-"method.  Methods for using e.g. debtorrent are also available - see &apt-"
-"transport-debtorrent;."
+"also maintains the package <package>apt-transport-tor</package>, which "
+"provides access methods for HTTP and HTTPS URIs routed via the Tor network."
 msgstr ""
 "APT は他の追加パッケージ (<package>apt-transport-<replaceable>method</"
 "replaceable></package> という命名規則) により、より多くの方法を使えるよう拡張"
@@ -10883,6 +10946,20 @@ msgid "Which will use the already fetched archives on the disc."
 msgstr "これで、ディスクにある取得済みのアーカイブを使用するようになります。"
 
 #~ msgid ""
+#~ "The http scheme specifies an HTTP server for the archive. If an "
+#~ "environment variable <envar>http_proxy</envar> is set with the format "
+#~ "http://server:port/, the proxy server specified in <envar>http_proxy</"
+#~ "envar> will be used. Users of authenticated HTTP/1.1 proxies may use a "
+#~ "string of the format http://user:pass@server:port/.  Note that this is an "
+#~ "insecure method of authentication."
+#~ msgstr ""
+#~ "http スキームはアーカイブとして、HTTP サーバを指定します。環境変数 "
+#~ "<envar>http_proxy</envar> が、http://server:port/ と言った形で指定されてい"
+#~ "れば、<envar>http_proxy</envar> で指定したプロキシサーバを使用します。ユー"
+#~ "ザ認証が必要な HTTP/1.1 プロキシの場合、http://user:pass@server:port/ とい"
+#~ "う形で指定してください。この認証方法は安全ではないことに注意してください。"
+
+#~ msgid ""
 #~ "As a temporary exception &apt-get; (not &apt;!) raises warnings only if "
 #~ "it encounters unauthenticated archives to give a slightly longer grace "
 #~ "period on this backward compatibility effecting change. This exception "
diff --git a/doc/po/nl.po b/doc/po/nl.po
index 2da4013bd..069223ec6 100644
--- a/doc/po/nl.po
+++ b/doc/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.4~beta4-nl\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+0200\n"
 "PO-Revision-Date: 2017-01-19 17:53+0100\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -1820,14 +1820,24 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml
+#, fuzzy
+#| msgid ""
+#| "Force yes; this is a dangerous option that will cause apt to continue "
+#| "without prompting if it is doing something potentially harmful. It should "
+#| "not be used except in very special situations. Using <literal>force-yes</"
+#| "literal> can potentially destroy your system! Configuration Item: "
+#| "<literal>APT::Get::force-yes</literal>. This is deprecated and replaced "
+#| "by <option>--allow-downgrades</option>, <option>--allow-remove-essential</"
+#| "option>, <option>--allow-change-held-packages</option> in 1.1."
 msgid ""
 "Force yes; this is a dangerous option that will cause apt to continue "
 "without prompting if it is doing something potentially harmful. It should "
 "not be used except in very special situations. Using <literal>force-yes</"
 "literal> can potentially destroy your system! Configuration Item: "
 "<literal>APT::Get::force-yes</literal>. This is deprecated and replaced by "
-"<option>--allow-downgrades</option>, <option>--allow-remove-essential</"
-"option>, <option>--allow-change-held-packages</option> in 1.1."
+"<option>--allow-unauthenticated</option> , <option>--allow-downgrades</"
+"option> , <option>--allow-remove-essential</option> , <option>--allow-change-"
+"held-packages</option> in 1.1."
 msgstr ""
 "Een ja doordrukken; dit is een gevaarlijke optie die er voor zorgt dat apt "
 "zonder vragen voortgaat als het iets doet dat schadelijk kan zijn. U zou dit "
@@ -8381,6 +8391,44 @@ msgstr "De momenteel herkende URI-types zijn:"
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: 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 <literal>Acquire::http</"
+"literal> scope detailed in &apt-conf;. The URI can directly include login "
+"information if the archive requires it, but the use of &apt-authconf; should "
+"be preferred. The method also supports SOCKS5 and HTTP(S) proxies either "
+"configured via apt-specific configuration or specified by the environment "
+"variable <envar>http_proxy</envar> in the format (assuming an HTTP proxy "
+"requiring authentication)  <replaceable>http://user:pass@server:port/</"
+"replaceable>.  The authentication details for proxies can also be supplied "
+"via &apt-authconf;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: 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 "
+"sufficiently capable attacker can observe and record login as well as all "
+"other interactions. The attacker can <emphasis>not</emphasis> modify the "
+"communication through as APTs data security model is independent of the "
+"chosen transport method. See &apt-secure; for details."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: 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 "
+"is that the communication between apt and server (or proxy) is encrypted. "
+"Note that the encryption does not prevent an attacker from knowing which "
+"server (or proxy) apt is communicating with and deeper analyses can "
+"potentially still reveal which data was downloaded. If this is a concern the "
+"Tor-based schemes mentioned further below might be a suitable alternative."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: 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 "
 "archives."
@@ -8391,9 +8439,15 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "The cdrom scheme allows APT to use a local CD-ROM drive with media "
+#| "swapping. Use the &apt-cdrom; program to create cdrom entries in the "
+#| "source list."
 msgid ""
-"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
-"Use the &apt-cdrom; program to create cdrom entries in the source list."
+"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 "
+"source list."
 msgstr ""
 "De methode cdrom laat APT toe om met meerdere CD's in een lokaal CD-station "
 "te werken. Gebruik het programma &apt-cdrom; om regels met CD-pakketbronnen "
@@ -8402,25 +8456,26 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
-"The http scheme specifies an HTTP server for the archive. If an environment "
-"variable <envar>http_proxy</envar> is set with the format http://server:"
-"port/, the proxy server specified in <envar>http_proxy</envar> will be used. "
-"Users of authenticated HTTP/1.1 proxies may use a string of the format "
-"http://user:pass@server:port/.  Note that this is an insecure method of "
-"authentication."
+"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> "
+"and many archives either never offered or are retiring FTP access. If you "
+"still need this method many configuration options for it are available in "
+"the <literal>Acquire::ftp</literal> scope and detailed in &apt-conf;."
 msgstr ""
-"De methode http specificeert een HTTP-server voor het archief. Indien een "
-"omgevingsvariabele <envar>http_proxy</envar> bestaat in het formaat http://"
-"server:port/, dan zal de in <envar>http_proxy</envar> opgegeven proxy-server "
-"gebruikt worden. Gebruikers van een geauthenticeerde HTTP/1.1 proxy kunnen "
-"een tekenreeks gebruiken volgens het formaat http://user:pass@server:port/. "
-"Merk op dat dit geen veilige authenticatiemethode is."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "The ftp scheme specifies an FTP server for the archive. APT's FTP "
+#| "behavior is highly configurable; for more information see the &apt-conf; "
+#| "manual page. Please note that an FTP proxy can be specified by using the "
+#| "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
+#| "an HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
+#| "environment variable and <emphasis>only</emphasis> this environment "
+#| "variable. Proxies using HTTP specified in the configuration file will be "
+#| "ignored."
 msgid ""
-"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
-"is highly configurable; for more information see the &apt-conf; manual page. "
 "Please note that an FTP proxy can be specified by using the "
 "<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
 "HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
@@ -8472,14 +8527,21 @@ msgstr "nog andere herkenbare URI-types toevoegen"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "APT can be extended with more methods shipped in other optional packages, "
+#| "which should follow the naming scheme <package>apt-transport-"
+#| "<replaceable>method</replaceable></package>.  For instance, the APT team "
+#| "also maintains the package <package>apt-transport-https</package>, which "
+#| "provides access methods for HTTPS URIs with features similar to the http "
+#| "method.  Methods for using e.g. debtorrent are also available - see &apt-"
+#| "transport-debtorrent;."
 msgid ""
 "APT can be extended with more methods shipped in other optional packages, "
 "which should follow the naming scheme <package>apt-transport-"
 "<replaceable>method</replaceable></package>.  For instance, the APT team "
-"also maintains the package <package>apt-transport-https</package>, which "
-"provides access methods for HTTPS URIs with features similar to the http "
-"method.  Methods for using e.g. debtorrent are also available - see &apt-"
-"transport-debtorrent;."
+"also maintains the package <package>apt-transport-tor</package>, which "
+"provides access methods for HTTP and HTTPS URIs routed via the Tor network."
 msgstr ""
 "APT kan uitgebreid worden met extra methodes die door andere optionele "
 "pakketten ter beschikking gesteld worden en die moeten voldoen aan het "
@@ -11564,6 +11626,22 @@ msgstr ""
 "En dit zal gebruik maken van de reeds opgehaalde archieven op de schijf."
 
 #~ msgid ""
+#~ "The http scheme specifies an HTTP server for the archive. If an "
+#~ "environment variable <envar>http_proxy</envar> is set with the format "
+#~ "http://server:port/, the proxy server specified in <envar>http_proxy</"
+#~ "envar> will be used. Users of authenticated HTTP/1.1 proxies may use a "
+#~ "string of the format http://user:pass@server:port/.  Note that this is an "
+#~ "insecure method of authentication."
+#~ msgstr ""
+#~ "De methode http specificeert een HTTP-server voor het archief. Indien een "
+#~ "omgevingsvariabele <envar>http_proxy</envar> bestaat in het formaat "
+#~ "http://server:port/, dan zal de in <envar>http_proxy</envar> opgegeven "
+#~ "proxy-server gebruikt worden. Gebruikers van een geauthenticeerde "
+#~ "HTTP/1.1 proxy kunnen een tekenreeks gebruiken volgens het formaat http://"
+#~ "user:pass@server:port/. Merk op dat dit geen veilige authenticatiemethode "
+#~ "is."
+
+#~ msgid ""
 #~ "As a temporary exception &apt-get; (not &apt;!) raises warnings only if "
 #~ "it encounters unauthenticated archives to give a slightly longer grace "
 #~ "period on this backward compatibility effecting change. This exception "
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 03e9f380e..e8fb21af7 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+0200\n"
 "PO-Revision-Date: 2014-07-04 02:13+0200\n"
 "Last-Translator: Robert Luberda <robert@debian.org>\n"
 "Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n"
@@ -1839,8 +1839,9 @@ msgid ""
 "not be used except in very special situations. Using <literal>force-yes</"
 "literal> can potentially destroy your system! Configuration Item: "
 "<literal>APT::Get::force-yes</literal>. This is deprecated and replaced by "
-"<option>--allow-downgrades</option>, <option>--allow-remove-essential</"
-"option>, <option>--allow-change-held-packages</option> in 1.1."
+"<option>--allow-unauthenticated</option> , <option>--allow-downgrades</"
+"option> , <option>--allow-remove-essential</option> , <option>--allow-change-"
+"held-packages</option> in 1.1."
 msgstr ""
 "Wymuszenie. Jest to niebezpieczna opcja, która powoduje, że apt-get "
 "kontynuuje swoje działanie bez żadnej interakcji z użytkownikiem, nawet "
@@ -7495,6 +7496,44 @@ msgstr "Obecnie rozpoznawane są następujące typy URI:"
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: 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 <literal>Acquire::http</"
+"literal> scope detailed in &apt-conf;. The URI can directly include login "
+"information if the archive requires it, but the use of &apt-authconf; should "
+"be preferred. The method also supports SOCKS5 and HTTP(S) proxies either "
+"configured via apt-specific configuration or specified by the environment "
+"variable <envar>http_proxy</envar> in the format (assuming an HTTP proxy "
+"requiring authentication)  <replaceable>http://user:pass@server:port/</"
+"replaceable>.  The authentication details for proxies can also be supplied "
+"via &apt-authconf;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: 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 "
+"sufficiently capable attacker can observe and record login as well as all "
+"other interactions. The attacker can <emphasis>not</emphasis> modify the "
+"communication through as APTs data security model is independent of the "
+"chosen transport method. See &apt-secure; for details."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: 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 "
+"is that the communication between apt and server (or proxy) is encrypted. "
+"Note that the encryption does not prevent an attacker from knowing which "
+"server (or proxy) apt is communicating with and deeper analyses can "
+"potentially still reveal which data was downloaded. If this is a concern the "
+"Tor-based schemes mentioned further below might be a suitable alternative."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: 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 "
 "archives."
@@ -7505,9 +7544,15 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "The cdrom scheme allows APT to use a local CD-ROM drive with media "
+#| "swapping. Use the &apt-cdrom; program to create cdrom entries in the "
+#| "source list."
 msgid ""
-"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
-"Use the &apt-cdrom; program to create cdrom entries in the source list."
+"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 "
+"source list."
 msgstr ""
 "Schemat cdrom pozwala APT na użycie lokalnego dysku CD-ROM ze zmianą dysków. "
 "Prosimy używać programu &apt-cdrom; do dodawania takich wpisów w sources."
@@ -7516,25 +7561,26 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
-"The http scheme specifies an HTTP server for the archive. If an environment "
-"variable <envar>http_proxy</envar> is set with the format http://server:"
-"port/, the proxy server specified in <envar>http_proxy</envar> will be used. "
-"Users of authenticated HTTP/1.1 proxies may use a string of the format "
-"http://user:pass@server:port/.  Note that this is an insecure method of "
-"authentication."
+"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> "
+"and many archives either never offered or are retiring FTP access. If you "
+"still need this method many configuration options for it are available in "
+"the <literal>Acquire::ftp</literal> scope and detailed in &apt-conf;."
 msgstr ""
-"Schemat http opisuje serwer archiwum HTTP. Jeśli ustawiono zmienną "
-"środowiskową <envar>http_proxy</envar> w formacie http://serwer:port/, to "
-"APT użyje serwera proxy określonego w tej zmiennej. Użytkownicy serwerów "
-"proxy wymagających autoryzacji mogą ustawić tę zmienną na http://użytkownik:"
-"hasło@serwer:port/. Proszę zauważyć, że taki sposób autoryzacji nie jest "
-"bezpieczny."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "The ftp scheme specifies an FTP server for the archive. APT's FTP "
+#| "behavior is highly configurable; for more information see the &apt-conf; "
+#| "manual page. Please note that an FTP proxy can be specified by using the "
+#| "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
+#| "an HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
+#| "environment variable and <emphasis>only</emphasis> this environment "
+#| "variable. Proxies using HTTP specified in the configuration file will be "
+#| "ignored."
 msgid ""
-"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
-"is highly configurable; for more information see the &apt-conf; manual page. "
 "Please note that an FTP proxy can be specified by using the "
 "<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
 "HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
@@ -7584,14 +7630,21 @@ msgstr "dodawanie innych rozpoznawanych typów URI"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "APT can be extended with more methods shipped in other optional packages, "
+#| "which should follow the naming scheme <package>apt-transport-"
+#| "<replaceable>method</replaceable></package>.  For instance, the APT team "
+#| "also maintains the package <package>apt-transport-https</package>, which "
+#| "provides access methods for HTTPS URIs with features similar to the http "
+#| "method.  Methods for using e.g. debtorrent are also available - see &apt-"
+#| "transport-debtorrent;."
 msgid ""
 "APT can be extended with more methods shipped in other optional packages, "
 "which should follow the naming scheme <package>apt-transport-"
 "<replaceable>method</replaceable></package>.  For instance, the APT team "
-"also maintains the package <package>apt-transport-https</package>, which "
-"provides access methods for HTTPS URIs with features similar to the http "
-"method.  Methods for using e.g. debtorrent are also available - see &apt-"
-"transport-debtorrent;."
+"also maintains the package <package>apt-transport-tor</package>, which "
+"provides access methods for HTTP and HTTPS URIs routed via the Tor network."
 msgstr ""
 "APT może być rozszerzone o więcej metod, pochodzących z innych opcjonalnych "
 "pakietów, które powinny się nazywać <package>apt-transport-"
@@ -10384,6 +10437,21 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 
+#~ msgid ""
+#~ "The http scheme specifies an HTTP server for the archive. If an "
+#~ "environment variable <envar>http_proxy</envar> is set with the format "
+#~ "http://server:port/, the proxy server specified in <envar>http_proxy</"
+#~ "envar> will be used. Users of authenticated HTTP/1.1 proxies may use a "
+#~ "string of the format http://user:pass@server:port/.  Note that this is an "
+#~ "insecure method of authentication."
+#~ msgstr ""
+#~ "Schemat http opisuje serwer archiwum HTTP. Jeśli ustawiono zmienną "
+#~ "środowiskową <envar>http_proxy</envar> w formacie http://serwer:port/, to "
+#~ "APT użyje serwera proxy określonego w tej zmiennej. Użytkownicy serwerów "
+#~ "proxy wymagających autoryzacji mogą ustawić tę zmienną na http://"
+#~ "użytkownik:hasło@serwer:port/. Proszę zauważyć, że taki sposób "
+#~ "autoryzacji nie jest bezpieczny."
+
 #, fuzzy
 #~| msgid "Archive configuration"
 #~ msgid "Archive Configuration"
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 0ea4faabb..83d3c3071 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.7\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+0200\n"
 "PO-Revision-Date: 2014-08-29 00:34+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -1791,8 +1791,9 @@ msgid ""
 "not be used except in very special situations. Using <literal>force-yes</"
 "literal> can potentially destroy your system! Configuration Item: "
 "<literal>APT::Get::force-yes</literal>. This is deprecated and replaced by "
-"<option>--allow-downgrades</option>, <option>--allow-remove-essential</"
-"option>, <option>--allow-change-held-packages</option> in 1.1."
+"<option>--allow-unauthenticated</option> , <option>--allow-downgrades</"
+"option> , <option>--allow-remove-essential</option> , <option>--allow-change-"
+"held-packages</option> in 1.1."
 msgstr ""
 "Força o sim; Esta é uma opção perigosa que irá fazer com que o apt continue "
 "sem avisar quando está a fazer algo potencialmente prejudicial. Não deve ser "
@@ -8042,6 +8043,44 @@ msgstr "Os tipos de URI actualmente reconhecidos são:"
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: 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 <literal>Acquire::http</"
+"literal> scope detailed in &apt-conf;. The URI can directly include login "
+"information if the archive requires it, but the use of &apt-authconf; should "
+"be preferred. The method also supports SOCKS5 and HTTP(S) proxies either "
+"configured via apt-specific configuration or specified by the environment "
+"variable <envar>http_proxy</envar> in the format (assuming an HTTP proxy "
+"requiring authentication)  <replaceable>http://user:pass@server:port/</"
+"replaceable>.  The authentication details for proxies can also be supplied "
+"via &apt-authconf;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: 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 "
+"sufficiently capable attacker can observe and record login as well as all "
+"other interactions. The attacker can <emphasis>not</emphasis> modify the "
+"communication through as APTs data security model is independent of the "
+"chosen transport method. See &apt-secure; for details."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: 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 "
+"is that the communication between apt and server (or proxy) is encrypted. "
+"Note that the encryption does not prevent an attacker from knowing which "
+"server (or proxy) apt is communicating with and deeper analyses can "
+"potentially still reveal which data was downloaded. If this is a concern the "
+"Tor-based schemes mentioned further below might be a suitable alternative."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: 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 "
 "archives."
@@ -8052,9 +8091,15 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "The cdrom scheme allows APT to use a local CD-ROM drive with media "
+#| "swapping. Use the &apt-cdrom; program to create cdrom entries in the "
+#| "source list."
 msgid ""
-"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
-"Use the &apt-cdrom; program to create cdrom entries in the source list."
+"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 "
+"source list."
 msgstr ""
 "O esquema cdrom permite ao APT usar uma drive de CD-ROM local com mudança de "
 "media. Use o programa &apt-cdrom; para criar entradas cdrom na lista de "
@@ -8063,25 +8108,26 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
-"The http scheme specifies an HTTP server for the archive. If an environment "
-"variable <envar>http_proxy</envar> is set with the format http://server:"
-"port/, the proxy server specified in <envar>http_proxy</envar> will be used. "
-"Users of authenticated HTTP/1.1 proxies may use a string of the format "
-"http://user:pass@server:port/.  Note that this is an insecure method of "
-"authentication."
+"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> "
+"and many archives either never offered or are retiring FTP access. If you "
+"still need this method many configuration options for it are available in "
+"the <literal>Acquire::ftp</literal> scope and detailed in &apt-conf;."
 msgstr ""
-"O esquema http especifica um servidor HTTP para o arquivo. Se uma variável "
-"de ambiente <envar>http_proxy</envar> estiver definida com o formato http://"
-"server:port/, será usado o servidor proxy especificado em <envar>http_proxy</"
-"envar>. Os utilizadores de proxies HTTP/1.1 autenticados pode usar uma "
-"string do formato http://user:pass@server:port/. Note que este não é um "
-"método de autenticação seguro."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "The ftp scheme specifies an FTP server for the archive. APT's FTP "
+#| "behavior is highly configurable; for more information see the &apt-conf; "
+#| "manual page. Please note that an FTP proxy can be specified by using the "
+#| "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
+#| "an HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
+#| "environment variable and <emphasis>only</emphasis> this environment "
+#| "variable. Proxies using HTTP specified in the configuration file will be "
+#| "ignored."
 msgid ""
-"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
-"is highly configurable; for more information see the &apt-conf; manual page. "
 "Please note that an FTP proxy can be specified by using the "
 "<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
 "HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
@@ -8132,14 +8178,21 @@ msgstr "adicionando mais tipos de URI reconhecíveis"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
+#, fuzzy
+#| msgid ""
+#| "APT can be extended with more methods shipped in other optional packages, "
+#| "which should follow the naming scheme <package>apt-transport-"
+#| "<replaceable>method</replaceable></package>.  For instance, the APT team "
+#| "also maintains the package <package>apt-transport-https</package>, which "
+#| "provides access methods for HTTPS URIs with features similar to the http "
+#| "method.  Methods for using e.g. debtorrent are also available - see &apt-"
+#| "transport-debtorrent;."
 msgid ""
 "APT can be extended with more methods shipped in other optional packages, "
 "which should follow the naming scheme <package>apt-transport-"
 "<replaceable>method</replaceable></package>.  For instance, the APT team "
-"also maintains the package <package>apt-transport-https</package>, which "
-"provides access methods for HTTPS URIs with features similar to the http "
-"method.  Methods for using e.g. debtorrent are also available - see &apt-"
-"transport-debtorrent;."
+"also maintains the package <package>apt-transport-tor</package>, which "
+"provides access methods for HTTP and HTTPS URIs routed via the Tor network."
 msgstr ""
 "O APT pode ser estendido com mais métodos lançados em outros pacotes "
 "opcionais, que devem seguir o esquema de nomeação <literal>apt-transport-"
@@ -11136,6 +11189,21 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
 
+#~ msgid ""
+#~ "The http scheme specifies an HTTP server for the archive. If an "
+#~ "environment variable <envar>http_proxy</envar> is set with the format "
+#~ "http://server:port/, the proxy server specified in <envar>http_proxy</"
+#~ "envar> will be used. Users of authenticated HTTP/1.1 proxies may use a "
+#~ "string of the format http://user:pass@server:port/.  Note that this is an "
+#~ "insecure method of authentication."
+#~ msgstr ""
+#~ "O esquema http especifica um servidor HTTP para o arquivo. Se uma "
+#~ "variável de ambiente <envar>http_proxy</envar> estiver definida com o "
+#~ "formato http://server:port/, será usado o servidor proxy especificado em "
+#~ "<envar>http_proxy</envar>. Os utilizadores de proxies HTTP/1.1 "
+#~ "autenticados pode usar uma string do formato http://user:pass@server:"
+#~ "port/. Note que este não é um método de autenticação seguro."
+
 #~ msgid "Archive Configuration"
 #~ msgstr "Configuração de arquivos"
 
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index b68a7dc91..b4db10629 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+0200\n"
 "PO-Revision-Date: 2004-09-20 17:02+0000\n"
 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
 "Language-Team: <debian-l10n-portuguese@lists.debian.org>\n"
@@ -1247,8 +1247,9 @@ msgid ""
 "not be used except in very special situations. Using <literal>force-yes</"
 "literal> can potentially destroy your system! Configuration Item: "
 "<literal>APT::Get::force-yes</literal>. This is deprecated and replaced by "
-"<option>--allow-downgrades</option>, <option>--allow-remove-essential</"
-"option>, <option>--allow-change-held-packages</option> in 1.1."
+"<option>--allow-unauthenticated</option> , <option>--allow-downgrades</"
+"option> , <option>--allow-remove-essential</option> , <option>--allow-change-"
+"held-packages</option> in 1.1."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -6031,6 +6032,44 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: 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 <literal>Acquire::http</"
+"literal> scope detailed in &apt-conf;. The URI can directly include login "
+"information if the archive requires it, but the use of &apt-authconf; should "
+"be preferred. The method also supports SOCKS5 and HTTP(S) proxies either "
+"configured via apt-specific configuration or specified by the environment "
+"variable <envar>http_proxy</envar> in the format (assuming an HTTP proxy "
+"requiring authentication)  <replaceable>http://user:pass@server:port/</"
+"replaceable>.  The authentication details for proxies can also be supplied "
+"via &apt-authconf;."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: 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 "
+"sufficiently capable attacker can observe and record login as well as all "
+"other interactions. The attacker can <emphasis>not</emphasis> modify the "
+"communication through as APTs data security model is independent of the "
+"chosen transport method. See &apt-secure; for details."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: 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 "
+"is that the communication between apt and server (or proxy) is encrypted. "
+"Note that the encryption does not prevent an attacker from knowing which "
+"server (or proxy) apt is communicating with and deeper analyses can "
+"potentially still reveal which data was downloaded. If this is a concern the "
+"Tor-based schemes mentioned further below might be a suitable alternative."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: 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 "
 "archives."
@@ -6039,26 +6078,24 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
-"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "
-"Use the &apt-cdrom; program to create cdrom entries in the source list."
+"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 "
+"source list."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
-"The http scheme specifies an HTTP server for the archive. If an environment "
-"variable <envar>http_proxy</envar> is set with the format http://server:"
-"port/, the proxy server specified in <envar>http_proxy</envar> will be used. "
-"Users of authenticated HTTP/1.1 proxies may use a string of the format "
-"http://user:pass@server:port/.  Note that this is an insecure method of "
-"authentication."
+"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> "
+"and many archives either never offered or are retiring FTP access. If you "
+"still need this method many configuration options for it are available in "
+"the <literal>Acquire::ftp</literal> scope and detailed in &apt-conf;."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
-"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
-"is highly configurable; for more information see the &apt-conf; manual page. "
 "Please note that an FTP proxy can be specified by using the "
 "<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
 "HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
@@ -6096,10 +6133,8 @@ msgid ""
 "APT can be extended with more methods shipped in other optional packages, "
 "which should follow the naming scheme <package>apt-transport-"
 "<replaceable>method</replaceable></package>.  For instance, the APT team "
-"also maintains the package <package>apt-transport-https</package>, which "
-"provides access methods for HTTPS URIs with features similar to the http "
-"method.  Methods for using e.g. debtorrent are also available - see &apt-"
-"transport-debtorrent;."
+"also maintains the package <package>apt-transport-tor</package>, which "
+"provides access methods for HTTP and HTTPS URIs routed via the Tor network."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index c4df9aa58..3e27d44ea 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>2016-11-25T00:00:00Z</date>
+   <date>2017-07-08T00:00:00Z</date>
  </refentryinfo>
  
  <refmeta>
diff --git a/po/apt-all.pot b/po/apt-all.pot
index af965e710..a9ad3ffe4 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 1.5~alpha4\n"
+"Project-Id-Version: apt 1.5~beta2\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2017-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+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"
@@ -694,11 +694,6 @@ msgstr ""
 
 #: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Opening configuration file %s"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc
-#, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 
@@ -1491,11 +1486,6 @@ msgstr ""
 
 #: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Opening %s"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc
-#, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr ""
 
@@ -1722,6 +1712,12 @@ msgstr ""
 msgid "This APT helper has Super Meep Powers."
 msgstr ""
 
+#: apt-private/private-cmndline.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr ""
+
 #: apt-private/private-depends.cc apt-private/private-show.cc
 #: cmdline/apt-mark.cc
 msgid "No packages found"
@@ -1743,12 +1739,6 @@ msgstr ""
 msgid "Install these packages without verification?"
 msgstr ""
 
-#: apt-private/private-download.cc apt-private/private-install.cc
-msgid ""
-"--force-yes is deprecated, use one of the options starting with --allow "
-"instead."
-msgstr ""
-
 #: apt-private/private-download.cc
 msgid ""
 "There were unauthenticated packages and -y was used without --allow-"
@@ -2394,6 +2384,14 @@ msgstr ""
 msgid "The update command takes no arguments"
 msgstr ""
 
+#. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
+msgid ""
+"Usage of %s should be preferred over embedding login information directly in "
+"the %s entry for '%s'"
+msgstr ""
+
 #: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
@@ -3228,6 +3226,11 @@ msgstr ""
 msgid "Connection failed"
 msgstr ""
 
+#: methods/basehttp.cc methods/curl.cc methods/ftp.cc methods/http.cc
+#, c-format
+msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
+msgstr ""
+
 #: methods/basehttp.cc
 #, c-format
 msgid ""
diff --git a/po/ar.po b/po/ar.po
index ca9300698..dc21f6768 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-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+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"
@@ -702,11 +702,6 @@ msgstr "اختصار نوع مجهول: '%c'"
 
 #: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "فتح ملف التهيئة %s"
-
-#: apt-pkg/contrib/configuration.cc
-#, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 
@@ -1503,11 +1498,6 @@ msgstr ""
 
 #: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Opening %s"
-msgstr "فتح %s"
-
-#: apt-pkg/sourcelist.cc
-#, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr ""
 
@@ -1740,6 +1730,12 @@ msgstr ""
 msgid "This APT helper has Super Meep Powers."
 msgstr ""
 
+#: apt-private/private-cmndline.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr ""
+
 #: apt-private/private-depends.cc apt-private/private-show.cc
 #: cmdline/apt-mark.cc
 msgid "No packages found"
@@ -1761,12 +1757,6 @@ msgstr "تعذرت المصادقة على بعض الحزم"
 msgid "Install these packages without verification?"
 msgstr "تثبيت هذه الحزم دون التحقق منها؟"
 
-#: apt-private/private-download.cc apt-private/private-install.cc
-msgid ""
-"--force-yes is deprecated, use one of the options starting with --allow "
-"instead."
-msgstr ""
-
 #: apt-private/private-download.cc
 #, fuzzy
 msgid ""
@@ -2429,6 +2419,14 @@ msgstr "الحزمة %s النسخة %s لها معتمد غير مستوفى:\n
 msgid "The update command takes no arguments"
 msgstr "لا يقبل الأمر update أية مُعطيات"
 
+#. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
+msgid ""
+"Usage of %s should be preferred over embedding login information directly in "
+"the %s entry for '%s'"
+msgstr ""
+
 #: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
@@ -3287,6 +3285,11 @@ msgstr "بيانات ترويسة سيئة"
 msgid "Connection failed"
 msgstr "فشل الاتصال"
 
+#: methods/basehttp.cc methods/curl.cc methods/ftp.cc methods/http.cc
+#, c-format
+msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
+msgstr ""
+
 #: methods/basehttp.cc
 #, c-format
 msgid ""
@@ -3651,6 +3654,12 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr ""
 
+#~ msgid "Opening configuration file %s"
+#~ msgstr "فتح ملف التهيئة %s"
+
+#~ msgid "Opening %s"
+#~ msgstr "فتح %s"
+
 #~ msgid "Unmet dependencies. Try using --fix-broken."
 #~ msgstr "مُعتمدات غير مستوفاة. حاول استخدام --fix-broken."
 
diff --git a/po/ast.po b/po/ast.po
index 99205e357..2317d9985 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-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+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"
@@ -719,11 +719,6 @@ msgstr "Triba d'abreviatura que nun se reconoz: «%c»"
 
 #: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "Abriendo ficheros de configuración %s"
-
-#: apt-pkg/contrib/configuration.cc
-#, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Fallu de sintaxis %s:%u: Nun hai un nome al entamu del bloque."
 
@@ -1549,11 +1544,6 @@ msgstr "Saltu mal formáu %s llinia %lu #1"
 
 #: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Opening %s"
-msgstr "Abriendo %s"
-
-#: apt-pkg/sourcelist.cc
-#, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Llinia %u mal formada na llista d'oríxenes %s (triba)"
 
@@ -1792,6 +1782,12 @@ msgstr "Esti APT tien Poderes de Super Vaca."
 msgid "This APT helper has Super Meep Powers."
 msgstr ""
 
+#: apt-private/private-cmndline.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr ""
+
 #: apt-private/private-depends.cc apt-private/private-show.cc
 #: cmdline/apt-mark.cc
 msgid "No packages found"
@@ -1813,12 +1809,6 @@ msgstr "Dellos paquetes nun pudieron autenticase"
 msgid "Install these packages without verification?"
 msgstr "¿Instalar esos paquetes ensin verificación?"
 
-#: apt-private/private-download.cc apt-private/private-install.cc
-msgid ""
-"--force-yes is deprecated, use one of the options starting with --allow "
-"instead."
-msgstr ""
-
 #: apt-private/private-download.cc
 #, fuzzy
 msgid ""
@@ -2506,6 +2496,14 @@ msgstr "El paquete %s versión %s nun cumple una dependencia:\n"
 msgid "The update command takes no arguments"
 msgstr "La orde update nun lleva argumentos"
 
+#. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
+msgid ""
+"Usage of %s should be preferred over embedding login information directly in "
+"the %s entry for '%s'"
+msgstr ""
+
 #: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
@@ -3448,6 +3446,11 @@ msgstr "Datos de testera incorreutos"
 msgid "Connection failed"
 msgstr "Fallo la conexón"
 
+#: methods/basehttp.cc methods/curl.cc methods/ftp.cc methods/http.cc
+#, c-format
+msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
+msgstr ""
+
 #: methods/basehttp.cc
 #, c-format
 msgid ""
@@ -3816,6 +3819,12 @@ msgstr "Conexón encaboxada prematuramente"
 msgid "Empty files can't be valid archives"
 msgstr ""
 
+#~ msgid "Opening configuration file %s"
+#~ msgstr "Abriendo ficheros de configuración %s"
+
+#~ msgid "Opening %s"
+#~ msgstr "Abriendo %s"
+
 #~ msgid "Unmet dependencies. Try using --fix-broken."
 #~ msgstr "Dependencies incumplíes. Téntalo usando --fix-broken."
 
diff --git a/po/bg.po b/po/bg.po
index c8dd15822..359197034 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-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+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"
@@ -730,11 +730,6 @@ msgstr "Неизвестен тип на абревиатура: „%c“"
 
 #: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "Отваряне на конфигурационен файл %s"
-
-#: apt-pkg/contrib/configuration.cc
-#, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Синтактична грешка %s:%u: В началото на блока няма име."
 
@@ -1579,11 +1574,6 @@ msgstr "Неправилно форматиран override %s, ред %llu #1"
 
 #: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Opening %s"
-msgstr "Отваряне на %s"
-
-#: apt-pkg/sourcelist.cc
-#, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Лошо форматиран ред %u в списъка с източници %s (тип)"
 
@@ -1825,6 +1815,12 @@ msgstr "Това APT има Върховни Сили."
 msgid "This APT helper has Super Meep Powers."
 msgstr ""
 
+#: apt-private/private-cmndline.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr ""
+
 #: apt-private/private-depends.cc apt-private/private-show.cc
 #: cmdline/apt-mark.cc
 msgid "No packages found"
@@ -1846,12 +1842,6 @@ msgstr "Някои пакети не можаха да бъдат удостов
 msgid "Install these packages without verification?"
 msgstr "Инсталиране на тези пакети без проверка?"
 
-#: apt-private/private-download.cc apt-private/private-install.cc
-msgid ""
-"--force-yes is deprecated, use one of the options starting with --allow "
-"instead."
-msgstr ""
-
 #: apt-private/private-download.cc
 #, fuzzy
 msgid ""
@@ -2545,6 +2535,14 @@ msgstr "Пакетът %s версия %s има неудовлетворена
 msgid "The update command takes no arguments"
 msgstr "Командата „update“ не възприема аргументи"
 
+#. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
+msgid ""
+"Usage of %s should be preferred over embedding login information directly in "
+"the %s entry for '%s'"
+msgstr ""
+
 #: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
@@ -3491,6 +3489,11 @@ msgstr "Невалидни данни на заглавната част"
 msgid "Connection failed"
 msgstr "Неуспех при свързването"
 
+#: methods/basehttp.cc methods/curl.cc methods/ftp.cc methods/http.cc
+#, c-format
+msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
+msgstr ""
+
 #: methods/basehttp.cc
 #, c-format
 msgid ""
@@ -3863,6 +3866,12 @@ msgstr "Връзката прекъсна преждевременно"
 msgid "Empty files can't be valid archives"
 msgstr "Празни файлове не могат да бъдат валидни архиви"
 
+#~ msgid "Opening configuration file %s"
+#~ msgstr "Отваряне на конфигурационен файл %s"
+
+#~ msgid "Opening %s"
+#~ msgstr "Отваряне на %s"
+
 #~ msgid ""
 #~ "Unable to find expected entry '%s' in Release file (Wrong sources.list "
 #~ "entry or malformed file)"
diff --git a/po/bs.po b/po/bs.po
index 2a92ffc03..1acdf9cca 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-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+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"
@@ -699,11 +699,6 @@ msgstr ""
 
 #: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Opening configuration file %s"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc
-#, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 
@@ -1501,11 +1496,6 @@ msgstr ""
 
 #: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Opening %s"
-msgstr "Otvaram %s"
-
-#: apt-pkg/sourcelist.cc
-#, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr ""
 
@@ -1734,6 +1724,12 @@ msgstr ""
 msgid "This APT helper has Super Meep Powers."
 msgstr ""
 
+#: apt-private/private-cmndline.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr ""
+
 #: apt-private/private-depends.cc apt-private/private-show.cc
 #: cmdline/apt-mark.cc
 msgid "No packages found"
@@ -1756,12 +1752,6 @@ msgstr ""
 msgid "Install these packages without verification?"
 msgstr ""
 
-#: apt-private/private-download.cc apt-private/private-install.cc
-msgid ""
-"--force-yes is deprecated, use one of the options starting with --allow "
-"instead."
-msgstr ""
-
 #: apt-private/private-download.cc
 msgid ""
 "There were unauthenticated packages and -y was used without --allow-"
@@ -2413,6 +2403,14 @@ msgstr "Paket %s verzije %s ima nezadovoljenu zavisnost:\n"
 msgid "The update command takes no arguments"
 msgstr ""
 
+#. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
+msgid ""
+"Usage of %s should be preferred over embedding login information directly in "
+"the %s entry for '%s'"
+msgstr ""
+
 #: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
@@ -3269,6 +3267,11 @@ msgstr ""
 msgid "Connection failed"
 msgstr "Povezivanje neuspješno"
 
+#: methods/basehttp.cc methods/curl.cc methods/ftp.cc methods/http.cc
+#, c-format
+msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
+msgstr ""
+
 #: methods/basehttp.cc
 #, c-format
 msgid ""
@@ -3633,6 +3636,9 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr ""
 
+#~ msgid "Opening %s"
+#~ msgstr "Otvaram %s"
+
 #~ msgid "Unmet dependencies. Try using --fix-broken."
 #~ msgstr "Nezadovoljene zavisnosti. Pokušajte koristeći --fix-broken."
 
diff --git a/po/ca.po b/po/ca.po
index d2421acca..babd8b2ca 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-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+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"
@@ -767,11 +767,6 @@ msgstr "Abreujament de tipus no reconegut: «%c»"
 
 #: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "S'està obrint el fitxer de configuració %s"
-
-#: apt-pkg/contrib/configuration.cc
-#, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Error sintàctic %s:%u: No comença el camp amb un nom."
 
@@ -1618,11 +1613,6 @@ msgstr "L'entrada %u està mal formada en %s en el fitxer %s (%s)"
 
 #: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Opening %s"
-msgstr "S'està obrint %s"
-
-#: apt-pkg/sourcelist.cc
-#, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "La línia %u és malformada en la llista de fonts %s (tipus)"
 
@@ -1868,6 +1858,14 @@ msgstr "Aquest APT té superpoders bovins."
 msgid "This APT helper has Super Meep Powers."
 msgstr "Aquest Ajudant d'APT té poders de Super Plor."
 
+#: apt-private/private-cmndline.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr ""
+"--force-yes està en desús, en el seu lloc utilitzi una de les opcions que "
+"comencen per --allow."
+
 #: apt-private/private-depends.cc apt-private/private-show.cc
 #: cmdline/apt-mark.cc
 msgid "No packages found"
@@ -1889,14 +1887,6 @@ msgstr "No s'ha pogut autenticar alguns paquets"
 msgid "Install these packages without verification?"
 msgstr "Voleu instal·lar aquests paquets sense verificar-los?"
 
-#: apt-private/private-download.cc apt-private/private-install.cc
-msgid ""
-"--force-yes is deprecated, use one of the options starting with --allow "
-"instead."
-msgstr ""
-"--force-yes està en desús, en el seu lloc utilitzi una de les opcions que "
-"comencen per --allow."
-
 #: apt-private/private-download.cc
 msgid ""
 "There were unauthenticated packages and -y was used without --allow-"
@@ -2603,6 +2593,14 @@ msgstr "El paquet %s versió %s té una dependència sense satisfer:\n"
 msgid "The update command takes no arguments"
 msgstr "L'ordre update no pren arguments"
 
+#. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
+msgid ""
+"Usage of %s should be preferred over embedding login information directly in "
+"the %s entry for '%s'"
+msgstr ""
+
 #: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
@@ -3576,6 +3574,11 @@ msgstr "Capçalera de dades no vàlida"
 msgid "Connection failed"
 msgstr "Ha fallat la connexió"
 
+#: methods/basehttp.cc methods/curl.cc methods/ftp.cc methods/http.cc
+#, c-format
+msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
+msgstr ""
+
 #: methods/basehttp.cc
 #, c-format
 msgid ""
@@ -3952,6 +3955,12 @@ msgstr "La connexió s'ha tancat prematurament"
 msgid "Empty files can't be valid archives"
 msgstr "Els fitxers buits no poden ser arxius vàlids"
 
+#~ msgid "Opening configuration file %s"
+#~ msgstr "S'està obrint el fitxer de configuració %s"
+
+#~ msgid "Opening %s"
+#~ msgstr "S'està obrint %s"
+
 #~ msgid ""
 #~ "Unable to find expected entry '%s' in Release file (Wrong sources.list "
 #~ "entry or malformed file)"
diff --git a/po/cs.po b/po/cs.po
index 27ae22168..965607c32 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-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+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"
@@ -742,11 +742,6 @@ msgstr "Nerozpoznaná zkratka typu: „%c“"
 
 #: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "Otevírá se konfigurační soubor %s"
-
-#: apt-pkg/contrib/configuration.cc
-#, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Syntaktická chyba %s:%u: Blok nezačíná jménem."
 
@@ -1566,11 +1561,6 @@ msgstr "Zkomolený řádek %u v %s souboru %s (%s)"
 
 #: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Opening %s"
-msgstr "Otevírá se %s"
-
-#: apt-pkg/sourcelist.cc
-#, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Zkomolený řádek %u v seznamu zdrojů %s (typ)"
 
@@ -1812,6 +1802,13 @@ msgstr "Tato APT má schopnosti svaté krávy."
 msgid "This APT helper has Super Meep Powers."
 msgstr "Tento APT pomocník má schopnosti svatého čehokoliv."
 
+#: apt-private/private-cmndline.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr ""
+"--force-yes je zastaralé, použijte některou z voleb začínajících --allow."
+
 #: apt-private/private-depends.cc apt-private/private-show.cc
 #: cmdline/apt-mark.cc
 msgid "No packages found"
@@ -1833,13 +1830,6 @@ msgstr "Některé balíky nemohly být autentizovány"
 msgid "Install these packages without verification?"
 msgstr "Instalovat tyto balíky bez ověření?"
 
-#: apt-private/private-download.cc apt-private/private-install.cc
-msgid ""
-"--force-yes is deprecated, use one of the options starting with --allow "
-"instead."
-msgstr ""
-"--force-yes je zastaralé, použijte některou z voleb začínajících --allow."
-
 #: apt-private/private-download.cc
 msgid ""
 "There were unauthenticated packages and -y was used without --allow-"
@@ -2532,6 +2522,14 @@ msgstr "Balík %s verze %s má nesplněné závislosti:\n"
 msgid "The update command takes no arguments"
 msgstr "Příkaz update neakceptuje žádné argumenty"
 
+#. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
+msgid ""
+"Usage of %s should be preferred over embedding login information directly in "
+"the %s entry for '%s'"
+msgstr ""
+
 #: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
@@ -3480,6 +3478,11 @@ msgstr "Špatné datové záhlaví"
 msgid "Connection failed"
 msgstr "Spojení selhalo"
 
+#: methods/basehttp.cc methods/curl.cc methods/ftp.cc methods/http.cc
+#, c-format
+msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
+msgstr ""
+
 #: methods/basehttp.cc
 #, c-format
 msgid ""
@@ -3850,6 +3853,12 @@ msgstr "Spojení bylo předčasně ukončeno"
 msgid "Empty files can't be valid archives"
 msgstr "Prázdné soubory nejsou platnými archivy"
 
+#~ msgid "Opening configuration file %s"
+#~ msgstr "Otevírá se konfigurační soubor %s"
+
+#~ msgid "Opening %s"
+#~ msgstr "Otevírá se %s"
+
 #~ msgid ""
 #~ "Unable to find expected entry '%s' in Release file (Wrong sources.list "
 #~ "entry or malformed file)"
diff --git a/po/cy.po b/po/cy.po
index 4f5306fe8..9dcbbbdcb 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-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+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"
@@ -720,11 +720,6 @@ msgstr "Talgryniad math anhysbys: '%c'"
 
 #: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "Yn agor y ffeil cyfluniad %s"
-
-#: apt-pkg/contrib/configuration.cc
-#, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Gwall cystrawen %s:%u: Mae bloc yn cychwyn efo dim enw."
 
@@ -1544,11 +1539,6 @@ msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
 
 #: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Opening %s"
-msgstr "Yn agor %s"
-
-#: apt-pkg/sourcelist.cc
-#, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)"
 
@@ -1794,6 +1784,12 @@ msgstr "Mae gan yr APT hwn bŵerau buwch hudol."
 msgid "This APT helper has Super Meep Powers."
 msgstr ""
 
+#: apt-private/private-cmndline.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr ""
+
 #: apt-private/private-depends.cc apt-private/private-show.cc
 #: cmdline/apt-mark.cc
 msgid "No packages found"
@@ -1817,12 +1813,6 @@ msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
 msgid "Install these packages without verification?"
 msgstr ""
 
-#: apt-private/private-download.cc apt-private/private-install.cc
-msgid ""
-"--force-yes is deprecated, use one of the options starting with --allow "
-"instead."
-msgstr ""
-
 #: apt-private/private-download.cc
 #, fuzzy
 msgid ""
@@ -2502,6 +2492,14 @@ msgstr "Mae gan y pecyn %s fersiwn %s ddibyniaeth heb ei gwrdd:\n"
 msgid "The update command takes no arguments"
 msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
 
+#. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
+msgid ""
+"Usage of %s should be preferred over embedding login information directly in "
+"the %s entry for '%s'"
+msgstr ""
+
 #: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
@@ -3473,6 +3471,11 @@ msgstr "Data pennawd gwael"
 msgid "Connection failed"
 msgstr "Methodd y cysylltiad"
 
+#: methods/basehttp.cc methods/curl.cc methods/ftp.cc methods/http.cc
+#, c-format
+msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
+msgstr ""
+
 #: methods/basehttp.cc
 #, c-format
 msgid ""
@@ -3847,6 +3850,12 @@ msgstr "Caewyd y cysylltiad yn gynnar"
 msgid "Empty files can't be valid archives"
 msgstr ""
 
+#~ msgid "Opening configuration file %s"
+#~ msgstr "Yn agor y ffeil cyfluniad %s"
+
+#~ msgid "Opening %s"
+#~ msgstr "Yn agor %s"
+
 #~ msgid "Unmet dependencies. Try using --fix-broken."
 #~ msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio --fix-broken."
 
diff --git a/po/da.po b/po/da.po
index 07e573c4e..d63389a9f 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-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+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"
@@ -751,11 +751,6 @@ msgstr "Ukendt type-forkortelse: »%c«"
 
 #: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "Åbner konfigurationsfilen %s"
-
-#: apt-pkg/contrib/configuration.cc
-#, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Syntaksfejl %s:%u: Blokken starter uden navn."
 
@@ -1580,11 +1575,6 @@ msgstr "Forkert udformet punkt %u i %s-linjen %s (%s)"
 
 #: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Opening %s"
-msgstr "Åbner %s"
-
-#: apt-pkg/sourcelist.cc
-#, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Ugyldig linje %u i kildelisten %s (type)"
 
@@ -1826,6 +1816,14 @@ msgstr "Denne APT har »Super Cow Powers«."
 msgid "This APT helper has Super Meep Powers."
 msgstr "Dette APT-hjælpeprogram har Super Meep Powers."
 
+#: apt-private/private-cmndline.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr ""
+"--force-yes er forældet, brug i stedet for et af tilvalgene startende med --"
+"allow"
+
 #: apt-private/private-depends.cc apt-private/private-show.cc
 #: cmdline/apt-mark.cc
 msgid "No packages found"
@@ -1847,14 +1845,6 @@ msgstr "Nogle pakker kunne ikke autentificeres"
 msgid "Install these packages without verification?"
 msgstr "Installér disse pakker uden verifikation?"
 
-#: apt-private/private-download.cc apt-private/private-install.cc
-msgid ""
-"--force-yes is deprecated, use one of the options starting with --allow "
-"instead."
-msgstr ""
-"--force-yes er forældet, brug i stedet for et af tilvalgene startende med --"
-"allow"
-
 #: apt-private/private-download.cc
 msgid ""
 "There were unauthenticated packages and -y was used without --allow-"
@@ -2550,6 +2540,14 @@ msgstr "Pakken %s version %s har en uopfyldt afhængighed:\n"
 msgid "The update command takes no arguments"
 msgstr "»update«-kommandoen benytter ingen parametre"
 
+#. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
+msgid ""
+"Usage of %s should be preferred over embedding login information directly in "
+"the %s entry for '%s'"
+msgstr ""
+
 #: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
@@ -3515,6 +3513,11 @@ msgstr "Ugyldige hoved-data"
 msgid "Connection failed"
 msgstr "Forbindelsen mislykkedes"
 
+#: methods/basehttp.cc methods/curl.cc methods/ftp.cc methods/http.cc
+#, c-format
+msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
+msgstr ""
+
 #: methods/basehttp.cc
 #, c-format
 msgid ""
@@ -3887,6 +3890,12 @@ msgstr "Forbindelsen lukkedes for hurtigt"
 msgid "Empty files can't be valid archives"
 msgstr "Tomme filer kan ikke være gyldige arkiver"
 
+#~ msgid "Opening configuration file %s"
+#~ msgstr "Åbner konfigurationsfilen %s"
+
+#~ msgid "Opening %s"
+#~ msgstr "Åbner %s"
+
 #~ msgid ""
 #~ "Unable to find expected entry '%s' in Release file (Wrong sources.list "
 #~ "entry or malformed file)"
diff --git a/po/de.po b/po/de.po
index 0a7f9f523..66ac411d4 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-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+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"
@@ -739,11 +739,6 @@ msgstr "Nicht erkannte Typabkürzung: »%c«"
 
 #: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "Konfigurationsdatei %s wird geöffnet"
-
-#: apt-pkg/contrib/configuration.cc
-#, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Syntaxfehler %s:%u: Block beginnt ohne Namen."
 
@@ -1597,11 +1592,6 @@ msgstr "Missgestaltetes Override %s Zeile %llu (%s)"
 
 #: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Opening %s"
-msgstr "%s wird geöffnet."
-
-#: apt-pkg/sourcelist.cc
-#, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)"
 
@@ -1843,6 +1833,12 @@ msgstr "Dieses APT hat Super-Kuh-Kräfte."
 msgid "This APT helper has Super Meep Powers."
 msgstr "Dieses APT-Hilfsprogramm hat Super-Road-Runner-Kräfte."
 
+#: apt-private/private-cmndline.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr ""
+
 #: apt-private/private-depends.cc apt-private/private-show.cc
 #: cmdline/apt-mark.cc
 msgid "No packages found"
@@ -1864,12 +1860,6 @@ msgstr "Einige Pakete konnten nicht authentifiziert werden."
 msgid "Install these packages without verification?"
 msgstr "Diese Pakete ohne Überprüfung installieren?"
 
-#: apt-private/private-download.cc apt-private/private-install.cc
-msgid ""
-"--force-yes is deprecated, use one of the options starting with --allow "
-"instead."
-msgstr ""
-
 #: apt-private/private-download.cc
 #, fuzzy
 msgid ""
@@ -2584,6 +2574,14 @@ msgstr "Paket %s Version %s hat eine unerfüllte Abhängigkeit:\n"
 msgid "The update command takes no arguments"
 msgstr "Der Befehl »update« akzeptiert keine Argumente."
 
+#. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
+msgid ""
+"Usage of %s should be preferred over embedding login information directly in "
+"the %s entry for '%s'"
+msgstr ""
+
 #: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
@@ -3562,6 +3560,11 @@ msgstr "Fehlerhafte Kopfzeilendaten"
 msgid "Connection failed"
 msgstr "Verbindung fehlgeschlagen"
 
+#: methods/basehttp.cc methods/curl.cc methods/ftp.cc methods/http.cc
+#, c-format
+msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
+msgstr ""
+
 #: methods/basehttp.cc
 #, c-format
 msgid ""
@@ -3944,6 +3947,12 @@ msgstr "Verbindung vorzeitig beendet"
 msgid "Empty files can't be valid archives"
 msgstr "Leere Dateien können kein gültiges Archiv sein."
 
+#~ msgid "Opening configuration file %s"
+#~ msgstr "Konfigurationsdatei %s wird geöffnet"
+
+#~ msgid "Opening %s"
+#~ msgstr "%s wird geöffnet."
+
 #~ msgid ""
 #~ "Unable to find expected entry '%s' in Release file (Wrong sources.list "
 #~ "entry or malformed file)"
diff --git a/po/dz.po b/po/dz.po
index e607c3f21..2eebc3ed3 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-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+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"
@@ -710,11 +710,6 @@ msgstr "ངོ་མ་ཤེས་པའི་སྡུད་ཚིག་གི
 
 #: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་%s་འདི་ཁ་ཕྱེ་དོ།"
-
-#: apt-pkg/contrib/configuration.cc
-#, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "་ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:  སྡེབ་ཚན་གྱིས་མིང་མེད་མི་དང་གཅིག་ཁར་འགོ་བཙུགསཔ་ཨིན"
 
@@ -1520,11 +1515,6 @@ msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག
 
 #: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Opening %s"
-msgstr "%s་ཁ་ཕྱེ་དོ།"
-
-#: apt-pkg/sourcelist.cc
-#, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%u་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (དབྱེ་བ)་ནང་ན།"
 
@@ -1766,6 +1756,12 @@ msgstr "འ་ནི་ ཨེ་ཊི་པི་འདི་ལུ་ཡང�
 msgid "This APT helper has Super Meep Powers."
 msgstr ""
 
+#: apt-private/private-cmndline.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr ""
+
 #: apt-private/private-depends.cc apt-private/private-show.cc
 #: cmdline/apt-mark.cc
 msgid "No packages found"
@@ -1788,12 +1784,6 @@ msgstr "ཐུམ་སྒྲིལ་ལ་ལུ་ཅིག་བདེན་
 msgid "Install these packages without verification?"
 msgstr "བདེན་སྦྱོར་མ་འབད་བར་འ་ནི་ཐུམ་སྒྲིལ་འདི་ཚུ་གཞི་བཙུགས་འབད་ནི་ཨིན་ན་"
 
-#: apt-private/private-download.cc apt-private/private-install.cc
-msgid ""
-"--force-yes is deprecated, use one of the options starting with --allow "
-"instead."
-msgstr ""
-
 #: apt-private/private-download.cc
 #, fuzzy
 msgid ""
@@ -2469,6 +2459,14 @@ msgstr "ཐུམ་སྒྲིལ་ %s ཐོན་རིམ་ %s ལུ་
 msgid "The update command takes no arguments"
 msgstr "དུས་མཐུན་བཟོ་བའི་བརྡ་བཀོད་འདི་གིས་སྒྲུབ་རྟགས་ཚུ་མི་འབག་འབད།"
 
+#. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
+msgid ""
+"Usage of %s should be preferred over embedding login information directly in "
+"the %s entry for '%s'"
+msgstr ""
+
 #: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
@@ -3419,6 +3417,11 @@ msgstr "མགོ་ཡིག་གནད་སྡུད་བྱང་ཉེས
 msgid "Connection failed"
 msgstr "བཐུད་ལམ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
+#: methods/basehttp.cc methods/curl.cc methods/ftp.cc methods/http.cc
+#, c-format
+msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
+msgstr ""
+
 #: methods/basehttp.cc
 #, c-format
 msgid ""
@@ -3790,6 +3793,12 @@ msgstr "དུས་སུ་མ་འབབ་པ་རང་མཐུད་ལ
 msgid "Empty files can't be valid archives"
 msgstr ""
 
+#~ msgid "Opening configuration file %s"
+#~ msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་%s་འདི་ཁ་ཕྱེ་དོ།"
+
+#~ msgid "Opening %s"
+#~ msgstr "%s་ཁ་ཕྱེ་དོ།"
+
 #~ msgid "Unmet dependencies. Try using --fix-broken."
 #~ msgstr "མ་ཚང་པའི་རྟེན་འབྲེལ་ཚུ། --fix-broken ལག་ལེན་འཐབ་སྟེ་འབད་རྩོལ་བསྐྱེད།"
 
diff --git a/po/el.po b/po/el.po
index 27c7c0a22..89e705e7d 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-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+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"
@@ -724,11 +724,6 @@ msgstr "Μη αναγνωρισμένος τύπος σύντμησης: '%c'"
 
 #: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "Άνοιγμα του αρχείου ρυθμίσεων %s"
-
-#: apt-pkg/contrib/configuration.cc
-#, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Συντακτικό σφάλμα %s:%u: Το block αρχίζει χωρίς όνομα."
 
@@ -1539,11 +1534,6 @@ msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu
 
 #: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Opening %s"
-msgstr "Άνοιγμα του %s"
-
-#: apt-pkg/sourcelist.cc
-#, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (τύπος)"
 
@@ -1786,6 +1776,12 @@ msgstr ""
 msgid "This APT helper has Super Meep Powers."
 msgstr ""
 
+#: apt-private/private-cmndline.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr ""
+
 #: apt-private/private-depends.cc apt-private/private-show.cc
 #: cmdline/apt-mark.cc
 msgid "No packages found"
@@ -1807,12 +1803,6 @@ msgstr "Μερικά πακέτα δεν εξαακριβώθηκαν"
 msgid "Install these packages without verification?"
 msgstr "Εγκατάσταση των πακέτων χωρίς επαλήθευση;"
 
-#: apt-private/private-download.cc apt-private/private-install.cc
-msgid ""
-"--force-yes is deprecated, use one of the options starting with --allow "
-"instead."
-msgstr ""
-
 #: apt-private/private-download.cc
 #, fuzzy
 msgid ""
@@ -2495,6 +2485,14 @@ msgstr "Το πακέτο %s με έκδοση %s έχει ανικανοποί�
 msgid "The update command takes no arguments"
 msgstr "Η εντολή update δεν παίρνει ορίσματα"
 
+#. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
+msgid ""
+"Usage of %s should be preferred over embedding login information directly in "
+"the %s entry for '%s'"
+msgstr ""
+
 #: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
@@ -3446,6 +3444,11 @@ msgstr "Ελαττωματικά δεδομένα επικεφαλίδας"
 msgid "Connection failed"
 msgstr "Η σύνδεση απέτυχε"
 
+#: methods/basehttp.cc methods/curl.cc methods/ftp.cc methods/http.cc
+#, c-format
+msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
+msgstr ""
+
 #: methods/basehttp.cc
 #, c-format
 msgid ""
@@ -3818,6 +3821,12 @@ msgstr "Η σύνδεση έκλεισε πρόωρα"
 msgid "Empty files can't be valid archives"
 msgstr ""
 
+#~ msgid "Opening configuration file %s"
+#~ msgstr "Άνοιγμα του αρχείου ρυθμίσεων %s"
+
+#~ msgid "Opening %s"
+#~ msgstr "Άνοιγμα του %s"
+
 #~ msgid "Unmet dependencies. Try using --fix-broken."
 #~ msgstr "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε με το --fix-broken."
 
diff --git a/po/es.po b/po/es.po
index 0674a0df7..aff222d61 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-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+0200\n"
 "PO-Revision-Date: 2016-01-26 01:51+0100\n"
 "Last-Translator: Manuel \"Venturi\" Porras Peralta <venturi@openmailbox."
 "org>\n"
@@ -828,11 +828,6 @@ msgstr "Tipo de abreviación no reconocida: «%c»"
 
 #: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "Abriendo fichero de configuración %s"
-
-#: apt-pkg/contrib/configuration.cc
-#, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Error de sintaxis %s:%u: No hay un nombre al comienzo del bloque."
 
@@ -1684,11 +1679,6 @@ msgstr "Entrada %u mal especificada en %s fichero %s (%s)"
 
 #: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Opening %s"
-msgstr "Abriendo %s"
-
-#: apt-pkg/sourcelist.cc
-#, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Línea %u mal formada en la lista de fuentes %s (tipo)"
 
@@ -1932,6 +1922,14 @@ msgstr "Este APT tiene poderes de Super Vaca."
 msgid "This APT helper has Super Meep Powers."
 msgstr "Este Ayudante de APT tiene poderes de Super Llanto."
 
+#: apt-private/private-cmndline.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr ""
+"--force-yes está desactualizado, en su lugar utilice una de las opciones que "
+"empiezan por --allow."
+
 #: apt-private/private-depends.cc apt-private/private-show.cc
 #: cmdline/apt-mark.cc
 msgid "No packages found"
@@ -1953,14 +1951,6 @@ msgstr "Algunos paquetes no se pueden autenticar"
 msgid "Install these packages without verification?"
 msgstr "¿Instalar estos paquetes sin verificación?"
 
-#: apt-private/private-download.cc apt-private/private-install.cc
-msgid ""
-"--force-yes is deprecated, use one of the options starting with --allow "
-"instead."
-msgstr ""
-"--force-yes está desactualizado, en su lugar utilice una de las opciones que "
-"empiezan por --allow."
-
 #: apt-private/private-download.cc
 msgid ""
 "There were unauthenticated packages and -y was used without --allow-"
@@ -2663,6 +2653,14 @@ msgstr "El paquete %s versión %s tiene dependencias incumplidas:\n"
 msgid "The update command takes no arguments"
 msgstr "La orden de actualización no necesita argumentos"
 
+#. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
+msgid ""
+"Usage of %s should be preferred over embedding login information directly in "
+"the %s entry for '%s'"
+msgstr ""
+
 #: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
@@ -3638,6 +3636,11 @@ msgstr "Datos de cabecera incorrectos"
 msgid "Connection failed"
 msgstr "Falló la conexión"
 
+#: methods/basehttp.cc methods/curl.cc methods/ftp.cc methods/http.cc
+#, c-format
+msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
+msgstr ""
+
 #: methods/basehttp.cc
 #, c-format
 msgid ""
@@ -4012,6 +4015,12 @@ msgstr "La conexión se cerró prematuramente"
 msgid "Empty files can't be valid archives"
 msgstr "Los ficheros vacíos no pueden ser archivos válidos"
 
+#~ msgid "Opening configuration file %s"
+#~ msgstr "Abriendo fichero de configuración %s"
+
+#~ msgid "Opening %s"
+#~ msgstr "Abriendo %s"
+
 #~ msgid ""
 #~ "Unable to find expected entry '%s' in Release file (Wrong sources.list "
 #~ "entry or malformed file)"
diff --git a/po/eu.po b/po/eu.po
index 4f7f3b7f3..2d45fe5e4 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-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+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"
@@ -710,11 +710,6 @@ msgstr "Mota ezezaguneko laburtzapena: '%c'"
 
 #: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "%s konfigurazio fitxategia irekitzen"
-
-#: apt-pkg/contrib/configuration.cc
-#, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Sintaxi errorea, %s:%u: Blokearen hasieran ez dago izenik."
 
@@ -1520,11 +1515,6 @@ msgstr "Gaizki osatutako override %s, lerroa: %lu #1"
 
 #: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Opening %s"
-msgstr "%s irekitzen"
-
-#: apt-pkg/sourcelist.cc
-#, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Gaizki osatutako %u lerroa %s Iturburu zerrendan (type)"
 
@@ -1764,6 +1754,12 @@ msgstr "APT honek Super Behiaren Ahalmenak ditu."
 msgid "This APT helper has Super Meep Powers."
 msgstr ""
 
+#: apt-private/private-cmndline.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr ""
+
 #: apt-private/private-depends.cc apt-private/private-show.cc
 #: cmdline/apt-mark.cc
 msgid "No packages found"
@@ -1785,12 +1781,6 @@ msgstr "Zenbait pakete ezin dira egiaztatu"
 msgid "Install these packages without verification?"
 msgstr "Paketeak egiaztapen gabe instalatu?"
 
-#: apt-private/private-download.cc apt-private/private-install.cc
-msgid ""
-"--force-yes is deprecated, use one of the options starting with --allow "
-"instead."
-msgstr ""
-
 #: apt-private/private-download.cc
 #, fuzzy
 msgid ""
@@ -2472,6 +2462,14 @@ msgstr "%s paketeak (%s bertsioa) mendekotasun arazo bat du:\n"
 msgid "The update command takes no arguments"
 msgstr "Eguneratzeko komandoak ez du argumenturik hartzen"
 
+#. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
+msgid ""
+"Usage of %s should be preferred over embedding login information directly in "
+"the %s entry for '%s'"
+msgstr ""
+
 #: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
@@ -3412,6 +3410,11 @@ msgstr "Goiburu data gaizki dago"
 msgid "Connection failed"
 msgstr "Konexioak huts egin du"
 
+#: methods/basehttp.cc methods/curl.cc methods/ftp.cc methods/http.cc
+#, c-format
+msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
+msgstr ""
+
 #: methods/basehttp.cc
 #, c-format
 msgid ""
@@ -3785,6 +3788,12 @@ msgstr "Konexioa behar baino lehenago itxi da"
 msgid "Empty files can't be valid archives"
 msgstr ""
 
+#~ msgid "Opening configuration file %s"
+#~ msgstr "%s konfigurazio fitxategia irekitzen"
+
+#~ msgid "Opening %s"
+#~ msgstr "%s irekitzen"
+
 #~ msgid "Unmet dependencies. Try using --fix-broken."
 #~ msgstr "Bete gabeko mendekotasunak. Probatu --fix-broken erabiliz."
 
diff --git a/po/fi.po b/po/fi.po
index fa74446bf..3a23e28d7 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-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+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"
@@ -709,11 +709,6 @@ msgstr "Tuntematon tyypin lyhenne: \"%c\""
 
 #: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "Avataan asetustiedosto %s"
-
-#: apt-pkg/contrib/configuration.cc
-#, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Syntaksivirhe %s: %u: Lohko alkaa ilman nimeä."
 
@@ -1515,11 +1510,6 @@ msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 1"
 
 #: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Opening %s"
-msgstr "Avataan %s"
-
-#: apt-pkg/sourcelist.cc
-#, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Rivi %u on väärän muotoinen lähdeluettelossa %s (tyyppi)"
 
@@ -1759,6 +1749,12 @@ msgstr ""
 msgid "This APT helper has Super Meep Powers."
 msgstr ""
 
+#: apt-private/private-cmndline.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr ""
+
 #: apt-private/private-depends.cc apt-private/private-show.cc
 #: cmdline/apt-mark.cc
 msgid "No packages found"
@@ -1780,12 +1776,6 @@ msgstr "Joidenkin pakettien alkuperästä ei voitu varmistua"
 msgid "Install these packages without verification?"
 msgstr "Asennetaanko nämä paketit ilman todennusta?"
 
-#: apt-private/private-download.cc apt-private/private-install.cc
-msgid ""
-"--force-yes is deprecated, use one of the options starting with --allow "
-"instead."
-msgstr ""
-
 #: apt-private/private-download.cc
 #, fuzzy
 msgid ""
@@ -2464,6 +2454,14 @@ msgstr "Paketin %s versiossa %s on tyydyttämätön riippuvuus:\n"
 msgid "The update command takes no arguments"
 msgstr "Komento update ei käytä parametreja"
 
+#. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
+msgid ""
+"Usage of %s should be preferred over embedding login information directly in "
+"the %s entry for '%s'"
+msgstr ""
+
 #: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
@@ -3408,6 +3406,11 @@ msgstr "Virheellinen otsikkotieto"
 msgid "Connection failed"
 msgstr "Yhteys ei toiminut"
 
+#: methods/basehttp.cc methods/curl.cc methods/ftp.cc methods/http.cc
+#, c-format
+msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
+msgstr ""
+
 #: methods/basehttp.cc
 #, c-format
 msgid ""
@@ -3777,6 +3780,12 @@ msgstr "Yhteys katkesi ennenaikaisesti"
 msgid "Empty files can't be valid archives"
 msgstr ""
 
+#~ msgid "Opening configuration file %s"
+#~ msgstr "Avataan asetustiedosto %s"
+
+#~ msgid "Opening %s"
+#~ msgstr "Avataan %s"
+
 #~ msgid "Unmet dependencies. Try using --fix-broken."
 #~ msgstr "Tyydyttämättömiä riippuvuuksia. Koita käyttää --fix-broken."
 
diff --git a/po/fr.po b/po/fr.po
index bedb0889a..a14e12552 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-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+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"
@@ -743,11 +743,6 @@ msgstr "Type d'abréviation non reconnue : « %c »"
 
 #: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "Ouverture du fichier de configuration %s"
-
-#: apt-pkg/contrib/configuration.cc
-#, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Erreur syntaxique %s:%u : le bloc commence sans aucun nom."
 
@@ -1601,11 +1596,6 @@ msgstr "Entrée « override » %s mal formée ligne %llu n° 1"
 
 #: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Opening %s"
-msgstr "Ouverture de %s"
-
-#: apt-pkg/sourcelist.cc
-#, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Ligne %u mal formée dans la liste des sources %s (type)"
 
@@ -1851,6 +1841,12 @@ msgstr "Cet APT a les « Super Cow Powers »"
 msgid "This APT helper has Super Meep Powers."
 msgstr ""
 
+#: apt-private/private-cmndline.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr ""
+
 #: apt-private/private-depends.cc apt-private/private-show.cc
 #: cmdline/apt-mark.cc
 msgid "No packages found"
@@ -1872,12 +1868,6 @@ msgstr "Certains paquets n'ont pas pu être authentifiés"
 msgid "Install these packages without verification?"
 msgstr "Faut-il installer ces paquets sans vérification ?"
 
-#: apt-private/private-download.cc apt-private/private-install.cc
-msgid ""
-"--force-yes is deprecated, use one of the options starting with --allow "
-"instead."
-msgstr ""
-
 #: apt-private/private-download.cc
 #, fuzzy
 msgid ""
@@ -2588,6 +2578,14 @@ msgstr "Le paquet %s de version %s contient une dépendance absente :\n"
 msgid "The update command takes no arguments"
 msgstr "La commande de mise à jour ne prend pas de paramètre"
 
+#. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
+msgid ""
+"Usage of %s should be preferred over embedding login information directly in "
+"the %s entry for '%s'"
+msgstr ""
+
 #: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
@@ -3552,6 +3550,11 @@ msgstr "Mauvais en-tête de donnée"
 msgid "Connection failed"
 msgstr "Échec de la connexion"
 
+#: methods/basehttp.cc methods/curl.cc methods/ftp.cc methods/http.cc
+#, c-format
+msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
+msgstr ""
+
 #: methods/basehttp.cc
 #, c-format
 msgid ""
@@ -3930,6 +3933,12 @@ msgstr "Connexion fermée prématurément"
 msgid "Empty files can't be valid archives"
 msgstr "Les fichiers vides ne peuvent être des archives valables"
 
+#~ msgid "Opening configuration file %s"
+#~ msgstr "Ouverture du fichier de configuration %s"
+
+#~ msgid "Opening %s"
+#~ msgstr "Ouverture de %s"
+
 #~ msgid ""
 #~ "Unable to find expected entry '%s' in Release file (Wrong sources.list "
 #~ "entry or malformed file)"
diff --git a/po/gl.po b/po/gl.po
index eafdee111..e7e789d71 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-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+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"
@@ -732,11 +732,6 @@ msgstr "Abreviatura de tipo «%c» descoñecida"
 
 #: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "Abrindo o ficheiro de configuración %s"
-
-#: apt-pkg/contrib/configuration.cc
-#, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Produciuse un erro de sintaxe %s:%u: O bloque comeza sen un nome."
 
@@ -1571,11 +1566,6 @@ msgstr "«Override» %s liña %lu incorrecta (1)"
 
 #: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Opening %s"
-msgstr "Abrindo %s"
-
-#: apt-pkg/sourcelist.cc
-#, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Liña %u mal construída na lista de orixes %s (tipo)"
 
@@ -1814,6 +1804,12 @@ msgstr "Este APT ten poderes da Super Vaca."
 msgid "This APT helper has Super Meep Powers."
 msgstr ""
 
+#: apt-private/private-cmndline.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr ""
+
 #: apt-private/private-depends.cc apt-private/private-show.cc
 #: cmdline/apt-mark.cc
 msgid "No packages found"
@@ -1835,12 +1831,6 @@ msgstr "Non foi posíbel autenticar algúns paquetes"
 msgid "Install these packages without verification?"
 msgstr "Instalar estes paquetes sen verificación?"
 
-#: apt-private/private-download.cc apt-private/private-install.cc
-msgid ""
-"--force-yes is deprecated, use one of the options starting with --allow "
-"instead."
-msgstr ""
-
 #: apt-private/private-download.cc
 #, fuzzy
 msgid ""
@@ -2536,6 +2526,14 @@ msgstr "O paquete %s versión %s ten unha dependencia incumprida:\n"
 msgid "The update command takes no arguments"
 msgstr "A orde «update» non toma argumentos"
 
+#. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
+msgid ""
+"Usage of %s should be preferred over embedding login information directly in "
+"the %s entry for '%s'"
+msgstr ""
+
 #: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
@@ -3479,6 +3477,11 @@ msgstr "Datos da cabeceira incorrectos"
 msgid "Connection failed"
 msgstr "Produciuse un fallo na conexión"
 
+#: methods/basehttp.cc methods/curl.cc methods/ftp.cc methods/http.cc
+#, c-format
+msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
+msgstr ""
+
 #: methods/basehttp.cc
 #, c-format
 msgid ""
@@ -3851,6 +3854,12 @@ msgstr "A conexión pechouse prematuramente"
 msgid "Empty files can't be valid archives"
 msgstr "Os ficheiros baleiros non poden ser arquivadores válidos"
 
+#~ msgid "Opening configuration file %s"
+#~ msgstr "Abrindo o ficheiro de configuración %s"
+
+#~ msgid "Opening %s"
+#~ msgstr "Abrindo %s"
+
 #~ msgid ""
 #~ "Unable to find expected entry '%s' in Release file (Wrong sources.list "
 #~ "entry or malformed file)"
diff --git a/po/hu.po b/po/hu.po
index 6131ddee2..e27b17c33 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-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+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"
@@ -759,11 +759,6 @@ msgstr "Ismeretlen típusrövidítés: „%c”"
 
 #: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "%s konfigurációs fájl megnyitása"
-
-#: apt-pkg/contrib/configuration.cc
-#, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Szintaktikai hiba %s: %u: A blokk név nélkül kezdődik."
 
@@ -1606,11 +1601,6 @@ msgstr "%u. bejegyzés rosszul formált a(z) %s %s fájlban (%s)"
 
 #: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Opening %s"
-msgstr "%s megnyitása"
-
-#: apt-pkg/sourcelist.cc
-#, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "A(z) %u. sor hibás a(z) %s forráslistában (típus)"
 
@@ -1855,6 +1845,12 @@ msgstr "Ez az APT a SzuperTehén Hatalmával rendelkezik."
 msgid "This APT helper has Super Meep Powers."
 msgstr "Ez az APT segéd a Szuper Meep Hatalmával rendelkezik."
 
+#: apt-private/private-cmndline.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr "a --force-yes elavult, használja a --allow kezdetű kapcsolók egyikét."
+
 #: apt-private/private-depends.cc apt-private/private-show.cc
 #: cmdline/apt-mark.cc
 msgid "No packages found"
@@ -1876,12 +1872,6 @@ msgstr "Néhány csomag nem hitelesíthető"
 msgid "Install these packages without verification?"
 msgstr "Valóban ellenőrzés nélkül telepíti a csomagokat?"
 
-#: apt-private/private-download.cc apt-private/private-install.cc
-msgid ""
-"--force-yes is deprecated, use one of the options starting with --allow "
-"instead."
-msgstr "a --force-yes elavult, használja a --allow kezdetű kapcsolók egyikét."
-
 #: apt-private/private-download.cc
 msgid ""
 "There were unauthenticated packages and -y was used without --allow-"
@@ -2577,6 +2567,14 @@ msgstr "%s csomag %s verziójának teljesítetlen függősége van:\n"
 msgid "The update command takes no arguments"
 msgstr "Az update parancsnak nincsenek argumentumai"
 
+#. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
+msgid ""
+"Usage of %s should be preferred over embedding login information directly in "
+"the %s entry for '%s'"
+msgstr ""
+
 #: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
@@ -3534,6 +3532,11 @@ msgstr "Rossz fejlécadatok"
 msgid "Connection failed"
 msgstr "Sikertelen kapcsolódás"
 
+#: methods/basehttp.cc methods/curl.cc methods/ftp.cc methods/http.cc
+#, c-format
+msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
+msgstr ""
+
 #: methods/basehttp.cc
 #, c-format
 msgid ""
@@ -3910,6 +3913,12 @@ msgstr "A kapcsolat idő előtt lezárult"
 msgid "Empty files can't be valid archives"
 msgstr "Az üres fájlok biztosan nem érvényes csomagok"
 
+#~ msgid "Opening configuration file %s"
+#~ msgstr "%s konfigurációs fájl megnyitása"
+
+#~ msgid "Opening %s"
+#~ msgstr "%s megnyitása"
+
 #~ msgid ""
 #~ "Unable to find expected entry '%s' in Release file (Wrong sources.list "
 #~ "entry or malformed file)"
diff --git a/po/it.po b/po/it.po
index 8f1d359af..44026b553 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-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+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"
@@ -739,11 +739,6 @@ msgstr "Tipo di abbreviazione non riconosciuto: \"%c\""
 
 #: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "Apertura file di configurazione %s"
-
-#: apt-pkg/contrib/configuration.cc
-#, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Errore di sintassi %s:%u: il blocco inizia senza nome"
 
@@ -1591,11 +1586,6 @@ msgstr "Override %s riga %llu malformato (%s)"
 
 #: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Opening %s"
-msgstr "Apertura di %s"
-
-#: apt-pkg/sourcelist.cc
-#, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "La riga %u nel file %s non è corretta (type)"
 
@@ -1837,6 +1827,12 @@ msgstr "Questo APT ha i poteri della Super Mucca."
 msgid "This APT helper has Super Meep Powers."
 msgstr "Questo APT ha super poteri."
 
+#: apt-private/private-cmndline.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr ""
+
 #: apt-private/private-depends.cc apt-private/private-show.cc
 #: cmdline/apt-mark.cc
 msgid "No packages found"
@@ -1858,12 +1854,6 @@ msgstr "Alcuni pacchetti non possono essere autenticati"
 msgid "Install these packages without verification?"
 msgstr "Installare questi pacchetti senza verificarli?"
 
-#: apt-private/private-download.cc apt-private/private-install.cc
-msgid ""
-"--force-yes is deprecated, use one of the options starting with --allow "
-"instead."
-msgstr ""
-
 #: apt-private/private-download.cc
 #, fuzzy
 msgid ""
@@ -2566,6 +2556,14 @@ msgstr "Il pacchetto %s versione %s ha una dipendenza non soddisfatta:\n"
 msgid "The update command takes no arguments"
 msgstr "Il comando update non accetta argomenti"
 
+#. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
+msgid ""
+"Usage of %s should be preferred over embedding login information directly in "
+"the %s entry for '%s'"
+msgstr ""
+
 #: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
@@ -3527,6 +3525,11 @@ msgstr "Header dati non corretto"
 msgid "Connection failed"
 msgstr "Connessione non riuscita"
 
+#: methods/basehttp.cc methods/curl.cc methods/ftp.cc methods/http.cc
+#, c-format
+msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
+msgstr ""
+
 #: methods/basehttp.cc
 #, c-format
 msgid ""
@@ -3902,6 +3905,12 @@ msgstr "Connessione chiusa prematuramente"
 msgid "Empty files can't be valid archives"
 msgstr "File vuoti non possono essere archivi validi"
 
+#~ msgid "Opening configuration file %s"
+#~ msgstr "Apertura file di configurazione %s"
+
+#~ msgid "Opening %s"
+#~ msgstr "Apertura di %s"
+
 #~ msgid ""
 #~ "Unable to find expected entry '%s' in Release file (Wrong sources.list "
 #~ "entry or malformed file)"
diff --git a/po/ja.po b/po/ja.po
index a350dd52e..ad7290dc6 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-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+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"
@@ -762,11 +762,6 @@ msgstr "理解できない省略形式です: '%c'"
 
 #: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "設定ファイル %s をオープンできませんでした"
-
-#: apt-pkg/contrib/configuration.cc
-#, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "文法エラー %s:%u: ブロックが名前なしで始まっています。"
 
@@ -1600,11 +1595,6 @@ msgstr "不正なエントリ %u 行目 %s ファイル %s (%s)"
 
 #: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Opening %s"
-msgstr "%s をオープンしています"
-
-#: apt-pkg/sourcelist.cc
-#, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "ソースリスト %2$s の %1$u 行目が不正です (type)"
 
@@ -1850,6 +1840,14 @@ msgstr "この APT は Super Cow Powers 化されています。"
 msgid "This APT helper has Super Meep Powers."
 msgstr "この APT helper は Super Meep Powers 化されています。"
 
+#: apt-private/private-cmndline.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr ""
+"--force-yes は時代遅れです、代わりに --allow で始まるオプションのいずれかを使"
+"用します。"
+
 #: apt-private/private-depends.cc apt-private/private-show.cc
 #: cmdline/apt-mark.cc
 msgid "No packages found"
@@ -1871,14 +1869,6 @@ msgstr "いくつかのパッケージを認証できませんでした"
 msgid "Install these packages without verification?"
 msgstr "検証なしにこれらのパッケージをインストールしますか?"
 
-#: apt-private/private-download.cc apt-private/private-install.cc
-msgid ""
-"--force-yes is deprecated, use one of the options starting with --allow "
-"instead."
-msgstr ""
-"--force-yes は時代遅れです、代わりに --allow で始まるオプションのいずれかを使"
-"用します。"
-
 #: apt-private/private-download.cc
 msgid ""
 "There were unauthenticated packages and -y was used without --allow-"
@@ -2569,6 +2559,14 @@ msgstr "パッケージ %s のバージョン %s には解決不可能な依存�
 msgid "The update command takes no arguments"
 msgstr "update コマンドは引数をとりません"
 
+#. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
+msgid ""
+"Usage of %s should be preferred over embedding login information directly in "
+"the %s entry for '%s'"
+msgstr ""
+
 #: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
@@ -3525,6 +3523,11 @@ msgstr "不正なヘッダです"
 msgid "Connection failed"
 msgstr "接続失敗"
 
+#: methods/basehttp.cc methods/curl.cc methods/ftp.cc methods/http.cc
+#, c-format
+msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
+msgstr ""
+
 #: methods/basehttp.cc
 #, c-format
 msgid ""
@@ -3894,6 +3897,12 @@ msgstr "途中で接続がクローズされました"
 msgid "Empty files can't be valid archives"
 msgstr "空のファイルは有効なアーカイブと認められません"
 
+#~ msgid "Opening configuration file %s"
+#~ msgstr "設定ファイル %s をオープンできませんでした"
+
+#~ msgid "Opening %s"
+#~ msgstr "%s をオープンしています"
+
 #~ msgid ""
 #~ "Unable to find expected entry '%s' in Release file (Wrong sources.list "
 #~ "entry or malformed file)"
diff --git a/po/km.po b/po/km.po
index 04645c242..dc36a10ea 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-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+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"
@@ -709,11 +709,6 @@ msgstr "មិន​បាន​​ទទួល​ស្គាល់​ប្រ
 
 #: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "កំពុង​បើ​ឯកសារ​កំណត់រចនាសម្ព័ន្ធ​ %s"
-
-#: apt-pkg/contrib/configuration.cc
-#, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "កំហុស​វាក្យ​សម្ពន្ធ %s:%u ៖ ប្លុក​ចាប់​ផ្តើម​​ដោយ​គ្មាន​ឈ្មោះ​ ។"
 
@@ -1515,11 +1510,6 @@ msgstr "Malformed បដិសេធ %s បន្ទាត់ %lu #1"
 
 #: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Opening %s"
-msgstr "កំពុង​បើក​ %s"
-
-#: apt-pkg/sourcelist.cc
-#, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "បន្ទាត់​ Malformed  %u ក្នុង​បញ្ជី​ប្រភព​ %s (ប្រភេទ​)"
 
@@ -1758,6 +1748,12 @@ msgstr ""
 msgid "This APT helper has Super Meep Powers."
 msgstr ""
 
+#: apt-private/private-cmndline.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr ""
+
 #: apt-private/private-depends.cc apt-private/private-show.cc
 #: cmdline/apt-mark.cc
 msgid "No packages found"
@@ -1780,12 +1776,6 @@ msgstr "មិនអាច​ផ្ទៀងផ្ទាត់ភាពត្រ
 msgid "Install these packages without verification?"
 msgstr "ដំឡើង​កញ្ចប់​ទាំងនេះ ​ដោយគ្មានការពិនិត្យ​បញ្ជាក់ [y/N] ? "
 
-#: apt-private/private-download.cc apt-private/private-install.cc
-msgid ""
-"--force-yes is deprecated, use one of the options starting with --allow "
-"instead."
-msgstr ""
-
 #: apt-private/private-download.cc
 #, fuzzy
 msgid ""
@@ -2453,6 +2443,14 @@ msgstr "កញ្ចប់ %s កំណែ %s មាន​ភាព​អាស�
 msgid "The update command takes no arguments"
 msgstr "ពាក្យ​បញ្ជា​ដែលធ្វើ​ឲ្យ​ទាន់​សម័យ​គ្មាន​អាគុយម៉ង់​ទេ"
 
+#. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
+msgid ""
+"Usage of %s should be preferred over embedding login information directly in "
+"the %s entry for '%s'"
+msgstr ""
+
 #: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
@@ -3395,6 +3393,11 @@ msgstr "ទិន្នន័យ​បឋមកថា​ខូច"
 msgid "Connection failed"
 msgstr "ការតភ្ជាប់​បាន​បរាជ័យ​"
 
+#: methods/basehttp.cc methods/curl.cc methods/ftp.cc methods/http.cc
+#, c-format
+msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
+msgstr ""
+
 #: methods/basehttp.cc
 #, c-format
 msgid ""
@@ -3759,6 +3762,12 @@ msgstr "បាន​បិទ​ការ​តភ្ជាប់​មុន​
 msgid "Empty files can't be valid archives"
 msgstr ""
 
+#~ msgid "Opening configuration file %s"
+#~ msgstr "កំពុង​បើ​ឯកសារ​កំណត់រចនាសម្ព័ន្ធ​ %s"
+
+#~ msgid "Opening %s"
+#~ msgstr "កំពុង​បើក​ %s"
+
 #~ msgid "Unmet dependencies. Try using --fix-broken."
 #~ msgstr "ភាព​អាស្រ័យ​ដែល​ខុស​គ្នា ។ ព្យាយាម​ការ​ប្រើ --fix-broken ។"
 
diff --git a/po/ko.po b/po/ko.po
index 2185d905d..cfdaf573b 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-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+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"
@@ -710,11 +710,6 @@ msgstr "이 타입 줄임말을 알 수 없습니다: '%c'"
 
 #: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "설정 파일 %s 파일을 여는 중입니다"
-
-#: apt-pkg/contrib/configuration.cc
-#, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "문법 오류 %s:%u: 블럭이 이름으로 시작하지 않습니다."
 
@@ -1525,11 +1520,6 @@ msgstr "override %s의 %lu번 줄 #1이 잘못되었습니다"
 
 #: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Opening %s"
-msgstr "%s 파일을 여는 중입니다"
-
-#: apt-pkg/sourcelist.cc
-#, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (타입)"
 
@@ -1771,6 +1761,12 @@ msgstr "이 APT는 Super Cow Powers로 무장했습니다."
 msgid "This APT helper has Super Meep Powers."
 msgstr ""
 
+#: apt-private/private-cmndline.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr ""
+
 #: apt-private/private-depends.cc apt-private/private-show.cc
 #: cmdline/apt-mark.cc
 msgid "No packages found"
@@ -1792,12 +1788,6 @@ msgstr "인증할 수 없는 패키지가 있습니다"
 msgid "Install these packages without verification?"
 msgstr "확인하지 않고 패키지를 설치하시겠습니까?"
 
-#: apt-private/private-download.cc apt-private/private-install.cc
-msgid ""
-"--force-yes is deprecated, use one of the options starting with --allow "
-"instead."
-msgstr ""
-
 #: apt-private/private-download.cc
 #, fuzzy
 msgid ""
@@ -2473,6 +2463,14 @@ msgstr "%s 패키지의 %s 버전의 의존성이 맞지 않습니다:\n"
 msgid "The update command takes no arguments"
 msgstr "update 명령은 인수를 받지 않습니다"
 
+#. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
+msgid ""
+"Usage of %s should be preferred over embedding login information directly in "
+"the %s entry for '%s'"
+msgstr ""
+
 #: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
@@ -3408,6 +3406,11 @@ msgstr "헤더 데이터가 잘못되었습니다"
 msgid "Connection failed"
 msgstr "연결이 실패했습니다"
 
+#: methods/basehttp.cc methods/curl.cc methods/ftp.cc methods/http.cc
+#, c-format
+msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
+msgstr ""
+
 #: methods/basehttp.cc
 #, c-format
 msgid ""
@@ -3774,6 +3777,12 @@ msgstr "연결이 너무 빨리 끊어졌습니다"
 msgid "Empty files can't be valid archives"
 msgstr ""
 
+#~ msgid "Opening configuration file %s"
+#~ msgstr "설정 파일 %s 파일을 여는 중입니다"
+
+#~ msgid "Opening %s"
+#~ msgstr "%s 파일을 여는 중입니다"
+
 #~ msgid "Unmet dependencies. Try using --fix-broken."
 #~ msgstr "의존성이 맞지 않습니다. --fix-broken 옵션을 사용해 보십시오."
 
diff --git a/po/ku.po b/po/ku.po
index 22458e1ae..47f3bad37 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-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+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"
@@ -702,11 +702,6 @@ msgstr ""
 
 #: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Opening configuration file %s"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc
-#, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 
@@ -1502,11 +1497,6 @@ msgstr ""
 
 #: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Opening %s"
-msgstr "%s tê vekirin"
-
-#: apt-pkg/sourcelist.cc
-#, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr ""
 
@@ -1736,6 +1726,12 @@ msgstr ""
 msgid "This APT helper has Super Meep Powers."
 msgstr ""
 
+#: apt-private/private-cmndline.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr ""
+
 #: apt-private/private-depends.cc apt-private/private-show.cc
 #: cmdline/apt-mark.cc
 msgid "No packages found"
@@ -1757,12 +1753,6 @@ msgstr ""
 msgid "Install these packages without verification?"
 msgstr ""
 
-#: apt-private/private-download.cc apt-private/private-install.cc
-msgid ""
-"--force-yes is deprecated, use one of the options starting with --allow "
-"instead."
-msgstr ""
-
 #: apt-private/private-download.cc
 msgid ""
 "There were unauthenticated packages and -y was used without --allow-"
@@ -2415,6 +2405,14 @@ msgstr ""
 msgid "The update command takes no arguments"
 msgstr ""
 
+#. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
+msgid ""
+"Usage of %s should be preferred over embedding login information directly in "
+"the %s entry for '%s'"
+msgstr ""
+
 #: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
@@ -3295,6 +3293,11 @@ msgstr ""
 msgid "Connection failed"
 msgstr "Girêdan pêk nehatiye"
 
+#: methods/basehttp.cc methods/curl.cc methods/ftp.cc methods/http.cc
+#, c-format
+msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
+msgstr ""
+
 #: methods/basehttp.cc
 #, c-format
 msgid ""
@@ -3659,6 +3662,9 @@ msgstr "Girêdan zû hatiye girtin"
 msgid "Empty files can't be valid archives"
 msgstr ""
 
+#~ msgid "Opening %s"
+#~ msgstr "%s tê vekirin"
+
 #~ msgid "(not found)"
 #~ msgstr "(nehate dîtin)"
 
diff --git a/po/lt.po b/po/lt.po
index 2737ad6e9..3573b8860 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-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+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"
@@ -704,11 +704,6 @@ msgstr ""
 
 #: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Opening configuration file %s"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc
-#, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 
@@ -1504,11 +1499,6 @@ msgstr "Nekorektiškas perrašymas %s eilutėje %lu #1"
 
 #: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Opening %s"
-msgstr "Atveriama %s"
-
-#: apt-pkg/sourcelist.cc
-#, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr ""
 
@@ -1750,6 +1740,12 @@ msgstr ""
 msgid "This APT helper has Super Meep Powers."
 msgstr ""
 
+#: apt-private/private-cmndline.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr ""
+
 #: apt-private/private-depends.cc apt-private/private-show.cc
 #: cmdline/apt-mark.cc
 msgid "No packages found"
@@ -1771,12 +1767,6 @@ msgstr "Nepavyko autentikuoti kai kurių paketų"
 msgid "Install these packages without verification?"
 msgstr "Įdiegti šiuos paketus be patvirtinimo?"
 
-#: apt-private/private-download.cc apt-private/private-install.cc
-msgid ""
-"--force-yes is deprecated, use one of the options starting with --allow "
-"instead."
-msgstr ""
-
 #: apt-private/private-download.cc
 #, fuzzy
 msgid ""
@@ -2443,6 +2433,14 @@ msgstr "Paketas %s versijos numeriu %s turi netenkinamą priklausomybę:\n"
 msgid "The update command takes no arguments"
 msgstr "Atnaujinimo komandai argumentų nereikia"
 
+#. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
+msgid ""
+"Usage of %s should be preferred over embedding login information directly in "
+"the %s entry for '%s'"
+msgstr ""
+
 #: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
@@ -3393,6 +3391,11 @@ msgstr ""
 msgid "Connection failed"
 msgstr "Prisijungti nepavyko"
 
+#: methods/basehttp.cc methods/curl.cc methods/ftp.cc methods/http.cc
+#, c-format
+msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
+msgstr ""
+
 #: methods/basehttp.cc
 #, c-format
 msgid ""
@@ -3753,6 +3756,9 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr ""
 
+#~ msgid "Opening %s"
+#~ msgstr "Atveriama %s"
+
 #~ msgid "Unmet dependencies. Try using --fix-broken."
 #~ msgstr "Nepatenkintos priklausomybės. Bandykit naudoti --fix-broken."
 
diff --git a/po/mr.po b/po/mr.po
index 365896dd1..4d21b35a3 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-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+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 "
@@ -708,11 +708,6 @@ msgstr "संक्षिप्तरुपाचा माहित नसल�
 
 #: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "%s संरचना फाईल उघडत आहे"
-
-#: apt-pkg/contrib/configuration.cc
-#, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "रचनेच्या नियमांचा दोष %s:%u: ब्लॉक नावाशिवाय सुरू होतो."
 
@@ -1516,11 +1511,6 @@ msgstr "व्यंगीत/हिडीस दुर्लक्षित क
 
 #: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Opening %s"
-msgstr "%s उघडत आहे"
-
-#: apt-pkg/sourcelist.cc
-#, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "स्त्रोत सुची %2$s (प्रकार) मध्ये %1$u वाईट/व्यंग रेषा"
 
@@ -1760,6 +1750,12 @@ msgstr "ह्या APT ला सुपर काऊ पॉवर्स आह
 msgid "This APT helper has Super Meep Powers."
 msgstr ""
 
+#: apt-private/private-cmndline.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr ""
+
 #: apt-private/private-depends.cc apt-private/private-show.cc
 #: cmdline/apt-mark.cc
 msgid "No packages found"
@@ -1782,12 +1778,6 @@ msgstr "काही पॅकेजेसचे प्रमाणिकरण
 msgid "Install these packages without verification?"
 msgstr "पडताळून पाहिल्याशिवाय ही पॅकेजेस संस्थापित करायची का [हो/नाही]?"
 
-#: apt-private/private-download.cc apt-private/private-install.cc
-msgid ""
-"--force-yes is deprecated, use one of the options starting with --allow "
-"instead."
-msgstr ""
-
 #: apt-private/private-download.cc
 #, fuzzy
 msgid ""
@@ -2457,6 +2447,14 @@ msgstr "पॅकेज %s आवृती %s मध्ये एक अनो�
 msgid "The update command takes no arguments"
 msgstr "सुधारित आवृत्तीचा विधान आर्ग्युमेंटस घेऊ    शकत नाही."
 
+#. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
+msgid ""
+"Usage of %s should be preferred over embedding login information directly in "
+"the %s entry for '%s'"
+msgstr ""
+
 #: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
@@ -3393,6 +3391,11 @@ msgstr "चुकीचा शीर्षक डाटा"
 msgid "Connection failed"
 msgstr "जोडणी अयशस्वी"
 
+#: methods/basehttp.cc methods/curl.cc methods/ftp.cc methods/http.cc
+#, c-format
+msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
+msgstr ""
+
 #: methods/basehttp.cc
 #, c-format
 msgid ""
@@ -3759,6 +3762,12 @@ msgstr "जोडणी अकाली बंद झाली"
 msgid "Empty files can't be valid archives"
 msgstr ""
 
+#~ msgid "Opening configuration file %s"
+#~ msgstr "%s संरचना फाईल उघडत आहे"
+
+#~ msgid "Opening %s"
+#~ msgstr "%s उघडत आहे"
+
 #~ msgid "Unmet dependencies. Try using --fix-broken."
 #~ msgstr "अनमेट डिपेंडन्सीज.--fix-broken.वापरून प्रयत्न करा "
 
diff --git a/po/nb.po b/po/nb.po
index 72b2f992b..0d7fc842a 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-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+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"
@@ -724,11 +724,6 @@ msgstr "Ukjent typeforkortelse: «%c»"
 
 #: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "Åpner oppsettsfila %s"
-
-#: apt-pkg/contrib/configuration.cc
-#, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Syntaksfeil %s:%u: Blokka starter uten navn."
 
@@ -1543,11 +1538,6 @@ msgstr "Ugyldig overstyring %s linje %lu #1"
 
 #: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Opening %s"
-msgstr "Åpner %s"
-
-#: apt-pkg/sourcelist.cc
-#, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Feil på %u i kildelista %s (type)"
 
@@ -1791,6 +1781,13 @@ msgstr "Denne APT har kraften til en Superku."
 msgid "This APT helper has Super Meep Powers."
 msgstr ""
 
+#: apt-private/private-cmndline.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr ""
+"--force-yes er utdatert, bruk en av valgene som starter med --allow istedet."
+
 #: apt-private/private-depends.cc apt-private/private-show.cc
 #: cmdline/apt-mark.cc
 msgid "No packages found"
@@ -1812,13 +1809,6 @@ msgstr "Noen pakker ble ikke autentisert"
 msgid "Install these packages without verification?"
 msgstr "Installer disse pakkene uten verifikasjon?"
 
-#: apt-private/private-download.cc apt-private/private-install.cc
-msgid ""
-"--force-yes is deprecated, use one of the options starting with --allow "
-"instead."
-msgstr ""
-"--force-yes er utdatert, bruk en av valgene som starter med --allow istedet."
-
 #: apt-private/private-download.cc
 #, fuzzy
 msgid ""
@@ -2514,6 +2504,14 @@ msgstr "Pakken %s versjon %s har et uinnfridd avhengighetsforhold:\n"
 msgid "The update command takes no arguments"
 msgstr "Oppdaterings-kommandoen tar ingen argumenter"
 
+#. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
+msgid ""
+"Usage of %s should be preferred over embedding login information directly in "
+"the %s entry for '%s'"
+msgstr ""
+
 #: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
@@ -3461,6 +3459,11 @@ msgstr "Ødelagte hodedata"
 msgid "Connection failed"
 msgstr "Forbindelsen mislykkes"
 
+#: methods/basehttp.cc methods/curl.cc methods/ftp.cc methods/http.cc
+#, c-format
+msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
+msgstr ""
+
 #: methods/basehttp.cc
 #, c-format
 msgid ""
@@ -3831,6 +3834,12 @@ msgstr "Forbindelsen ble uventet stengt"
 msgid "Empty files can't be valid archives"
 msgstr "Tomme filer kan ikke være gyldige arkiver"
 
+#~ msgid "Opening configuration file %s"
+#~ msgstr "Åpner oppsettsfila %s"
+
+#~ msgid "Opening %s"
+#~ msgstr "Åpner %s"
+
 #~ msgid "Unmet dependencies. Try using --fix-broken."
 #~ msgstr "Uinnfridde avhengighetsforhold - Prøv «--fix-broken»."
 
diff --git a/po/ne.po b/po/ne.po
index 1ebc52452..0a9118b18 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-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+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"
@@ -705,11 +705,6 @@ msgstr "नचिनिएको टाइप संक्षिप्त रु
 
 #: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "कनफिगरेसन फाइल खोलिदैछ %s"
-
-#: apt-pkg/contrib/configuration.cc
-#, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "वाक्य संरचना त्रुटि %s:%u: बन्द कुनै नाम बिना सुरू हुन्छ ।"
 
@@ -1511,11 +1506,6 @@ msgstr "वैरुप्य गरिएको अधिलेखन  %s र�
 
 #: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Opening %s"
-msgstr "%s खोलिदैछ"
-
-#: apt-pkg/sourcelist.cc
-#, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "वैरुप्य लाइन %u स्रोत सूचिमा %s (प्रकार)"
 
@@ -1755,6 +1745,12 @@ msgstr "APT संग सुपर काउ शक्तिहरू छ ।"
 msgid "This APT helper has Super Meep Powers."
 msgstr ""
 
+#: apt-private/private-cmndline.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr ""
+
 #: apt-private/private-depends.cc apt-private/private-show.cc
 #: cmdline/apt-mark.cc
 msgid "No packages found"
@@ -1777,12 +1773,6 @@ msgstr "केही प्याकेजहरू प्रमाणीकर�
 msgid "Install these packages without verification?"
 msgstr "यी प्याकेजहरू रूजू बिना स्थापना गर्नुहुन्छ [y/N]? "
 
-#: apt-private/private-download.cc apt-private/private-install.cc
-msgid ""
-"--force-yes is deprecated, use one of the options starting with --allow "
-"instead."
-msgstr ""
-
 #: apt-private/private-download.cc
 #, fuzzy
 msgid ""
@@ -2451,6 +2441,14 @@ msgstr "प्याकेज %s संस्करण %s संग एउटा
 msgid "The update command takes no arguments"
 msgstr "अद्यावधिक आदेशले कुनै तर्कहरू लिदैन"
 
+#. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
+msgid ""
+"Usage of %s should be preferred over embedding login information directly in "
+"the %s entry for '%s'"
+msgstr ""
+
 #: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
@@ -3393,6 +3391,11 @@ msgstr "खराब हेडर डेटा"
 msgid "Connection failed"
 msgstr "जडान असफल भयो"
 
+#: methods/basehttp.cc methods/curl.cc methods/ftp.cc methods/http.cc
+#, c-format
+msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
+msgstr ""
+
 #: methods/basehttp.cc
 #, c-format
 msgid ""
@@ -3758,6 +3761,12 @@ msgstr "जडान असमायिक बन्द भयो"
 msgid "Empty files can't be valid archives"
 msgstr ""
 
+#~ msgid "Opening configuration file %s"
+#~ msgstr "कनफिगरेसन फाइल खोलिदैछ %s"
+
+#~ msgid "Opening %s"
+#~ msgstr "%s खोलिदैछ"
+
 #~ msgid "Unmet dependencies. Try using --fix-broken."
 #~ msgstr "नभेटिएका निर्भरताहरू । --fix-broken प्रयोग गरेर प्रयास गर्नुहोस् ।"
 
diff --git a/po/nl.po b/po/nl.po
index f17f4da63..06604de2e 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-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+0200\n"
 "PO-Revision-Date: 2017-01-19 17:32+0100\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -770,11 +770,6 @@ msgstr "Onbekende type-afkorting: '%c'"
 
 #: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "Configuratiebestand %s wordt geopend"
-
-#: apt-pkg/contrib/configuration.cc
-#, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Syntactische fout %s:%u: blok start zonder naam."
 
@@ -1623,11 +1618,6 @@ msgstr "Niet juist gevormde regel %u in %s-bestand %s (%s)"
 
 #: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Opening %s"
-msgstr "%s wordt geopend"
-
-#: apt-pkg/sourcelist.cc
-#, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Niet juist gevormde regel %u in bronlijst %s (type)"
 
@@ -1875,6 +1865,14 @@ msgstr "Deze APT heeft Super Koekracht."
 msgid "This APT helper has Super Meep Powers."
 msgstr "Deze APT-helper heeft Super Koekracht."
 
+#: apt-private/private-cmndline.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr ""
+"--force-yes is verouderd, gebruik in plaats daarvan een van de opties die "
+"met --allow begint."
+
 #: apt-private/private-depends.cc apt-private/private-show.cc
 #: cmdline/apt-mark.cc
 msgid "No packages found"
@@ -1897,14 +1895,6 @@ msgstr "Sommige pakketten konden niet geauthenticeerd worden"
 msgid "Install these packages without verification?"
 msgstr "Wilt u deze pakketten installeren zonder verificatie?"
 
-#: apt-private/private-download.cc apt-private/private-install.cc
-msgid ""
-"--force-yes is deprecated, use one of the options starting with --allow "
-"instead."
-msgstr ""
-"--force-yes is verouderd, gebruik in plaats daarvan een van de opties die "
-"met --allow begint."
-
 #: apt-private/private-download.cc
 msgid ""
 "There were unauthenticated packages and -y was used without --allow-"
@@ -2608,6 +2598,14 @@ msgstr "Pakket %s versie %s heeft een niet-voldane vereiste:\n"
 msgid "The update command takes no arguments"
 msgstr "De opdracht 'update' aanvaardt geen argumenten"
 
+#. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
+msgid ""
+"Usage of %s should be preferred over embedding login information directly in "
+"the %s entry for '%s'"
+msgstr ""
+
 #: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
@@ -3588,6 +3586,11 @@ msgstr "Foute koptekstdata"
 msgid "Connection failed"
 msgstr "Verbinding mislukt"
 
+#: methods/basehttp.cc methods/curl.cc methods/ftp.cc methods/http.cc
+#, c-format
+msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
+msgstr ""
+
 #: methods/basehttp.cc
 #, c-format
 msgid ""
@@ -3967,6 +3970,12 @@ msgstr "Verbinding werd voortijdig afgebroken"
 msgid "Empty files can't be valid archives"
 msgstr "Lege bestanden kunnen geen geldige archieven zijn"
 
+#~ msgid "Opening configuration file %s"
+#~ msgstr "Configuratiebestand %s wordt geopend"
+
+#~ msgid "Opening %s"
+#~ msgstr "%s wordt geopend"
+
 #~ msgid ""
 #~ "Unable to find expected entry '%s' in Release file (Wrong sources.list "
 #~ "entry or malformed file)"
diff --git a/po/nn.po b/po/nn.po
index 0519a3021..63a252234 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-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+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"
@@ -713,11 +713,6 @@ msgstr "Ukjend typeforkorting: �%c�"
 
 #: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "Opnar oppsettsfila %s"
-
-#: apt-pkg/contrib/configuration.cc
-#, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Syntaksfeil %s:%u: Blokka startar utan namn."
 
@@ -1520,11 +1515,6 @@ msgstr "Misforma overstyring %s linje %lu #1"
 
 #: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Opening %s"
-msgstr "Opnar %s"
-
-#: apt-pkg/sourcelist.cc
-#, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Misforma linje %u i kjeldelista %s (type)"
 
@@ -1765,6 +1755,12 @@ msgstr "APT har superku-krefter."
 msgid "This APT helper has Super Meep Powers."
 msgstr ""
 
+#: apt-private/private-cmndline.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr ""
+
 #: apt-private/private-depends.cc apt-private/private-show.cc
 #: cmdline/apt-mark.cc
 msgid "No packages found"
@@ -1786,12 +1782,6 @@ msgstr "Nokre pakkar kunne ikkje bli autentisert"
 msgid "Install these packages without verification?"
 msgstr "Installer desse pakkane utan verifikasjon?"
 
-#: apt-private/private-download.cc apt-private/private-install.cc
-msgid ""
-"--force-yes is deprecated, use one of the options starting with --allow "
-"instead."
-msgstr ""
-
 #: apt-private/private-download.cc
 #, fuzzy
 msgid ""
@@ -2465,6 +2455,14 @@ msgstr "Pakken %s versjon %s har eit krav som ikkje er oppfylt:\n"
 msgid "The update command takes no arguments"
 msgstr "Oppdateringskommandoen tek ingen argument"
 
+#. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
+msgid ""
+"Usage of %s should be preferred over embedding login information directly in "
+"the %s entry for '%s'"
+msgstr ""
+
 #: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
@@ -3406,6 +3404,11 @@ msgstr "�ydelagde hovuddata"
 msgid "Connection failed"
 msgstr "Sambandet mislukkast"
 
+#: methods/basehttp.cc methods/curl.cc methods/ftp.cc methods/http.cc
+#, c-format
+msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
+msgstr ""
+
 #: methods/basehttp.cc
 #, c-format
 msgid ""
@@ -3773,6 +3776,12 @@ msgstr "Sambandet vart uventa stengd"
 msgid "Empty files can't be valid archives"
 msgstr ""
 
+#~ msgid "Opening configuration file %s"
+#~ msgstr "Opnar oppsettsfila %s"
+
+#~ msgid "Opening %s"
+#~ msgstr "Opnar %s"
+
 #~ msgid "Unmet dependencies. Try using --fix-broken."
 #~ msgstr "Nokre krav er ikkje oppfylte. Pr�v med �--fix-broken�."
 
diff --git a/po/pl.po b/po/pl.po
index f8cc6bf7f..144582676 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-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+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"
@@ -732,11 +732,6 @@ msgstr "Nierozpoznany skrót typu: \"%c\""
 
 #: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "Otwieranie pliku konfiguracyjnego %s"
-
-#: apt-pkg/contrib/configuration.cc
-#, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Błąd składniowy %s:%u: Blok nie zaczyna się nazwą."
 
@@ -1577,11 +1572,6 @@ msgstr "Nieprawidłowa linia %llu #1 pliku override %s"
 
 #: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Opening %s"
-msgstr "Otwieranie %s"
-
-#: apt-pkg/sourcelist.cc
-#, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Nieprawidłowa linia %u w liście źródeł %s (typ)"
 
@@ -1824,6 +1814,12 @@ msgstr "Ten APT ma moce Super Krowy."
 msgid "This APT helper has Super Meep Powers."
 msgstr ""
 
+#: apt-private/private-cmndline.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr ""
+
 #: apt-private/private-depends.cc apt-private/private-show.cc
 #: cmdline/apt-mark.cc
 msgid "No packages found"
@@ -1845,12 +1841,6 @@ msgstr "Niektóre pakiety nie mogły zostać zweryfikowane"
 msgid "Install these packages without verification?"
 msgstr "Zainstalować te pakiety bez weryfikacji?"
 
-#: apt-private/private-download.cc apt-private/private-install.cc
-msgid ""
-"--force-yes is deprecated, use one of the options starting with --allow "
-"instead."
-msgstr ""
-
 #: apt-private/private-download.cc
 #, fuzzy
 msgid ""
@@ -2568,6 +2558,14 @@ msgstr "Pakiet %s w wersji %s ma niespełnione zależności:\n"
 msgid "The update command takes no arguments"
 msgstr "Polecenie update nie wymaga żadnych argumentów"
 
+#. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
+msgid ""
+"Usage of %s should be preferred over embedding login information directly in "
+"the %s entry for '%s'"
+msgstr ""
+
 #: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
@@ -3519,6 +3517,11 @@ msgstr "Błędne dane nagłówka"
 msgid "Connection failed"
 msgstr "Połączenie nie powiodło się"
 
+#: methods/basehttp.cc methods/curl.cc methods/ftp.cc methods/http.cc
+#, c-format
+msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
+msgstr ""
+
 #: methods/basehttp.cc
 #, c-format
 msgid ""
@@ -3890,6 +3893,12 @@ msgstr "Połączenie zostało przedwcześnie zamknięte"
 msgid "Empty files can't be valid archives"
 msgstr "Puste pliki nie mogą być prawidłowymi archiwami"
 
+#~ msgid "Opening configuration file %s"
+#~ msgstr "Otwieranie pliku konfiguracyjnego %s"
+
+#~ msgid "Opening %s"
+#~ msgstr "Otwieranie %s"
+
 #~ msgid ""
 #~ "Unable to find expected entry '%s' in Release file (Wrong sources.list "
 #~ "entry or malformed file)"
diff --git a/po/pt.po b/po/pt.po
index 85361a92d..69cacaff0 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-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+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"
@@ -732,11 +732,6 @@ msgstr "Abreviatura de tipo desconhecida: '%c'"
 
 #: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "A abrir o ficheiro de configuração %s"
-
-#: apt-pkg/contrib/configuration.cc
-#, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Erro de sintaxe %s:%u: O bloco começa sem nome."
 
@@ -1584,11 +1579,6 @@ msgstr "Override %s malformado linha %llu #1"
 
 #: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Opening %s"
-msgstr "A abrir %s"
-
-#: apt-pkg/sourcelist.cc
-#, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Linha mal formada %u na lista de fontes %s (tipo)"
 
@@ -1829,6 +1819,12 @@ msgstr "Este APT tem Poderes de Super Vaca."
 msgid "This APT helper has Super Meep Powers."
 msgstr ""
 
+#: apt-private/private-cmndline.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr ""
+
 #: apt-private/private-depends.cc apt-private/private-show.cc
 #: cmdline/apt-mark.cc
 msgid "No packages found"
@@ -1850,12 +1846,6 @@ msgstr "Alguns pacotes não puderam ser autenticados"
 msgid "Install these packages without verification?"
 msgstr "Instalar estes pacotes sem verificação?"
 
-#: apt-private/private-download.cc apt-private/private-install.cc
-msgid ""
-"--force-yes is deprecated, use one of the options starting with --allow "
-"instead."
-msgstr ""
-
 #: apt-private/private-download.cc
 #, fuzzy
 msgid ""
@@ -2550,6 +2540,14 @@ msgstr "O pacote %s versão %s tem uma dependência não satisfeita:\n"
 msgid "The update command takes no arguments"
 msgstr "O comando update não leva argumentos"
 
+#. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
+msgid ""
+"Usage of %s should be preferred over embedding login information directly in "
+"the %s entry for '%s'"
+msgstr ""
+
 #: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
@@ -3498,6 +3496,11 @@ msgstr "Dados de cabeçalho errados"
 msgid "Connection failed"
 msgstr "A ligação falhou"
 
+#: methods/basehttp.cc methods/curl.cc methods/ftp.cc methods/http.cc
+#, c-format
+msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
+msgstr ""
+
 #: methods/basehttp.cc
 #, c-format
 msgid ""
@@ -3868,6 +3871,12 @@ msgstr "Ligação encerrada prematuramente"
 msgid "Empty files can't be valid archives"
 msgstr "Ficheiros vazios não podem ser arquivos válidos"
 
+#~ msgid "Opening configuration file %s"
+#~ msgstr "A abrir o ficheiro de configuração %s"
+
+#~ msgid "Opening %s"
+#~ msgstr "A abrir %s"
+
 #~ msgid ""
 #~ "Unable to find expected entry '%s' in Release file (Wrong sources.list "
 #~ "entry or malformed file)"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 333db8a37..f47419b6a 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-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+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."
@@ -715,11 +715,6 @@ msgstr "Abreviação de tipo desconhecida: '%c'"
 
 #: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "Abrindo arquivo de configuração %s"
-
-#: apt-pkg/contrib/configuration.cc
-#, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Erro de sintaxe %s:%u: Bloco inicia sem nome."
 
@@ -1528,11 +1523,6 @@ msgstr "Override malformado %s linha %lu #1"
 
 #: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Opening %s"
-msgstr "Abrindo %s"
-
-#: apt-pkg/sourcelist.cc
-#, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Linha mal formada %u no arquivo de fontes %s (tipo)"
 
@@ -1772,6 +1762,12 @@ msgstr "Este APT tem Poderes de Super Vaca."
 msgid "This APT helper has Super Meep Powers."
 msgstr ""
 
+#: apt-private/private-cmndline.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr ""
+
 #: apt-private/private-depends.cc apt-private/private-show.cc
 #: cmdline/apt-mark.cc
 msgid "No packages found"
@@ -1793,12 +1789,6 @@ msgstr "Alguns pacotes não puderam ser autenticados"
 msgid "Install these packages without verification?"
 msgstr "Instalar estes pacotes sem verificação?"
 
-#: apt-private/private-download.cc apt-private/private-install.cc
-msgid ""
-"--force-yes is deprecated, use one of the options starting with --allow "
-"instead."
-msgstr ""
-
 #: apt-private/private-download.cc
 #, fuzzy
 msgid ""
@@ -2482,6 +2472,14 @@ msgstr "O pacote %s versão %s tem uma dependência desencontrada:\n"
 msgid "The update command takes no arguments"
 msgstr "O comando update não leva argumentos"
 
+#. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
+msgid ""
+"Usage of %s should be preferred over embedding login information directly in "
+"the %s entry for '%s'"
+msgstr ""
+
 #: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
@@ -3433,6 +3431,11 @@ msgstr "Dados de cabeçalho ruins"
 msgid "Connection failed"
 msgstr "Conexão falhou"
 
+#: methods/basehttp.cc methods/curl.cc methods/ftp.cc methods/http.cc
+#, c-format
+msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
+msgstr ""
+
 #: methods/basehttp.cc
 #, c-format
 msgid ""
@@ -3804,6 +3807,12 @@ msgstr "Conexão encerrada prematuramente"
 msgid "Empty files can't be valid archives"
 msgstr ""
 
+#~ msgid "Opening configuration file %s"
+#~ msgstr "Abrindo arquivo de configuração %s"
+
+#~ msgid "Opening %s"
+#~ msgstr "Abrindo %s"
+
 #~ msgid "Unmet dependencies. Try using --fix-broken."
 #~ msgstr "Dependências desencontradas. Tente usar --fix-broken."
 
diff --git a/po/ro.po b/po/ro.po
index 6ca272548..6d2245e4b 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-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+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"
@@ -719,11 +719,6 @@ msgstr "Abreviere de tip nerecunoscut: „%c”"
 
 #: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "Se deschide fișierul de configurare %s"
-
-#: apt-pkg/contrib/configuration.cc
-#, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Eroare de sintaxă %s:%u: Blocul începe fără nume"
 
@@ -1531,11 +1526,6 @@ msgstr "Înlocuire greșită %s linia %lu #1"
 
 #: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Opening %s"
-msgstr "Deschidere %s"
-
-#: apt-pkg/sourcelist.cc
-#, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Linie greșită %u în lista sursă %s (tip)"
 
@@ -1776,6 +1766,12 @@ msgstr "Acest APT are puterile unei Super Vaci."
 msgid "This APT helper has Super Meep Powers."
 msgstr ""
 
+#: apt-private/private-cmndline.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr ""
+
 #: apt-private/private-depends.cc apt-private/private-show.cc
 #: cmdline/apt-mark.cc
 msgid "No packages found"
@@ -1797,12 +1793,6 @@ msgstr "Unele pachete n-au putut fi autentificate"
 msgid "Install these packages without verification?"
 msgstr "Instalați aceste pachete fără verificare?"
 
-#: apt-private/private-download.cc apt-private/private-install.cc
-msgid ""
-"--force-yes is deprecated, use one of the options starting with --allow "
-"instead."
-msgstr ""
-
 #: apt-private/private-download.cc
 #, fuzzy
 msgid ""
@@ -2490,6 +2480,14 @@ msgstr "Pachetul %s versiunea %s are o dependență neîndeplinită:\n"
 msgid "The update command takes no arguments"
 msgstr "Comanda de actualizare nu are argumente"
 
+#. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
+msgid ""
+"Usage of %s should be preferred over embedding login information directly in "
+"the %s entry for '%s'"
+msgstr ""
+
 #: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
@@ -3442,6 +3440,11 @@ msgstr "Antet de date necorespunzător"
 msgid "Connection failed"
 msgstr "Conectare eșuată"
 
+#: methods/basehttp.cc methods/curl.cc methods/ftp.cc methods/http.cc
+#, c-format
+msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
+msgstr ""
+
 #: methods/basehttp.cc
 #, c-format
 msgid ""
@@ -3817,6 +3820,12 @@ msgstr "Conexiune închisă prematur"
 msgid "Empty files can't be valid archives"
 msgstr ""
 
+#~ msgid "Opening configuration file %s"
+#~ msgstr "Se deschide fișierul de configurare %s"
+
+#~ msgid "Opening %s"
+#~ msgstr "Deschidere %s"
+
 #~ msgid "Unmet dependencies. Try using --fix-broken."
 #~ msgstr "Dependențe neîndeplinite. Încercați să folosiți --fix-broken."
 
diff --git a/po/ru.po b/po/ru.po
index 2688c495f..da1093ac9 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-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+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"
@@ -762,11 +762,6 @@ msgstr "Неизвестная аббревиатура типа: «%c»"
 
 #: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "Открытие файла настройки %s"
-
-#: apt-pkg/contrib/configuration.cc
-#, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Синтаксическая ошибка %s:%u: в начале блока нет имени."
 
@@ -1617,11 +1612,6 @@ msgstr "Искажённая запись %u в %s из файла %s (%s)"
 
 #: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Opening %s"
-msgstr "Открытие %s"
-
-#: apt-pkg/sourcelist.cc
-#, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Искажённая строка %u в списке источников %s (тип)"
 
@@ -1866,6 +1856,14 @@ msgstr "В APT есть коровья СУПЕРСИЛА."
 msgid "This APT helper has Super Meep Powers."
 msgstr "В этой программе есть Super Meep Powers."
 
+#: apt-private/private-cmndline.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr ""
+"--force-yes устарел, вместо него используйте параметры, начинающиеся с --"
+"allow."
+
 #: apt-private/private-depends.cc apt-private/private-show.cc
 #: cmdline/apt-mark.cc
 msgid "No packages found"
@@ -1887,14 +1885,6 @@ msgstr "Некоторые пакеты невозможно аутентифи�
 msgid "Install these packages without verification?"
 msgstr "Установить эти пакеты без проверки?"
 
-#: apt-private/private-download.cc apt-private/private-install.cc
-msgid ""
-"--force-yes is deprecated, use one of the options starting with --allow "
-"instead."
-msgstr ""
-"--force-yes устарел, вместо него используйте параметры, начинающиеся с --"
-"allow."
-
 #: apt-private/private-download.cc
 msgid ""
 "There were unauthenticated packages and -y was used without --allow-"
@@ -2598,6 +2588,14 @@ msgstr "Пакет %s версии %s имеет неудовлетворённ�
 msgid "The update command takes no arguments"
 msgstr "Команде update не нужны аргументы"
 
+#. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
+msgid ""
+"Usage of %s should be preferred over embedding login information directly in "
+"the %s entry for '%s'"
+msgstr ""
+
 #: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
@@ -3567,6 +3565,11 @@ msgstr "Неверный заголовок данных"
 msgid "Connection failed"
 msgstr "Соединение разорвано"
 
+#: methods/basehttp.cc methods/curl.cc methods/ftp.cc methods/http.cc
+#, c-format
+msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
+msgstr ""
+
 #: methods/basehttp.cc
 #, c-format
 msgid ""
@@ -3944,6 +3947,12 @@ msgstr "Соединение закрыто преждевременно"
 msgid "Empty files can't be valid archives"
 msgstr "Пустые файлы не могут быть допустимыми архивами"
 
+#~ msgid "Opening configuration file %s"
+#~ msgstr "Открытие файла настройки %s"
+
+#~ msgid "Opening %s"
+#~ msgstr "Открытие %s"
+
 #~ msgid ""
 #~ "Unable to find expected entry '%s' in Release file (Wrong sources.list "
 #~ "entry or malformed file)"
diff --git a/po/sk.po b/po/sk.po
index 22cf62ce1..f76c185ac 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-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+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"
@@ -721,11 +721,6 @@ msgstr "Nerozpoznaná skratka typu: „%c“"
 
 #: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "Otvára sa konfiguračný súbor %s"
-
-#: apt-pkg/contrib/configuration.cc
-#, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Syntaktická chyba %s:%u: Blok začína bez názvu."
 
@@ -1550,11 +1545,6 @@ msgstr "Skomolený „override“ %s riadok %llu #1"
 
 #: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Opening %s"
-msgstr "Otvára sa %s"
-
-#: apt-pkg/sourcelist.cc
-#, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Skomolený riadok %u v zozname zdrojov %s (typ)"
 
@@ -1793,6 +1783,12 @@ msgstr "Tento APT má schopnosti posvätnej kravy."
 msgid "This APT helper has Super Meep Powers."
 msgstr ""
 
+#: apt-private/private-cmndline.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr ""
+
 #: apt-private/private-depends.cc apt-private/private-show.cc
 #: cmdline/apt-mark.cc
 msgid "No packages found"
@@ -1814,12 +1810,6 @@ msgstr "Nedala sa zistiť vierohodnosť niektorých balíkov"
 msgid "Install these packages without verification?"
 msgstr "Nainštalovať tieto nekontrolované balíky?"
 
-#: apt-private/private-download.cc apt-private/private-install.cc
-msgid ""
-"--force-yes is deprecated, use one of the options starting with --allow "
-"instead."
-msgstr ""
-
 #: apt-private/private-download.cc
 #, fuzzy
 msgid ""
@@ -2521,6 +2511,14 @@ msgstr "Balík %s verzie %s má nesplnené závislosti:\n"
 msgid "The update command takes no arguments"
 msgstr "Príkaz update neprijíma žiadne argumenty"
 
+#. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
+msgid ""
+"Usage of %s should be preferred over embedding login information directly in "
+"the %s entry for '%s'"
+msgstr ""
+
 #: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
@@ -3462,6 +3460,11 @@ msgstr "Zlé dátové záhlavie"
 msgid "Connection failed"
 msgstr "Spojenie zlyhalo"
 
+#: methods/basehttp.cc methods/curl.cc methods/ftp.cc methods/http.cc
+#, c-format
+msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
+msgstr ""
+
 #: methods/basehttp.cc
 #, c-format
 msgid ""
@@ -3829,6 +3832,12 @@ msgstr "Spojenie bolo predčasne ukončené"
 msgid "Empty files can't be valid archives"
 msgstr "Prázdne súbory nemôžu byť platné archívy"
 
+#~ msgid "Opening configuration file %s"
+#~ msgstr "Otvára sa konfiguračný súbor %s"
+
+#~ msgid "Opening %s"
+#~ msgstr "Otvára sa %s"
+
 #~ msgid ""
 #~ "Unable to find expected entry '%s' in Release file (Wrong sources.list "
 #~ "entry or malformed file)"
diff --git a/po/sl.po b/po/sl.po
index 8d4396182..5a86d50c9 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-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+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"
@@ -720,11 +720,6 @@ msgstr "Neprepoznana vrsta okrajšave: '%c'"
 
 #: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "Odpiranje nastavitvene datoteke %s"
-
-#: apt-pkg/contrib/configuration.cc
-#, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Skladenjska napaka %s:%u: Blok se začne brez imena."
 
@@ -1550,11 +1545,6 @@ msgstr "Slabo oblikovan prepis %s v vrstici %llu št. 1"
 
 #: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Opening %s"
-msgstr "Odpiranje %s"
-
-#: apt-pkg/sourcelist.cc
-#, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Slabo oblikovana vrstica %u v seznamu virov %s (vrsta)"
 
@@ -1794,6 +1784,12 @@ msgstr "Ta APT ima moči super krav."
 msgid "This APT helper has Super Meep Powers."
 msgstr ""
 
+#: apt-private/private-cmndline.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr ""
+
 #: apt-private/private-depends.cc apt-private/private-show.cc
 #: cmdline/apt-mark.cc
 msgid "No packages found"
@@ -1815,12 +1811,6 @@ msgstr "Nekaterih paketkov bi bilo mogoče overiti"
 msgid "Install these packages without verification?"
 msgstr "Ali želite te pakete namestiti brez preverjanja?"
 
-#: apt-private/private-download.cc apt-private/private-install.cc
-msgid ""
-"--force-yes is deprecated, use one of the options starting with --allow "
-"instead."
-msgstr ""
-
 #: apt-private/private-download.cc
 #, fuzzy
 msgid ""
@@ -2526,6 +2516,14 @@ msgstr "Paket %s različica %s ima nerešene odvisnosti:\n"
 msgid "The update command takes no arguments"
 msgstr "Ukaz update ne sprejema argumentov"
 
+#. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
+msgid ""
+"Usage of %s should be preferred over embedding login information directly in "
+"the %s entry for '%s'"
+msgstr ""
+
 #: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
@@ -3469,6 +3467,11 @@ msgstr "Napačni podatki glave"
 msgid "Connection failed"
 msgstr "Povezava ni uspela"
 
+#: methods/basehttp.cc methods/curl.cc methods/ftp.cc methods/http.cc
+#, c-format
+msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
+msgstr ""
+
 #: methods/basehttp.cc
 #, c-format
 msgid ""
@@ -3836,6 +3839,12 @@ msgstr "Povezava se je prezgodaj zaprla"
 msgid "Empty files can't be valid archives"
 msgstr "Prazne datoteke ne morejo biti veljavni arhivi"
 
+#~ msgid "Opening configuration file %s"
+#~ msgstr "Odpiranje nastavitvene datoteke %s"
+
+#~ msgid "Opening %s"
+#~ msgstr "Odpiranje %s"
+
 #~ msgid ""
 #~ "Unable to find expected entry '%s' in Release file (Wrong sources.list "
 #~ "entry or malformed file)"
diff --git a/po/sv.po b/po/sv.po
index fd2fb3fa7..932e6d9ed 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-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+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"
@@ -735,11 +735,6 @@ msgstr "Okänd typförkortning: ”%c”"
 
 #: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "Öppnar konfigurationsfilen %s"
-
-#: apt-pkg/contrib/configuration.cc
-#, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Syntaxfel %s:%u: Block börjar utan namn."
 
@@ -1572,11 +1567,6 @@ msgstr "Felaktig åsidosättning %s rad %llu (%s)"
 
 #: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Opening %s"
-msgstr "Öppnar %s"
-
-#: apt-pkg/sourcelist.cc
-#, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Rad %u i källistan %s har fel format (typ)"
 
@@ -1815,6 +1805,12 @@ msgstr "Denna APT har Speciella Ko-Krafter."
 msgid "This APT helper has Super Meep Powers."
 msgstr "Denna APT-hjälpare har speciella Meep-krafter."
 
+#: apt-private/private-cmndline.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr ""
+
 #: apt-private/private-depends.cc apt-private/private-show.cc
 #: cmdline/apt-mark.cc
 msgid "No packages found"
@@ -1836,12 +1832,6 @@ msgstr "Några av paketen kunde inte autentiseras"
 msgid "Install these packages without verification?"
 msgstr "Installera dessa paket utan verifiering?"
 
-#: apt-private/private-download.cc apt-private/private-install.cc
-msgid ""
-"--force-yes is deprecated, use one of the options starting with --allow "
-"instead."
-msgstr ""
-
 #: apt-private/private-download.cc
 #, fuzzy
 msgid ""
@@ -2538,6 +2528,14 @@ msgstr ""
 msgid "The update command takes no arguments"
 msgstr "Uppdateringskommandot tar inga argument"
 
+#. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
+msgid ""
+"Usage of %s should be preferred over embedding login information directly in "
+"the %s entry for '%s'"
+msgstr ""
+
 #: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
@@ -3492,6 +3490,11 @@ msgstr "Felaktiga data i huvud"
 msgid "Connection failed"
 msgstr "Anslutningen misslyckades"
 
+#: methods/basehttp.cc methods/curl.cc methods/ftp.cc methods/http.cc
+#, c-format
+msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
+msgstr ""
+
 #: methods/basehttp.cc
 #, c-format
 msgid ""
@@ -3869,6 +3872,12 @@ msgstr "Anslutningen stängdes i förtid"
 msgid "Empty files can't be valid archives"
 msgstr "Tomma filer kan inte vara giltiga arkiv"
 
+#~ msgid "Opening configuration file %s"
+#~ msgstr "Öppnar konfigurationsfilen %s"
+
+#~ msgid "Opening %s"
+#~ msgstr "Öppnar %s"
+
 #~ msgid ""
 #~ "Unable to find expected entry '%s' in Release file (Wrong sources.list "
 #~ "entry or malformed file)"
diff --git a/po/th.po b/po/th.po
index 5aa4e6e3f..786d8ac15 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-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+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"
@@ -710,11 +710,6 @@ msgstr "พบตัวย่อของชนิดที่ข้อมูล
 
 #: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "ขณะเปิดแฟ้มค่าตั้ง %s"
-
-#: apt-pkg/contrib/configuration.cc
-#, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "ไวยากรณ์ผิดพลาด %s:%u: เริ่มบล็อคโดยไม่มีชื่อ"
 
@@ -1523,11 +1518,6 @@ msgstr "แฟ้ม override %s ผิดรูปแบบที่บรร�
 
 #: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Opening %s"
-msgstr "กำลังเปิด %s"
-
-#: apt-pkg/sourcelist.cc
-#, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ชนิด)"
 
@@ -1762,6 +1752,12 @@ msgstr "APT นี้มีพลังของ Super Cow"
 msgid "This APT helper has Super Meep Powers."
 msgstr "โปรแกรมช่วยเหลือของ APT นี้มีพลัง Super Meep"
 
+#: apt-private/private-cmndline.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr ""
+
 #: apt-private/private-depends.cc apt-private/private-show.cc
 #: cmdline/apt-mark.cc
 msgid "No packages found"
@@ -1783,12 +1779,6 @@ msgstr "มีบางแพกเกจไม่สามารถยืนย
 msgid "Install these packages without verification?"
 msgstr "จะติดตั้งแพกเกจเหล่านี้โดยไม่ตรวจสอบหรือไม่?"
 
-#: apt-private/private-download.cc apt-private/private-install.cc
-msgid ""
-"--force-yes is deprecated, use one of the options starting with --allow "
-"instead."
-msgstr ""
-
 #: apt-private/private-download.cc
 #, fuzzy
 msgid ""
@@ -2456,6 +2446,14 @@ msgstr "แพกเกจ %s รุ่น %s ขาดแพกเกจที�
 msgid "The update command takes no arguments"
 msgstr "คำสั่ง update ไม่รับอาร์กิวเมนต์เพิ่ม"
 
+#. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
+msgid ""
+"Usage of %s should be preferred over embedding login information directly in "
+"the %s entry for '%s'"
+msgstr ""
+
 #: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
@@ -3387,6 +3385,11 @@ msgstr "ข้อมูลส่วนหัวผิดพลาด"
 msgid "Connection failed"
 msgstr "เชื่อมต่อไม่สำเร็จ"
 
+#: methods/basehttp.cc methods/curl.cc methods/ftp.cc methods/http.cc
+#, c-format
+msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
+msgstr ""
+
 #: methods/basehttp.cc
 #, c-format
 msgid ""
@@ -3750,6 +3753,12 @@ msgstr "การเชื่อมต่อถูกปิดก่อนเว
 msgid "Empty files can't be valid archives"
 msgstr "แฟ้มว่างเปล่าไม่สามารถเป็นแฟ้มจัดเก็บที่ใช้การได้"
 
+#~ msgid "Opening configuration file %s"
+#~ msgstr "ขณะเปิดแฟ้มค่าตั้ง %s"
+
+#~ msgid "Opening %s"
+#~ msgstr "กำลังเปิด %s"
+
 #~ msgid ""
 #~ "Unable to find expected entry '%s' in Release file (Wrong sources.list "
 #~ "entry or malformed file)"
diff --git a/po/tl.po b/po/tl.po
index 6da71cd3d..c418e4503 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-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+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"
@@ -720,11 +720,6 @@ msgstr "Hindi kilalang katagang uri: '%c'"
 
 #: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "Binubuksan ang talaksang pagsasaayos %s"
-
-#: apt-pkg/contrib/configuration.cc
-#, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Syntax error %s:%u: Nag-umpisa ang block na walang pangalan."
 
@@ -1535,11 +1530,6 @@ msgstr "Maling anyo ng override %s linya %lu #1"
 
 #: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Opening %s"
-msgstr "Binubuksan %s"
-
-#: apt-pkg/sourcelist.cc
-#, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (uri)"
 
@@ -1780,6 +1770,12 @@ msgstr "Ang APT na ito ay may Kapangyarihan Super Kalabaw."
 msgid "This APT helper has Super Meep Powers."
 msgstr ""
 
+#: apt-private/private-cmndline.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr ""
+
 #: apt-private/private-depends.cc apt-private/private-show.cc
 #: cmdline/apt-mark.cc
 msgid "No packages found"
@@ -1803,12 +1799,6 @@ msgstr "May mga paketeng hindi matiyak ang pagka-awtentiko"
 msgid "Install these packages without verification?"
 msgstr "Iluklok ang mga paketeng ito na walang beripikasyon?"
 
-#: apt-private/private-download.cc apt-private/private-install.cc
-msgid ""
-"--force-yes is deprecated, use one of the options starting with --allow "
-"instead."
-msgstr ""
-
 #: apt-private/private-download.cc
 #, fuzzy
 msgid ""
@@ -2482,6 +2472,14 @@ msgstr "Paketeng %s bersyon %s ay may kulang na dep:\n"
 msgid "The update command takes no arguments"
 msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento"
 
+#. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
+msgid ""
+"Usage of %s should be preferred over embedding login information directly in "
+"the %s entry for '%s'"
+msgstr ""
+
 #: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
@@ -3427,6 +3425,11 @@ msgstr "Maling datos sa panimula"
 msgid "Connection failed"
 msgstr "Bigo ang koneksyon"
 
+#: methods/basehttp.cc methods/curl.cc methods/ftp.cc methods/http.cc
+#, c-format
+msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
+msgstr ""
+
 #: methods/basehttp.cc
 #, c-format
 msgid ""
@@ -3797,6 +3800,12 @@ msgstr "Nagsara ng maaga ang koneksyon"
 msgid "Empty files can't be valid archives"
 msgstr ""
 
+#~ msgid "Opening configuration file %s"
+#~ msgstr "Binubuksan ang talaksang pagsasaayos %s"
+
+#~ msgid "Opening %s"
+#~ msgstr "Binubuksan %s"
+
 #~ msgid "Unmet dependencies. Try using --fix-broken."
 #~ msgstr ""
 #~ "May mga kulang na dependensiya. Subukan niyong gamitin ang --fix-broken."
diff --git a/po/tr.po b/po/tr.po
index 80c35765a..29e2261e6 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-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+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"
@@ -757,11 +757,6 @@ msgstr "Tanınamayan tür kısaltması: '%c'"
 
 #: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "Yapılandırma dosyası (%s) açılıyor"
-
-#: apt-pkg/contrib/configuration.cc
-#, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Söz dizimi hatası %s:%u: Blok ad olmadan başlıyor."
 
@@ -1589,11 +1584,6 @@ msgstr "Hatalı girdi satır %u %s dosya %s (%s)"
 
 #: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Opening %s"
-msgstr "%s Açılıyor"
-
-#: apt-pkg/sourcelist.cc
-#, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Kaynak listesinin (%2$s) %1$u numaralı satırı hatalı (tür)"
 
@@ -1841,6 +1831,14 @@ msgstr "Bu APT'nin Süper İnek Güçleri vardır."
 msgid "This APT helper has Super Meep Powers."
 msgstr "Bu APT yardımcısının Süper Meep Güçleri var."
 
+#: apt-private/private-cmndline.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr ""
+"--force-yes seçeneği kullanımdan kaldırılmıştır, bunun yerine --allow ile "
+"başlayan seçeneklerden birini kullanabilirsiniz."
+
 #: apt-private/private-depends.cc apt-private/private-show.cc
 #: cmdline/apt-mark.cc
 msgid "No packages found"
@@ -1862,14 +1860,6 @@ msgstr "Bazı paketlerin aslına uygunluğu doğrulanamadı"
 msgid "Install these packages without verification?"
 msgstr "Paketler doğrulanmadan kurulsun mu?"
 
-#: apt-private/private-download.cc apt-private/private-install.cc
-msgid ""
-"--force-yes is deprecated, use one of the options starting with --allow "
-"instead."
-msgstr ""
-"--force-yes seçeneği kullanımdan kaldırılmıştır, bunun yerine --allow ile "
-"başlayan seçeneklerden birini kullanabilirsiniz."
-
 #: apt-private/private-download.cc
 msgid ""
 "There were unauthenticated packages and -y was used without --allow-"
@@ -2567,6 +2557,14 @@ msgstr "%s paketinin (sürüm %s) karşılanamayan bir bağımlılığı var:\n"
 msgid "The update command takes no arguments"
 msgstr "'update' komutu argüman almaz"
 
+#. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
+msgid ""
+"Usage of %s should be preferred over embedding login information directly in "
+"the %s entry for '%s'"
+msgstr ""
+
 #: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
@@ -3529,6 +3527,11 @@ msgstr "Kötü başlık verisi"
 msgid "Connection failed"
 msgstr "Bağlantı başarısız"
 
+#: methods/basehttp.cc methods/curl.cc methods/ftp.cc methods/http.cc
+#, c-format
+msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
+msgstr ""
+
 #: methods/basehttp.cc
 #, c-format
 msgid ""
@@ -3897,6 +3900,12 @@ msgstr "Bağlantı vaktinden önce kapandı"
 msgid "Empty files can't be valid archives"
 msgstr "Boş dosyalar geçerli birer arşiv dosyası olamazlar"
 
+#~ msgid "Opening configuration file %s"
+#~ msgstr "Yapılandırma dosyası (%s) açılıyor"
+
+#~ msgid "Opening %s"
+#~ msgstr "%s Açılıyor"
+
 #~ msgid ""
 #~ "Unable to find expected entry '%s' in Release file (Wrong sources.list "
 #~ "entry or malformed file)"
diff --git a/po/uk.po b/po/uk.po
index 0291ed5fb..3cb482096 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-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+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"
@@ -732,11 +732,6 @@ msgstr "Нерозпізнаваний тип абревіатури: '%c'"
 
 #: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "Відкривається конфігураційний файл %s"
-
-#: apt-pkg/contrib/configuration.cc
-#, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Синтаксична помилка %s:%u: Блок починається без назви."
 
@@ -1581,11 +1576,6 @@ msgstr "Спотворений запис про перепризначення
 
 #: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Opening %s"
-msgstr "Відкриття %s"
-
-#: apt-pkg/sourcelist.cc
-#, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Спотворений рядок %u у переліку джерел %s (тип)"
 
@@ -1828,6 +1818,12 @@ msgstr "Цей APT має Супер-Коров'ячу Силу."
 msgid "This APT helper has Super Meep Powers."
 msgstr ""
 
+#: apt-private/private-cmndline.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr ""
+
 #: apt-private/private-depends.cc apt-private/private-show.cc
 #: cmdline/apt-mark.cc
 msgid "No packages found"
@@ -1849,12 +1845,6 @@ msgstr "Деякі пакунки неможливо автентифікува�
 msgid "Install these packages without verification?"
 msgstr "Встановити ці пакунки без перевірки?"
 
-#: apt-private/private-download.cc apt-private/private-install.cc
-msgid ""
-"--force-yes is deprecated, use one of the options starting with --allow "
-"instead."
-msgstr ""
-
 #: apt-private/private-download.cc
 #, fuzzy
 msgid ""
@@ -2557,6 +2547,14 @@ msgstr "Пакунок %s версії %s має незадоволену зал
 msgid "The update command takes no arguments"
 msgstr "Команді update не потрібні аргументи"
 
+#. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
+msgid ""
+"Usage of %s should be preferred over embedding login information directly in "
+"the %s entry for '%s'"
+msgstr ""
+
 #: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
@@ -3520,6 +3518,11 @@ msgstr "Погана заголовкова інформація"
 msgid "Connection failed"
 msgstr "З'єднання не вдалося"
 
+#: methods/basehttp.cc methods/curl.cc methods/ftp.cc methods/http.cc
+#, c-format
+msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
+msgstr ""
+
 #: methods/basehttp.cc
 #, c-format
 msgid ""
@@ -3891,6 +3894,12 @@ msgstr "З'єднання завершено передчасно"
 msgid "Empty files can't be valid archives"
 msgstr "Пусті файли не можуть бути правильними архівами"
 
+#~ msgid "Opening configuration file %s"
+#~ msgstr "Відкривається конфігураційний файл %s"
+
+#~ msgid "Opening %s"
+#~ msgstr "Відкриття %s"
+
 #~ msgid ""
 #~ "Unable to find expected entry '%s' in Release file (Wrong sources.list "
 #~ "entry or malformed file)"
diff --git a/po/vi.po b/po/vi.po
index 7d7612118..620f8fa03 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-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+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"
@@ -725,11 +725,6 @@ msgstr "Không chấp nhận kiểu viết tắt: “%c”"
 
 #: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "Đang mở tập tin cấu hình %s..."
-
-#: apt-pkg/contrib/configuration.cc
-#, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Gặp lỗi cú pháp %s:%u: Khối bắt đầu không có tên."
 
@@ -1563,11 +1558,6 @@ msgstr "Sai “override” %s dòng %llu (%s)"
 
 #: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Opening %s"
-msgstr "Đang mở %s"
-
-#: apt-pkg/sourcelist.cc
-#, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Gặp dòng sai dạng %u trong danh sách nguồn %s (kiểu)."
 
@@ -1806,6 +1796,12 @@ msgstr "Trình APT này có năng lực của siêu bò."
 msgid "This APT helper has Super Meep Powers."
 msgstr "Lệnh trợ giúp APT này có Sức Mạnh của Siêu “Meep”."
 
+#: apt-private/private-cmndline.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr ""
+
 #: apt-private/private-depends.cc apt-private/private-show.cc
 #: cmdline/apt-mark.cc
 msgid "No packages found"
@@ -1827,12 +1823,6 @@ msgstr "Một số gói không thể được xác thực"
 msgid "Install these packages without verification?"
 msgstr "Cài đặt những gói này mà không cần thẩm tra?"
 
-#: apt-private/private-download.cc apt-private/private-install.cc
-msgid ""
-"--force-yes is deprecated, use one of the options starting with --allow "
-"instead."
-msgstr ""
-
 #: apt-private/private-download.cc
 #, fuzzy
 msgid ""
@@ -2513,6 +2503,14 @@ msgstr "Gói %s phiên bản %s có phần phụ thuộc chưa thỏa mãn:\n"
 msgid "The update command takes no arguments"
 msgstr "Lệnh cập nhật không chấp nhận đối số"
 
+#. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
+msgid ""
+"Usage of %s should be preferred over embedding login information directly in "
+"the %s entry for '%s'"
+msgstr ""
+
 #: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
@@ -3491,6 +3489,11 @@ msgstr "Dữ liệu phần đầu sai"
 msgid "Connection failed"
 msgstr "Kết nối bị lỗi"
 
+#: methods/basehttp.cc methods/curl.cc methods/ftp.cc methods/http.cc
+#, c-format
+msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
+msgstr ""
+
 #: methods/basehttp.cc
 #, c-format
 msgid ""
@@ -3860,6 +3863,12 @@ msgstr "Kết nối bị đóng bất ngờ"
 msgid "Empty files can't be valid archives"
 msgstr "Các tập tin trống rỗng không phải là kho lưu hợp lệ"
 
+#~ msgid "Opening configuration file %s"
+#~ msgstr "Đang mở tập tin cấu hình %s..."
+
+#~ msgid "Opening %s"
+#~ msgstr "Đang mở %s"
+
 #~ msgid ""
 #~ "Unable to find expected entry '%s' in Release file (Wrong sources.list "
 #~ "entry or malformed file)"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ed5bbbdd8..4a68c1643 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-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+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"
@@ -299,8 +299,9 @@ msgstr "GPG 错误：%s: %s"
 msgid ""
 "Skipping acquire of configured file '%s' as repository '%s' doesn't have the "
 "component '%s' (component misspelt in sources.list?)"
-msgstr "鉴于仓库 '%2$s' 不含有 '%3$s' 组件，跳过配置文件 '%1$s' 的获取。"
-"(sources.list 中的组件名称是否拼写错误？)"
+msgstr ""
+"鉴于仓库 '%2$s' 不含有 '%3$s' 组件，跳过配置文件 '%1$s' 的获取。(sources."
+"list 中的组件名称是否拼写错误？)"
 
 #: apt-pkg/acquire-item.cc
 #, c-format
@@ -314,8 +315,9 @@ msgstr "鉴于仓库 '%2$s' 不支持 '%3$s' 体系结构，跳过配置文件 '
 msgid ""
 "Skipping acquire of configured file '%s' as repository '%s' does not seem to "
 "provide it (sources.list entry misspelt?)"
-msgstr "鉴于仓库 '%2$s' 不提供配置文件 '%1$s' ，跳过其获取过程。"
-"(sources.list 中是否有拼写错误？)"
+msgstr ""
+"鉴于仓库 '%2$s' 不提供配置文件 '%1$s' ，跳过其获取过程。(sources.list 中是否"
+"有拼写错误？)"
 
 #: apt-pkg/acquire-item.cc
 #, c-format
@@ -363,8 +365,8 @@ msgstr "更多有关细节可以阅览在线发行注记：%s"
 msgid ""
 "This must be accepted explicitly before updates for this repository can be "
 "applied. See %s manpage for details."
-msgstr "为了让这个仓库能够应用，这必须在更新之前显式接受。更多细节请参阅"
-" %s 手册。"
+msgstr ""
+"为了让这个仓库能够应用，这必须在更新之前显式接受。更多细节请参阅 %s 手册。"
 
 #: apt-pkg/acquire-item.cc
 #, c-format
@@ -718,11 +720,6 @@ msgstr "无法识别的类型缩写：“%c”"
 
 #: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "正在打开配置文件 %s"
-
-#: apt-pkg/contrib/configuration.cc
-#, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "语法错误 %s:%u：配置小节没有以名字开头"
 
@@ -1523,11 +1520,6 @@ msgstr "文件 %2$s 第 %1$u 行的记录格式有误 %3$s (%4$s)"
 
 #: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Opening %s"
-msgstr "正在打开 %s"
-
-#: apt-pkg/sourcelist.cc
-#, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "在源列表 %2$s 中第 %1$u 行有误 (类型)"
 
@@ -1766,6 +1758,12 @@ msgstr "本 APT 具有超级牛力。"
 msgid "This APT helper has Super Meep Powers."
 msgstr "本 APT 助手具有超级喵力。"
 
+#: apt-private/private-cmndline.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr "--force-yes 已经被废弃，请使用以 --allow 开头的选项来代替。"
+
 #: apt-private/private-depends.cc apt-private/private-show.cc
 #: cmdline/apt-mark.cc
 msgid "No packages found"
@@ -1787,12 +1785,6 @@ msgstr "有些软件包不能通过验证"
 msgid "Install these packages without verification?"
 msgstr "没有验证的情况下就安装这些软件包吗？"
 
-#: apt-private/private-download.cc apt-private/private-install.cc
-msgid ""
-"--force-yes is deprecated, use one of the options starting with --allow "
-"instead."
-msgstr "--force-yes 已经被废弃，请使用以 --allow 开头的选项来代替。"
-
 #: apt-private/private-download.cc
 msgid ""
 "There were unauthenticated packages and -y was used without --allow-"
@@ -2456,6 +2448,14 @@ msgstr "版本为 %2$s 的软件包 %1$s 有未满足的依赖关系：\n"
 msgid "The update command takes no arguments"
 msgstr " update 命令不需要参数"
 
+#. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
+msgid ""
+"Usage of %s should be preferred over embedding login information directly in "
+"the %s entry for '%s'"
+msgstr ""
+
 #: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
@@ -3388,6 +3388,11 @@ msgstr "错误的报头数据"
 msgid "Connection failed"
 msgstr "连接失败"
 
+#: methods/basehttp.cc methods/curl.cc methods/ftp.cc methods/http.cc
+#, c-format
+msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
+msgstr ""
+
 #: methods/basehttp.cc
 #, c-format
 msgid ""
@@ -3751,6 +3756,12 @@ msgstr "连接被永久关闭"
 msgid "Empty files can't be valid archives"
 msgstr "空文件不是有效归档"
 
+#~ msgid "Opening configuration file %s"
+#~ msgstr "正在打开配置文件 %s"
+
+#~ msgid "Opening %s"
+#~ msgstr "正在打开 %s"
+
 #~ msgid ""
 #~ "Unable to find expected entry '%s' in Release file (Wrong sources.list "
 #~ "entry or malformed file)"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 5cc930733..8c5a71660 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-07-03 16:55+0200\n"
+"POT-Creation-Date: 2017-08-17 19:28+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."
@@ -706,11 +706,6 @@ msgstr "無法辨識的縮寫類型：'%c'"
 
 #: apt-pkg/contrib/configuration.cc
 #, c-format
-msgid "Opening configuration file %s"
-msgstr "開啟設定檔 %s"
-
-#: apt-pkg/contrib/configuration.cc
-#, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "語法錯誤 %s:%u：區塊開頭沒有名稱。"
 
@@ -1510,11 +1505,6 @@ msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #1"
 
 #: apt-pkg/sourcelist.cc
 #, c-format
-msgid "Opening %s"
-msgstr "正在開啟 %s"
-
-#: apt-pkg/sourcelist.cc
-#, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "來源列表 %2$s 中的第 %1$u 行的格式錯誤（類型）"
 
@@ -1749,6 +1739,12 @@ msgstr "該 APT 有著超級牛力。"
 msgid "This APT helper has Super Meep Powers."
 msgstr ""
 
+#: apt-private/private-cmndline.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr ""
+
 #: apt-private/private-depends.cc apt-private/private-show.cc
 #: cmdline/apt-mark.cc
 msgid "No packages found"
@@ -1770,12 +1766,6 @@ msgstr "有部份套件無法驗證"
 msgid "Install these packages without verification?"
 msgstr "是否不經驗證就安裝這些套件？"
 
-#: apt-private/private-download.cc apt-private/private-install.cc
-msgid ""
-"--force-yes is deprecated, use one of the options starting with --allow "
-"instead."
-msgstr ""
-
 #: apt-private/private-download.cc
 #, fuzzy
 msgid ""
@@ -2440,6 +2430,14 @@ msgstr "套件 %s 版本 %s 未能滿足相依性：\n"
 msgid "The update command takes no arguments"
 msgstr "update 指令不需任何參數"
 
+#. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
+#: apt-private/private-update.cc
+#, c-format
+msgid ""
+"Usage of %s should be preferred over embedding login information directly in "
+"the %s entry for '%s'"
+msgstr ""
+
 #: apt-private/private-update.cc
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
@@ -3374,6 +3372,11 @@ msgstr "錯誤的標頭資料"
 msgid "Connection failed"
 msgstr "連線失敗"
 
+#: methods/basehttp.cc methods/curl.cc methods/ftp.cc methods/http.cc
+#, c-format
+msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
+msgstr ""
+
 #: methods/basehttp.cc
 #, c-format
 msgid ""
@@ -3737,6 +3740,12 @@ msgstr "連線突然終止"
 msgid "Empty files can't be valid archives"
 msgstr ""
 
+#~ msgid "Opening configuration file %s"
+#~ msgstr "開啟設定檔 %s"
+
+#~ msgid "Opening %s"
+#~ msgstr "正在開啟 %s"
+
 #~ msgid "Unmet dependencies. Try using --fix-broken."
 #~ msgstr "未能滿足相依關係。試試 --fix-broken 選項。"